diff --git a/.gitignore b/.gitignore
index 87a6c2cb..bb2567da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,8 @@ desktop.ini
 /clientmods/*
 !/clientmods/preview/
 /client/mod_storage/
+/textures/base/hosting/
+/builtin/mainmenu/hosting/
 
 ## Configuration/log files
 debug.txt
diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua
index eda52976..45d37b1f 100644
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@@ -78,7 +78,7 @@ local function get_formspec(self)
 
 	if not self.hidden and (self.parent == nil or not self.parent.hidden) then
 		local name = self.tablist[self.last_tab_index].name
-		local tabname = (name == "local" or name == "online" or name == "hosting") and name
+		local tabname = (name == "local" or name == "online") and name
 
 		if self.parent == nil then
 			local tsize = self.tablist[self.last_tab_index].tabsize or
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index c0394f07..b615eb83 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -19,7 +19,7 @@ local function get_formspec()
 	local index = filterlist.get_current_index(menudata.worldlist,
 				tonumber(core.settings:get("mainmenu_last_selected_world")))
 	local creative_checkbox = core.settings:get_bool("creative_mode") and
-			"local_creative_checkbox" or "blank"
+			"creative_checkbox" or "blank"
 
 	local retval =
 			"image_button[0,4.84;3.31,0.92;" ..
@@ -37,9 +37,12 @@ local function get_formspec()
 			"tooltip[play;".. fgettext("Play Game") .. "]" ..
 
 			"image_button[7.33,3.09;3.73,0.86;" ..
-				core.formspec_escape(defaulttexturedir ..
-					creative_checkbox) ..
-					".png;cb_creative_mode;;true;false]" ..
+				core.formspec_escape(defaulttexturedir) ..  "creative_bg.png" ..
+				";;;true;false]" ..
+
+			"image_button[7.33,3.09;3.73,0.86;" ..
+				core.formspec_escape(defaulttexturedir) .. creative_checkbox ..
+				".png;cb_creative_mode;;true;false]" ..
 			"tooltip[cb_creative_mode;".. fgettext("Creative mode") .. "]" ..
 
 			"tableoptions[background=#27233F;border=false]" ..
diff --git a/textures/base/bg_hosting.png b/textures/base/bg_hosting.png
deleted file mode 100644
index 2f9c3b4b..00000000
Binary files a/textures/base/bg_hosting.png and /dev/null differ
diff --git a/textures/base/bg_local.png b/textures/base/bg_local.png
index df4a28c0..2ede2174 100644
Binary files a/textures/base/bg_local.png and b/textures/base/bg_local.png differ
diff --git a/textures/base/hosting_creative_bg.png b/textures/base/creative_bg.png
similarity index 100%
rename from textures/base/hosting_creative_bg.png
rename to textures/base/creative_bg.png
diff --git a/textures/base/local_creative_checkbox.png b/textures/base/creative_checkbox.png
similarity index 100%
rename from textures/base/local_creative_checkbox.png
rename to textures/base/creative_checkbox.png
diff --git a/textures/base/server_off.png b/textures/base/server_off.png
deleted file mode 100644
index 217755f7..00000000
Binary files a/textures/base/server_off.png and /dev/null differ
diff --git a/textures/base/server_on.png b/textures/base/server_on.png
deleted file mode 100644
index 62b72c30..00000000
Binary files a/textures/base/server_on.png and /dev/null differ