diff --git a/builtin/mainmenu/tab_local_default.lua b/builtin/mainmenu/tab_local_default.lua
index ec8c50402..9ee408333 100644
--- a/builtin/mainmenu/tab_local_default.lua
+++ b/builtin/mainmenu/tab_local_default.lua
@@ -61,6 +61,7 @@ end
 
 local checked_worlds = false
 local function get_formspec()
+	mm_texture.set_dirt_bg()
 	menudata.worldlist:set_filtercriteria("default")
 
 	-- Only check the worlds once (on restart)
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index bcb34e0a9..5bd4d4d99 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -136,7 +136,7 @@ local function get_formspec(tabview, name, tabdata)
 		if #favs > 0 then
 			for i = 1, #favs do
 				for j = 1, #serverlistmgr.servers do
-					if serverlistmgr.servers[j].address == favs[i].address and
+					if serverlistmgr.servers[j] and serverlistmgr.servers[j].address == favs[i].address and
 							serverlistmgr.servers[j].port == favs[i].port then
 						table.insert(serverlistmgr.servers, i, table.remove(serverlistmgr.servers, j))
 					end
diff --git a/textures/base/pack/authors_menu.png b/textures/base/pack/authors_menu.png
index deedb3d3b..b4035c2e5 100644
Binary files a/textures/base/pack/authors_menu.png and b/textures/base/pack/authors_menu.png differ
diff --git a/textures/base/pack/authors_menu_pressed.png b/textures/base/pack/authors_menu_pressed.png
index f2652cb88..8a41db9c2 100644
Binary files a/textures/base/pack/authors_menu_pressed.png and b/textures/base/pack/authors_menu_pressed.png differ
diff --git a/textures/base/pack/settings_menu.png b/textures/base/pack/settings_menu.png
index f5b3e0a6d..7b5e99396 100644
Binary files a/textures/base/pack/settings_menu.png and b/textures/base/pack/settings_menu.png differ
diff --git a/textures/base/pack/settings_menu_pressed.png b/textures/base/pack/settings_menu_pressed.png
index 9b2b34ca9..c625b504e 100644
Binary files a/textures/base/pack/settings_menu_pressed.png and b/textures/base/pack/settings_menu_pressed.png differ