diff --git a/CMakeLists.txt b/CMakeLists.txt
index 256cd4f149..770a448e84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2926,12 +2926,12 @@ if(TargetBin)
 
 		if(IOS)
 			set(AssetCatalog "${CMAKE_SOURCE_DIR}/ios/assets.xcassets")
-			add_executable(${TargetBin} MACOSX_BUNDLE ${NativeAssets} ${BigFontAssets} ${AssetCatalog} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
+			add_executable(${TargetBin} MACOSX_BUNDLE ${NativeAssets} ${BigFontAssets} ${UIImages} ${AssetCatalog} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource} "ios/Settings.bundle" "ios/Launch Screen.storyboard")
 			if(NOT IOS_APP_STORE)
 				file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/iOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/PPSSPP.app/Frameworks/")
 			endif()
 		else()
-			add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${UIImages} ${BigFontAssets} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
+			add_executable(${TargetBin} MACOSX_BUNDLE ${ICON_PATH_ABS} ${NativeAssets} ${BigFontAssets} ${UIImages} ${SHADER_FILES} ${THEME_FILE} ${DEBUGGER_FILES} ${FLASH0_FILES} ${LANG_FILES} ${NativeAppSource})
 			file(INSTALL "${CMAKE_SOURCE_DIR}/ext/vulkan/macOS/Frameworks/libMoltenVK.dylib" DESTINATION "${CMAKE_BINARY_DIR}/${TargetBin}.app/Contents/Frameworks/")
 			if(USING_QT_UI)
 				add_custom_command(TARGET ${TargetBin} POST_BUILD COMMAND /bin/bash "${CMAKE_SOURCE_DIR}/Qt/macbundle.sh" "${CMAKE_BINARY_DIR}/PPSSPPQt.app")
diff --git a/UI/Theme.cpp b/UI/Theme.cpp
index 0a01dd9cf8..309126f7e3 100644
--- a/UI/Theme.cpp
+++ b/UI/Theme.cpp
@@ -376,6 +376,7 @@ Draw::Texture *GenerateUIAtlas(Draw::DrawContext *draw, Atlas *atlas) {
 
 	Instant start = Instant::Now();
 
+	// TODO: This can be parallelized if needed.
 	for (int i = 0; i < ARRAY_SIZE(imageDescs); i++) {
 		resultIds[i] = i;
 
@@ -394,7 +395,7 @@ Draw::Texture *GenerateUIAtlas(Draw::DrawContext *draw, Atlas *atlas) {
 			}
 		}
 	}
-	INFO_LOG(Log::G3D, " - Loaded %zu images in %.2f ms\n", bucket.data.size(), start.ElapsedMs());
+	INFO_LOG(Log::G3D, " - Loaded %zu images in %.2f ms\n", ARRAY_SIZE(images), start.ElapsedMs());
 
 	Instant addStart = Instant::Now();
 	for (int i = 0; i < ARRAY_SIZE(imageDescs); i++) {
diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
index 9ee4010835..69117afafc 100644
--- a/UWP/UWP.vcxproj
+++ b/UWP/UWP.vcxproj
@@ -290,6 +290,14 @@
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\%(Filename)%(Extension)</Link>
     </Image>
+    <Image Include="..\Assets\ui_images\*.png">
+      <DeploymentContent>true</DeploymentContent>
+      <Link>Content\ui_images\%(Filename)%(Extension)</Link>
+    </Image>
+    <Image Include="..\Assets\ui_images\*.svg">
+      <DeploymentContent>true</DeploymentContent>
+      <Link>Content\ui_images\%(Filename)%(Extension)</Link>
+    </Image>
     <Image Include="..\Assets\debugger\favicon.ico">
       <DeploymentContent>true</DeploymentContent>
       <Link>Content\debugger\%(Filename)%(Extension)</Link>
@@ -449,4 +457,4 @@
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>