diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/windows.swf b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/windows.swf
index f7c64ef0..593e88a7 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/windows.swf and b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/windows.swf differ
diff --git a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
index 18852873..28e0cc0c 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
@@ -142,8 +142,8 @@ void UIComponent_Tooltips::updateSafeZone()
 			const F64 screenW = ui.getScreenWidth();
 			const F64 screenH = ui.getScreenHeight();
 			const bool largerThan720Window = (screenH > 720.0f) || (screenW > 1280.0f);
-			const bool menuContext = ui.GetMenuDisplayed(m_iPad);
-			if(getSceneResolution() == eSceneResolution_720 && largerThan720Window && menuContext)
+			// const bool menuContext = ui.GetMenuDisplayed(m_iPad);
+			if(getSceneResolution() == eSceneResolution_720 && largerThan720Window /*&& menuContext*/)
 			{
 				const F64 widthScale = screenW / 1920.0f;
 				const F64 heightScale = screenH / 1080.0f;
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 90ac05b3..865519ba 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -226,6 +226,7 @@ static wstring GetControlTypeSkinPath(int controlType, bool hd)
 	{
 		return wstring(L"Graphics\\ControlType\\HD\\") + skinName + L"HD.swf";
 	}
+	
 	return wstring(L"Graphics\\ControlType\\") + skinName + L".swf";
 }
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index 953d0366..978d3a82 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -18,16 +18,10 @@ bool UIScene::SceneShouldUse1080p(const std::wstring &moviePath)
 	if(primaryPad < 0 || primaryPad >= XUSER_MAX_COUNT)
 		primaryPad = 0;
 	const int controlType = app.GetGameSettings(primaryPad, eGameSetting_ControlType);
+	const bool force1080ForControlType = (controlType == 0);
 	const bool force720ForControlType = (controlType == 3 || controlType == 5);
 	const bool isTutorialPopupMovie = (moviePath.find(L"TutorialPopup") == 0);
  	
-	// dont refresh gui elements when the player
-	// is in the settings menu [resolution mismatch creates artifacts]
- 	if(moviePath.find(L"SettingsUIMenu") == 0)
- 	{
- 		return (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
-	}
-
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 	TexturePack *selectedPack = nullptr;
 	if(pMinecraft && pMinecraft->skins)
@@ -35,7 +29,15 @@ bool UIScene::SceneShouldUse1080p(const std::wstring &moviePath)
 		selectedPack = pMinecraft->skins->getSelected();
 	}
 	const bool isMarioWorld = (selectedPack && selectedPack->getId() == 1034);
-	return !isMarioWorld && (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
+
+	// dont refresh gui elements when the player
+	// is in the settings menu [resolution mismatch creates artifacts]
+ 	if(moviePath.find(L"SettingsUIMenu") == 0)
+ 	{
+ 		return !isMarioWorld && (force1080ForControlType || ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
+ 	}
+
+	return !isMarioWorld && (force1080ForControlType || ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
 #else
 	(void)moviePath;
 	return true;