diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index 8b4ba969..eea17241 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -64,6 +64,7 @@ private:
 	bool cacheCovers;
 	bool SF_cacheCovers;
 	bool CFLocked;
+	bool Auto_hide_icons;
 	vector<dir_discHdr> m_gameList;
 
 	struct SZone
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 16aed622..3028e42f 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -793,7 +793,7 @@ void CMenu::_game(bool launch)
 			m_btnMgr.hide(m_gameBtnBackFull);
 			m_btnMgr.hide(m_gameBtnToggleFull);
 			
-			if(m_show_zone_game && !coverFlipped && !m_video_playing)
+			if((!Auto_hide_icons || m_show_zone_game) && !coverFlipped && !m_video_playing)
 			{
 				m_btnMgr.show(m_gameBtnPlay);
 				m_btnMgr.show(m_gameBtnBack);
diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index dc431ae4..18ce01ee 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -344,6 +344,7 @@ int CMenu::main(void)
 	m_emuSaveNand = false;
 	m_reload = false;
 	CFLocked = m_cfg.getBool("GENERAL", "cf_locked", false);
+	Auto_hide_icons = m_cfg.getBool("GENERAL", "auto_hide_icons", true);
 	u32 disc_check = 0;
 
 	m_prev_view = 0;
@@ -813,7 +814,7 @@ int CMenu::main(void)
 		else
 			m_btnMgr.hide(m_mainBtnNext);
 			
-		if(m_show_zone_main && !m_sourceflow)
+		if((!Auto_hide_icons || m_show_zone_main) && !m_sourceflow)
 		{
 			m_btnMgr.show(m_mainLblUser[0]);
 			m_btnMgr.show(m_mainLblUser[1]);
@@ -835,7 +836,7 @@ int CMenu::main(void)
 			m_btnMgr.hide(m_mainBtnFavoritesOn);
 			m_btnMgr.hide(m_mainBtnFavoritesOff);
 		}
-		if(!m_cfg.getBool("GENERAL", "hideviews", false) && m_show_zone_main2 && !m_sourceflow)
+		if(!m_cfg.getBool("GENERAL", "hideviews", false) && (!Auto_hide_icons || m_show_zone_main2) && !m_sourceflow)
 		{
 			switch(m_current_view)
 			{
@@ -892,7 +893,7 @@ int CMenu::main(void)
 			m_btnMgr.hide(m_mainLblUser[2]);
 			m_btnMgr.hide(m_mainLblUser[3]);
 		}
-		if(m_show_zone_main3 && !m_sourceflow)
+		if((!Auto_hide_icons || m_show_zone_main3) && !m_sourceflow)
 		{
 			m_btnMgr.show(m_mainBtnDVD);
 			m_btnMgr.show(m_mainLblUser[4]);