diff --git a/arm/raspi/raspi_args.gn b/arm/raspi/raspi_args.gn
index 16f34c7c..133073b8 100644
--- a/arm/raspi/raspi_args.gn
+++ b/arm/raspi/raspi_args.gn
@@ -12,8 +12,9 @@ arm_tune = "cortex-a72"
 arm_use_neon = true
 arm_optionally_use_neon = true
 arm_use_thumb = true
-use_system_minigbm = false
-use_vc4_minigbm = true
+# Disabled due to breakage
+#use_system_minigbm = false
+#use_vc4_minigbm = true
 enable_linux_installer = true
 enable_distro_version_check = false
 is_official_build = true
diff --git a/infra/DEBUG/build_debug_linux.sh b/infra/DEBUG/build_debug_linux.sh
index dfdc04e3..413fb645 100755
--- a/infra/DEBUG/build_debug_linux.sh
+++ b/infra/DEBUG/build_debug_linux.sh
@@ -48,7 +48,7 @@ cp -r -f -v ./icons/icon_64.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shel
 cp -r -f -v ./icons/icon_128.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/icons &&
 cp -r -f -v ./icons/icon_256.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/icons &&
 cp -r -f -v ./icons/icon_256.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
-cp -r -f -v ./icons/thorium_debug_shell.ico ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
+# cp -r -f -v ./icons/thorium_debug_shell.ico ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
 cp -r -f -v DEBUG_SHELL_README.md ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/README.md &&
 cp -r -f -v Thorium_Debug_Shell.sh ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
 cp -r -f -v ~/chromium/src/out/thorium/locales ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
diff --git a/infra/DEBUG/build_debug_shell_linux.sh b/infra/DEBUG/build_debug_shell_linux.sh
index 3560bf75..3ea522d5 100755
--- a/infra/DEBUG/build_debug_shell_linux.sh
+++ b/infra/DEBUG/build_debug_shell_linux.sh
@@ -48,7 +48,7 @@ cp -r -f -v ./icons/icon_64.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shel
 cp -r -f -v ./icons/icon_128.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/icons &&
 cp -r -f -v ./icons/icon_256.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/icons &&
 cp -r -f -v ./icons/icon_256.png ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&
-cp -r -f -v ./icons/thorium_debug_shell.ico ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
+# cp -r -f -v ./icons/thorium_debug_shell.ico ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
 cp -r -f -v DEBUG_SHELL_README.md ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/README.md &&
 cp -r -f -v Thorium_Debug_Shell.sh ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell &&
 cp -r -f -v ~/chromium/src/out/thorium/locales ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&