diff --git a/Minecraft.Client/Common/Media/MediaOrbis.arc b/Minecraft.Client/Common/Media/MediaOrbis.arc
index fcb53c05..4c2717e8 100644
Binary files a/Minecraft.Client/Common/Media/MediaOrbis.arc and b/Minecraft.Client/Common/Media/MediaOrbis.arc differ
diff --git a/Minecraft.Client/Common/Media/MediaPS3.arc b/Minecraft.Client/Common/Media/MediaPS3.arc
index 7ab3a320..fab9ac16 100644
Binary files a/Minecraft.Client/Common/Media/MediaPS3.arc and b/Minecraft.Client/Common/Media/MediaPS3.arc differ
diff --git a/Minecraft.Client/Common/Media/MediaPSVita.arc b/Minecraft.Client/Common/Media/MediaPSVita.arc
index 01aa7466..50681b7b 100644
Binary files a/Minecraft.Client/Common/Media/MediaPSVita.arc and b/Minecraft.Client/Common/Media/MediaPSVita.arc differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc
index f0780eba..dd677b55 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index eaee6b58..0ca9a73a 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -410,10 +410,14 @@ void UIController::loadSkins()
 #elif defined __PSVITA__
 	platformSkinPath = L"skinVita.swf";
 #elif defined _WINDOWS64
-	if(m_fScreenHeight >= 1080.0f)
+	if(ui.getScreenWidth() >= 1920.0f)
 	{
 		platformSkinPath = L"skinHDWin.swf";
 	}
+	else if (ui.getScreenWidth() >= 960.0f && ui.getScreenWidth() < 1280.0f) //str1k3r - we need to check this to make sure we dont load the vita skin on 720p
+	{
+		platformSkinPath = L"skinWinVita.swf";	
+	}
 	else
 	{
 		platformSkinPath = L"skinWin.swf";	
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index e7d907ec..d837ae4b 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -284,25 +284,25 @@ void UIScene::loadMovie()
 	moviePath.append(L"Vita.swf");
 	m_loadedResolution = eSceneResolution_Vita;
 #elif defined _WINDOWS64
-	if(ui.getScreenHeight() == 720)
+	if(ui.getScreenWidth() >= 1920)
+	{
+		moviePath.append(L"1080.swf");
+		m_loadedResolution = eSceneResolution_1080;
+	}
+	else if(ui.getScreenWidth() >= 1280)
 	{
 		moviePath.append(L"720.swf");
 		m_loadedResolution = eSceneResolution_720;
 	}
-	else if(ui.getScreenHeight() == 480)
-	{
-		moviePath.append(L"480.swf");
-		m_loadedResolution = eSceneResolution_480;
-	}
-	else if(ui.getScreenHeight() < 720)
+	else if(ui.getScreenWidth() >= 960)
 	{
 		moviePath.append(L"Vita.swf");
 		m_loadedResolution = eSceneResolution_Vita;
 	}
 	else
 	{
-		moviePath.append(L"1080.swf");
-		m_loadedResolution = eSceneResolution_1080;
+		moviePath.append(L"480.swf");
+		m_loadedResolution = eSceneResolution_480;
 	}
 #else
 	moviePath.append(L"1080.swf");
@@ -319,11 +319,36 @@ void UIScene::loadMovie()
 
 		if(!app.hasArchiveFile(moviePath))
 		{
+		//str1k3r - if were on Windows64 we have more fallbacks dont just report a FatalLoadError, try those other swfs before reporting a FatalLoadError
+#ifndef _WINDOWS64
 			app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str());
+			
 #ifndef _CONTENT_PACKAGE
 			__debugbreak();
 #endif
 			app.FatalLoadError();
+#else
+			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
+
+			moviePath = getMoviePath();
+			moviePath.append(L"Vita.swf");
+			m_loadedResolution = eSceneResolution_Vita;
+
+			//str1k3r - while 480 & Vita share basically all the same skins its just a extra fallback :D
+			if(!app.hasArchiveFile(moviePath))
+			{
+				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
+
+				moviePath = getMoviePath();
+				moviePath.append(L"480.swf");
+				m_loadedResolution = eSceneResolution_480;
+
+				if(!app.hasArchiveFile(moviePath))
+				{
+					app.FatalLoadError();
+				}
+			}
+#endif
 		}
 	}