diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
index 7cd53b75c..e30773518 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.types.BooleanPatchOption.Companion.booleanPatchOption
 import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.AlwaysRepeatPatch
 import app.revanced.patches.youtube.overlaybutton.download.hook.DownloadButtonHookPatch
 import app.revanced.patches.youtube.overlaybutton.download.pip.DisablePiPPatch
@@ -59,6 +60,13 @@ import org.w3c.dom.Element
 )
 @Suppress("unused")
 object OverlayButtonsPatch : ResourcePatch() {
+    internal var OutlineIcon by booleanPatchOption(
+        key = "OutlineIcon",
+        default = false,
+        title = "Outline icons",
+        description = "Apply the outline icon"
+    )
+
     override fun execute(context: ResourceContext) {
 
         /**
@@ -78,8 +86,7 @@ object OverlayButtonsPatch : ResourcePatch() {
         /**
          * Copy arrays
          */
-        context.copyXmlNode("youtube/overlaybuttons/host", "values/arrays.xml", "resources")
-
+        context.copyXmlNode("youtube/overlaybuttons/shared/host", "values/arrays.xml", "resources")
 
         /**
          * Copy resources
@@ -90,35 +97,64 @@ object OverlayButtonsPatch : ResourcePatch() {
                 "playlist_repeat_button.xml",
                 "playlist_shuffle_button.xml",
                 "revanced_repeat_icon.xml"
-            ),
-            ResourceUtils.ResourceGroup(
-                "drawable-xxhdpi",
-                "ic_fullscreen_vertical_button.png",
-                "ic_vr.png",
-                "quantum_ic_fullscreen_exit_grey600_24.png",
-                "quantum_ic_fullscreen_exit_white_24.png",
-                "quantum_ic_fullscreen_grey600_24.png",
-                "quantum_ic_fullscreen_white_24.png",
-                "revanced_copy_icon.png",
-                "revanced_copy_icon_with_time.png",
-                "revanced_download_icon.png",
-                "revanced_speed_icon.png",
-                "yt_fill_arrow_repeat_white_24.png",
-                "yt_outline_arrow_repeat_1_white_24.png",
-                "yt_outline_arrow_shuffle_1_white_24.png",
-                "yt_outline_screen_full_exit_white_24.png",
-                "yt_outline_screen_full_white_24.png",
-                "yt_outline_screen_vertical_vd_theme_24.png"
             )
         ).forEach { resourceGroup ->
-            context.copyResources("youtube/overlaybuttons", resourceGroup)
+            context.copyResources("youtube/overlaybuttons/shared", resourceGroup)
+        }
+
+        if (OutlineIcon == true) {
+            arrayOf(
+                ResourceUtils.ResourceGroup(
+                    "drawable-xxhdpi",
+                    "ic_fullscreen_vertical_button.png",
+                    "quantum_ic_fullscreen_exit_grey600_24.png",
+                    "quantum_ic_fullscreen_exit_white_24.png",
+                    "quantum_ic_fullscreen_grey600_24.png",
+                    "quantum_ic_fullscreen_white_24.png",
+                    "revanced_copy_icon.png",
+                    "revanced_copy_icon_with_time.png",
+                    "revanced_download_icon.png",
+                    "revanced_speed_icon.png",
+                    "yt_fill_arrow_repeat_white_24.png",
+                    "yt_outline_arrow_repeat_1_white_24.png",
+                    "yt_outline_arrow_shuffle_1_white_24.png",
+                    "yt_outline_screen_full_exit_white_24.png",
+                    "yt_outline_screen_full_white_24.png"
+                )
+            ).forEach { resourceGroup ->
+                context.copyResources("youtube/overlaybuttons/outline", resourceGroup)
+            }
+        } else {
+            arrayOf(
+                ResourceUtils.ResourceGroup(
+                    "drawable-xxhdpi",
+                    "ic_fullscreen_vertical_button.png",
+                    "ic_vr.png",
+                    "quantum_ic_fullscreen_exit_grey600_24.png",
+                    "quantum_ic_fullscreen_exit_white_24.png",
+                    "quantum_ic_fullscreen_grey600_24.png",
+                    "quantum_ic_fullscreen_white_24.png",
+                    "revanced_copy_icon.png",
+                    "revanced_copy_icon_with_time.png",
+                    "revanced_download_icon.png",
+                    "revanced_speed_icon.png",
+                    "yt_fill_arrow_repeat_white_24.png",
+                    "yt_outline_arrow_repeat_1_white_24.png",
+                    "yt_outline_arrow_shuffle_1_white_24.png",
+                    "yt_outline_screen_full_exit_white_24.png",
+                    "yt_outline_screen_full_white_24.png",
+                    "yt_outline_screen_vertical_vd_theme_24.png"
+                )
+            ).forEach { resourceGroup ->
+                context.copyResources("youtube/overlaybuttons/default", resourceGroup)
+            }
         }
 
         /**
          * Merge xml nodes from the host to their real xml files
          */
         context.copyXmlNode(
-            "youtube/overlaybuttons/host",
+            "youtube/overlaybuttons/shared/host",
             "layout/youtube_controls_bottom_ui_container.xml",
             "android.support.constraint.ConstraintLayout"
         )
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_fullscreen_vertical_button.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png
rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_fullscreen_vertical_button.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_vr.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_vr.png
rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/ic_vr.png
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
new file mode 100644
index 000000000..114ff15e4
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
new file mode 100644
index 000000000..114ff15e4
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
new file mode 100644
index 000000000..93df73506
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
new file mode 100644
index 000000000..93df73506
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png
new file mode 100644
index 000000000..9e10fbe3f
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon_with_time.png
new file mode 100644
index 000000000..021d4d5bc
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_copy_icon_with_time.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png
new file mode 100644
index 000000000..90f98db8a
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_download_icon.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png
new file mode 100644
index 000000000..2277524ee
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/revanced_speed_icon.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png
rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
new file mode 100644
index 000000000..94fceaabf
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
rename to src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
new file mode 100644
index 000000000..114ff15e4
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png
new file mode 100644
index 000000000..93df73506
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_full_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png
new file mode 100644
index 000000000..b23946dba
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/default/drawable-xxhdpi/yt_outline_screen_vertical_vd_theme_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/ic_fullscreen_vertical_button.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/ic_fullscreen_vertical_button.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/ic_fullscreen_vertical_button.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_grey600_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_exit_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_grey600_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/quantum_ic_fullscreen_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon_with_time.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_copy_icon_with_time.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_copy_icon_with_time.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_download_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_download_icon.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_download_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_speed_icon.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/revanced_speed_icon.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/revanced_speed_icon.png
diff --git a/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png
new file mode 100644
index 000000000..1f47966df
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_fill_arrow_repeat_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_repeat_1_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png
new file mode 100644
index 000000000..491254dda
Binary files /dev/null and b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_arrow_shuffle_1_white_24.png differ
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_exit_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png b/src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_white_24.png
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable-xxhdpi/yt_outline_screen_full_white_24.png
rename to src/main/resources/youtube/overlaybuttons/outline/drawable-xxhdpi/yt_outline_screen_full_white_24.png
diff --git a/src/main/resources/youtube/overlaybuttons/drawable/playlist_repeat_button.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_repeat_button.xml
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable/playlist_repeat_button.xml
rename to src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_repeat_button.xml
diff --git a/src/main/resources/youtube/overlaybuttons/drawable/playlist_shuffle_button.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_shuffle_button.xml
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable/playlist_shuffle_button.xml
rename to src/main/resources/youtube/overlaybuttons/shared/drawable/playlist_shuffle_button.xml
diff --git a/src/main/resources/youtube/overlaybuttons/drawable/revanced_repeat_icon.xml b/src/main/resources/youtube/overlaybuttons/shared/drawable/revanced_repeat_icon.xml
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/drawable/revanced_repeat_icon.xml
rename to src/main/resources/youtube/overlaybuttons/shared/drawable/revanced_repeat_icon.xml
diff --git a/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/youtube/overlaybuttons/shared/host/layout/youtube_controls_bottom_ui_container.xml
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml
rename to src/main/resources/youtube/overlaybuttons/shared/host/layout/youtube_controls_bottom_ui_container.xml
diff --git a/src/main/resources/youtube/overlaybuttons/host/values/arrays.xml b/src/main/resources/youtube/overlaybuttons/shared/host/values/arrays.xml
similarity index 100%
rename from src/main/resources/youtube/overlaybuttons/host/values/arrays.xml
rename to src/main/resources/youtube/overlaybuttons/shared/host/values/arrays.xml