diff --git a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
index d168b784f..59e6ff7c3 100644
--- a/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/ThemeHelper.kt
@@ -71,15 +71,25 @@ object ThemeHelper {
         val activityAliases = context.resources.getStringArray(R.array.iconsValue)
         // Disable Old Icon(s)
         for (activityAlias in activityAliases) {
+            val activityClass = "com.github.libretube." +
+                    if (activityAlias == activityAliases[0]) "activities.MainActivity" // default icon/activity
+                    else activityAlias
+
+                // remove old icons
             context.packageManager.setComponentEnabledSetting(
-                ComponentName(context.packageName, "com.github.libretube.$activityAlias"),
+                ComponentName(context.packageName, activityClass),
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP
             )
         }
+
+        // set the class name for the activity alias
+        val newLogoActivityClass = "com.github.libretube." +
+                if (newLogoActivityAlias == activityAliases[0]) "activities.MainActivity" // default icon/activity
+                else newLogoActivityAlias
         // Enable New Icon
         context.packageManager.setComponentEnabledSetting(
-            ComponentName(context.packageName, "com.github.libretube.$newLogoActivityAlias"),
+            ComponentName(context.packageName, newLogoActivityClass),
             PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
             PackageManager.DONT_KILL_APP
         )
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index aa78b48a4..155462ea9 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -608,7 +608,7 @@
         <item>@string/birdIcon</item>
     </string-array>
     <string-array name="iconsValue">
-        <item>activities.MainActivity</item>
+        <item>MainActivity</item>
         <item>IconLegacy</item>
         <item>IconGradient</item>
         <item>IconFire</item>