diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_N.png b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_N.png
index f394b273..8501cd40 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_N.png and b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_N.png differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_S.png b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_S.png
index f8c77def..f15b4a43 100644
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_S.png and b/Minecraft.Client/Common/Media/MediaWindows64/Graphics/ControlType/Panorama/Panorama_S.png differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Panorama1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/Panorama1080.swf
deleted file mode 100644
index a73b2b85..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Panorama1080.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Panorama480.swf b/Minecraft.Client/Common/Media/MediaWindows64/Panorama480.swf
deleted file mode 100644
index 9cd162a2..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Panorama480.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/Panorama720.swf b/Minecraft.Client/Common/Media/MediaWindows64/Panorama720.swf
deleted file mode 100644
index 07cc2e36..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/Panorama720.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit1080.swf
deleted file mode 100644
index f0178099..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit1080.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit720.swf b/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit720.swf
deleted file mode 100644
index 459e7bc9..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaSplit720.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaVita.swf b/Minecraft.Client/Common/Media/MediaWindows64/PanoramaVita.swf
deleted file mode 100644
index 281d0cf7..00000000
Binary files a/Minecraft.Client/Common/Media/MediaWindows64/PanoramaVita.swf and /dev/null differ
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
index 60997d41..4dffa43d 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -41,7 +41,7 @@ static wstring GetPanoramaTexturePath()
 					wstring path(buf);
 					path += L"\\Windows64Media\\DLC\\";
 					path += packName;
-					path += L"\\Data\\Panorama\\";
+					path += L"\\Data\\ControlType\\Panorama\\";
 					wstring sampleDay = path + L"Panorama_S.png";
 					wstring sampleNight = path + L"Panorama_N.png";
 					if(GetFileAttributesW(sampleDay.c_str()) != INVALID_FILE_ATTRIBUTES ||
@@ -56,8 +56,8 @@ static wstring GetPanoramaTexturePath()
 
 	const char *mountedPanoramaRoots[] =
 	{
-		"TPACK:Data/Panorama/",
-		"WPACK:Data/Panorama/",
+		"TPACK:Data/ControlType/Panorama/",
+		"WPACK:Data/ControlType/Panorama/",
 	};
 
 	for(const char *mountedRoot : mountedPanoramaRoots)
@@ -254,8 +254,19 @@ void UIComponent_Panorama::tick()
 		setPanorama(true);
 	}
 
-	// scroll forever
-	m_panoramaScroll += 0.000035f;
+	// fix: tick rate affected by user framerate
+	const DWORD nowMs = GetTickCount();
+	if(m_lastScrollTickMs != 0)
+	{
+		const DWORD kMaxElapsedMs = 250;
+		const float kScrollPerMs = 0.0001f / 16.6667f;
+		DWORD elapsedMs = nowMs - m_lastScrollTickMs;
+
+		if(elapsedMs > kMaxElapsedMs) elapsedMs = kMaxElapsedMs;
+		m_panoramaScroll += kScrollPerMs * static_cast<float>(elapsedMs);
+	}
+	m_lastScrollTickMs = nowMs;
+
 	LeaveCriticalSection(&pMinecraft->m_setLevelCS);
 
 	m_hasTickedOnce = true;
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.h b/Minecraft.Client/Common/UI/UIComponent_Panorama.h
index eafedbaa..3572c36a 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.h
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.h
@@ -13,6 +13,7 @@ private:
 	bool m_bPanoramaTexturesLoaded = false;
 	wstring m_panoramaTextureRoot;
 	float m_panoramaAspect = 1.0f;
+	DWORD m_lastScrollTickMs = 0;
 	float m_panoramaScroll = 0.0f;
 
 public:
diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Festive/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Festive/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Festive/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Festive/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Festive/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Festive/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Festive/Data/ControlType/Panorama/Panorama_S.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Greek Mythology/Data/ControlType/Panorama/Panorama_S.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Halloween 2015/Data/ControlType/Panorama/Panorama_S.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Halo/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Halo/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Halo/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Halo/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Halo/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Halo/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Halo/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Halo/Data/ControlType/Panorama/Panorama_S.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Mass Effect/Data/ControlType/Panorama/Panorama_S.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Skyrim/Data/Panorama/Panorama_N.png b/Minecraft.Client/Windows64Media/DLC/Skyrim/Data/ControlType/Panorama/Panorama_N.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Skyrim/Data/Panorama/Panorama_N.png
rename to Minecraft.Client/Windows64Media/DLC/Skyrim/Data/ControlType/Panorama/Panorama_N.png
diff --git a/Minecraft.Client/Windows64Media/DLC/Skyrim/Data/Panorama/Panorama_S.png b/Minecraft.Client/Windows64Media/DLC/Skyrim/Data/ControlType/Panorama/Panorama_S.png
similarity index 100%
rename from Minecraft.Client/Windows64Media/DLC/Skyrim/Data/Panorama/Panorama_S.png
rename to Minecraft.Client/Windows64Media/DLC/Skyrim/Data/ControlType/Panorama/Panorama_S.png