diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4bee8ee7e..430196b0be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,6 +319,8 @@ endif()
 if(NOT CMAKE_BUILD_TYPE)
 	message(STATUS "No build type selected, default to Release")
 	set(CMAKE_BUILD_TYPE "Release")
+else()
+	message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 endif()
 
 message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
@@ -2841,10 +2843,18 @@ if(IOS AND NOT LIBRETRO)
 	if(IOS_APP_STORE)
 		if(GOLD)
 			set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStoreGold.plist")
+			set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-gold")
+			set(ICON_NAME "IconGold")
+			set(PRODUCT_NAME "PPSSPPGold")
 		else()
 			set(BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/ios/PPSSPP-AppStore.plist")
+			set(BUNDLE_IDENTIFIER "org.ppsspp.ppsspp-free")
+			set(ICON_NAME "Icon")
+			set(PRODUCT_NAME "PPSSPP")
 		endif()
-		# message(${DEVELOPMENT_TEAM_ID})
+		message(STATUS ${DEVELOPMENT_TEAM_ID})
+		message(STATUS ${ICON_NAME})
+		message(STATUS ${DEPLOYMENT_TARGET})
 		# https://stackoverflow.com/questions/40664125/cmake-and-code-signing-in-xcode-8-for-ios-projects
 		set_target_properties(${TargetBin} PROPERTIES
 			MACOSX_BUNDLE_INFO_PLIST ${BUNDLE_PLIST}
@@ -2852,7 +2862,7 @@ if(IOS AND NOT LIBRETRO)
 			RESOURCE "ios/Settings.bundle"
 			RESOURCE "ext/vulkan/iOS/Frameworks"
 			XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}
-			XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
+			XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
 			XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
 			XCODE_ATTRIBUTE_ENABLE_BITCODE NO
 			XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID}
@@ -2866,7 +2876,7 @@ if(IOS AND NOT LIBRETRO)
 			RESOURCE "ios/Settings.bundle"
 			RESOURCE "ext/vulkan/iOS/Frameworks"
 			XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}
-			XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
+			XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2"
 			XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
 			XCODE_ATTRIBUTE_ENABLE_BITCODE NO
 			XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index f1eda81956..7001ccd964 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -652,7 +652,7 @@ Path GameBrowser::HomePath() {
 	if (!homePath_.empty()) {
 		return homePath_;
 	}
-#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP)
+#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP) || PPSSPP_PLATFORM(IOS)
 	return g_Config.memStickDirectory;
 #else
 	return Path(getenv("HOME"));
diff --git a/b-appstore.sh b/b-appstore.sh
index 66b08c0aba..dd0ab208d2 100755
--- a/b-appstore.sh
+++ b/b-appstore.sh
@@ -2,6 +2,17 @@
 
 # Set the development team ID as a DEVTEAM env variable.
 
+if [[ -z "${DEVTEAM}" ]]; then
+  echo "DEVTEAM not in environment, exiting"
+  exit 1
+fi
+
+if [[ -z "${GOLD}" ]]; then
+  echo "GOLD is not set (should be YES or NO), exiting"
+  exit 1
+fi
+
+rm -rf build-ios
 mkdir build-ios
 pushd build-ios
 
@@ -10,7 +21,7 @@ BUILD_TYPE=Release
 echo $DEVTEAM
 echo $BUILD_TYPE
 
-cmake .. -DIOS_APP_STORE=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode
+cmake .. -DIOS_APP_STORE=ON -DGOLD=$GOLD -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake -DDEVELOPMENT_TEAM_ID=${DEVTEAM} -DIOS_PLATFORM=OS -GXcode
 # TODO: Get a MoltenVK somewhere.
 #cp ../MoltenVK/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks
 popd
diff --git a/ios/PPSSPP-AppStoreGold.plist b/ios/PPSSPP-AppStoreGold.plist
index 062e474d38..513870c38a 100644
--- a/ios/PPSSPP-AppStoreGold.plist
+++ b/ios/PPSSPP-AppStoreGold.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>PPSSPP Gold</string>
+	<string>PPSSPPGold</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -50,10 +50,10 @@
 	</array>
 	<key>CFBundleIconFiles</key>
 	<array>
-		<string>assets/Icon-72.png</string>
-		<string>assets/Icon-72@2x.png</string>
-		<string>assets/Icon.png</string>
-		<string>assets/Icon@2x.png</string>
+		<string>assets/IconGold-72.png</string>
+		<string>assets/IconGold-72@2x.png</string>
+		<string>assets/IconGold.png</string>
+		<string>assets/IconGold@2x.png</string>
 	</array>
 	<key>UILaunchImageFile</key>
 	<string>Default.png</string>