diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/options/PatchOptions.kt b/src/main/kotlin/app/revanced/patches/shared/patch/options/PatchOptions.kt
index b11b77a70..1a89dcb26 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/options/PatchOptions.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/options/PatchOptions.kt
@@ -72,18 +72,6 @@ class PatchOptions : ResourcePatch {
             )
         )
 
-        /**
-         * Overlay Buttons Icon
-         */
-        internal var OverlayButtonsIcon: String? by option(
-            PatchOption.StringOption(
-                key = "OverlayButtonsIcon",
-                default = "new",
-                title = "Overlay button icon selection",
-                description = "Choose an overlay buttons icon: old/new"
-            )
-        )
-
         /**
          * Theme
          */
diff --git a/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
index 8f62b922c..7e0d69795 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
@@ -10,7 +10,6 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.annotation.YouTubeCompatibility
-import app.revanced.patches.shared.patch.options.PatchOptions
 import app.revanced.patches.youtube.button.autorepeat.patch.AutoRepeatPatch
 import app.revanced.patches.youtube.button.overlaybuttons.bytecode.patch.OverlayButtonsBytecodePatch
 import app.revanced.patches.youtube.button.whitelist.patch.WhitelistPatch
@@ -28,7 +27,6 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
         AutoRepeatPatch::class,
         OverlayButtonsBytecodePatch::class,
         OverrideSpeedHookPatch::class,
-        PatchOptions::class,
         SettingsPatch::class,
         WhitelistPatch::class
     ]
@@ -38,16 +36,14 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
 class OverlayButtonsPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
 
-        val icon = PatchOptions.OverlayButtonsIcon!!
-
-        /*
+        /**
          * Copy arrays
          */
 
         context.copyXmlNode("youtube/overlaybuttons/host", "values/arrays.xml", "resources")
 
 
-        /*
+        /**
          * Copy resources
          */
         arrayOf(
@@ -56,12 +52,7 @@ class OverlayButtonsPatch : ResourcePatch {
                 "playlist_repeat_button.xml",
                 "playlist_shuffle_button.xml",
                 "revanced_repeat_icon.xml"
-            )
-        ).forEach { resourceGroup ->
-            context.copyResources("youtube/overlaybuttons", resourceGroup)
-        }
-
-        arrayOf(
+            ),
             ResourceUtils.ResourceGroup(
                 "drawable-xxhdpi",
                 "ic_fullscreen_vertical_button.png",
@@ -81,10 +72,10 @@ class OverlayButtonsPatch : ResourcePatch {
                 "yt_outline_screen_full_white_24.png"
             )
         ).forEach { resourceGroup ->
-            context.copyResources("youtube/overlaybuttons/$icon", resourceGroup)
+            context.copyResources("youtube/overlaybuttons", resourceGroup)
         }
 
-        /*
+        /**
          * Copy preference fragments
          */
 
@@ -111,7 +102,7 @@ class OverlayButtonsPatch : ResourcePatch {
             )
         )
 
-        /*
+        /**
          * Add settings
          */
         SettingsPatch.addPreference(
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/ic_fullscreen_vertical_button.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/ic_fullscreen_vertical_button.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/ic_vr.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/ic_vr.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_copy_icon.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_copy_icon_with_time.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_download_icon.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_speed_icon.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_whitelist_icon.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_whitelist_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/revanced_whitelist_icon.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_whitelist_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/new/drawable-xxhdpi/yt_outline_screen_full_white_24.png
rename to src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_fullscreen_vertical_button.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_fullscreen_vertical_button.png
deleted file mode 100644
index 234b312f0..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_fullscreen_vertical_button.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_vr.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_vr.png
deleted file mode 100644
index 82e17235a..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/ic_vr.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
deleted file mode 100644
index 3ee41153d..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
deleted file mode 100644
index 3ee41153d..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
deleted file mode 100644
index c2a16d0ed..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
deleted file mode 100644
index c2a16d0ed..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon.png
deleted file mode 100644
index 6e0bba2f7..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon_with_time.png
deleted file mode 100644
index 6a7037a00..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_copy_icon_with_time.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_download_icon.png
deleted file mode 100644
index a11cc5277..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_download_icon.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_speed_icon.png
deleted file mode 100644
index 2277524ee..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_speed_icon.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_whitelist_icon.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_whitelist_icon.png
deleted file mode 100644
index 0dce863c3..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/revanced_whitelist_icon.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
deleted file mode 100644
index 408a04351..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
deleted file mode 100644
index 5360c1cc2..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
deleted file mode 100644
index 3ee41153d..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png and /dev/null differ
diff --git a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_white_24.png
deleted file mode 100644
index c2a16d0ed..000000000
Binary files a/src/main/resources/youtube/overlaybuttons/old/drawable-xxhdpi/yt_outline_screen_full_white_24.png and /dev/null differ