diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt
index 222c7c775..7e782db36 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt
@@ -2,6 +2,7 @@ package app.revanced.patches.music.layout.branding.icon
import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.util.ResourceGroup
@@ -19,26 +20,79 @@ object CustomBrandingIconPatch : BaseResourcePatch(
private const val DEFAULT_ICON_KEY = "Revancify Blue"
private val availableIcon = mapOf(
+ "AFN Blue" to "afn_blue",
+ "AFN Red" to "afn_red",
"MMT" to "mmt",
DEFAULT_ICON_KEY to "revancify_blue",
- "Revancify Red" to "revancify_red"
+ "Revancify Red" to "revancify_red",
+ "YouTube Music" to "youtube_music"
)
- private val mipmapIconResourceFileNames = arrayOf(
- "adaptiveproduct_youtube_music_background_color_108",
- "adaptiveproduct_youtube_music_foreground_color_108",
- "ic_launcher_release"
- ).map { "$it.png" }.toTypedArray()
-
- private val mipmapDirectories = arrayOf(
+ private val sizeArray = arrayOf(
"xxxhdpi",
"xxhdpi",
"xhdpi",
"hdpi",
"mdpi"
- ).map { "mipmap-$it" }
+ )
- private var AppIcon by stringPatchOption(
+ private val largeSizeArray = arrayOf(
+ "xlarge-hdpi",
+ "xlarge-mdpi",
+ "large-xhdpi",
+ "large-hdpi",
+ "large-mdpi",
+ "xxhdpi",
+ "xhdpi",
+ "hdpi",
+ "mdpi",
+ )
+
+ private val drawableDirectories = sizeArray.map { "drawable-$it" }
+
+ private val largeDrawableDirectories = largeSizeArray.map { "drawable-$it" }
+
+ private val mipmapDirectories = sizeArray.map { "mipmap-$it" }
+
+ private val headerIconResourceFileNames = arrayOf(
+ "action_bar_logo",
+ "logo_music",
+ "ytm_logo"
+ ).map { "$it.png" }.toTypedArray()
+
+ private val launcherIconResourceFileNames = arrayOf(
+ "adaptiveproduct_youtube_music_background_color_108",
+ "adaptiveproduct_youtube_music_foreground_color_108",
+ "ic_launcher_release"
+ ).map { "$it.png" }.toTypedArray()
+
+ private val splashIconResourceFileNames = arrayOf(
+ // This file only exists in [drawable-hdpi]
+ // Since {@code ResourceUtils#copyResources} checks for null values before copying,
+ // Just adds it to the array.
+ "action_bar_logo_release",
+ "record"
+ ).map { "$it.png" }.toTypedArray()
+
+ private val headerIconResourceGroups = drawableDirectories.map { directory ->
+ ResourceGroup(
+ directory, *headerIconResourceFileNames
+ )
+ }
+
+ private val launcherIconResourceGroups = mipmapDirectories.map { directory ->
+ ResourceGroup(
+ directory, *launcherIconResourceFileNames
+ )
+ }
+
+ private val splashIconResourceGroups = largeDrawableDirectories.map { directory ->
+ ResourceGroup(
+ directory, *splashIconResourceFileNames
+ )
+ }
+
+ private val AppIcon by stringPatchOption(
key = "AppIcon",
default = DEFAULT_ICON_KEY,
values = availableIcon,
@@ -50,22 +104,35 @@ object CustomBrandingIconPatch : BaseResourcePatch(
Each of these folders has to have the following files:
- ${mipmapIconResourceFileNames.joinToString("\n") { "- $it" }}
+ ${launcherIconResourceFileNames.joinToString("\n") { "- $it" }}
"""
.split("\n")
.joinToString("\n") { it.trimIndent() } // Remove the leading whitespace from each line.
.trimIndent(), // Remove the leading newline.
)
+ private val ChangeHeader by booleanPatchOption(
+ key = "ChangeHeader",
+ default = false,
+ title = "Change header",
+ description = "Apply the custom branding icon to the header."
+ )
+
+ private val ChangeSplashIcon by booleanPatchOption(
+ key = "ChangeSplashIcon",
+ default = true,
+ title = "Change splash icons",
+ description = "Apply the custom branding icon to the splash screen."
+ )
+
override fun execute(context: ResourceContext) {
AppIcon?.let { appIcon ->
val appIconValue = appIcon.lowercase().replace(" ", "_")
+ val appIconResourcePath = "music/branding/$appIconValue"
+
+ // Check if a custom path is used in the patch options.
if (!availableIcon.containsValue(appIconValue)) {
- mipmapDirectories.map { directory ->
- ResourceGroup(
- directory, *mipmapIconResourceFileNames
- )
- }.let { resourceGroups ->
+ launcherIconResourceGroups.let { resourceGroups ->
try {
val path = File(appIcon)
val resourceDirectory = context["res"]
@@ -82,33 +149,47 @@ object CustomBrandingIconPatch : BaseResourcePatch(
}
}
} catch (_: Exception) {
+ // Exception is thrown if an invalid path is used in the patch option.
throw PatchException("Invalid app icon path: $appIcon")
}
}
} else {
- val resourcePath = "music/branding/$appIconValue"
- // change launcher icon.
- mipmapDirectories.map { directory ->
- ResourceGroup(
- directory, *mipmapIconResourceFileNames
- )
- }.let { resourceGroups ->
+ // Change launcher icon.
+ launcherIconResourceGroups.let { resourceGroups ->
resourceGroups.forEach {
- context.copyResources("$resourcePath/launcher", it)
+ context.copyResources("$appIconResourcePath/launcher", it)
}
}
- // change monochrome icon.
+ // Change monochrome icon.
arrayOf(
ResourceGroup(
"drawable",
"ic_app_icons_themed_youtube_music.xml"
)
).forEach { resourceGroup ->
- context.copyResources("$resourcePath/monochrome", resourceGroup)
+ context.copyResources("$appIconResourcePath/monochrome", resourceGroup)
+ }
+
+ // Change header.
+ if (ChangeHeader == true) {
+ headerIconResourceGroups.let { resourceGroups ->
+ resourceGroups.forEach {
+ context.copyResources("$appIconResourcePath/header", it)
+ }
+ }
+ }
+
+ // Change splash icon.
+ if (ChangeSplashIcon == true) {
+ splashIconResourceGroups.let { resourceGroups ->
+ resourceGroups.forEach {
+ context.copyResources("$appIconResourcePath/splash", it)
+ }
+ }
}
}
} ?: throw PatchException("Invalid app icon path.")
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/CustomBrandingNamePatch.kt
index b4491ad3c..3831f41da 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/CustomBrandingNamePatch.kt
@@ -20,24 +20,26 @@ object CustomBrandingNamePatch : BaseResourcePatch(
key = "AppNameNotification",
default = APP_NAME_LAUNCHER,
values = mapOf(
- "Full name" to APP_NAME_NOTIFICATION,
- "Short name" to APP_NAME_LAUNCHER
+ "ReVanced Extended Music" to APP_NAME_NOTIFICATION,
+ "RVX Music" to APP_NAME_LAUNCHER,
+ "YouTube Music" to "YouTube Music",
+ "YT Music" to "YT Music",
),
title = "App name in notification panel",
description = "The name of the app as it appears in the notification panel.",
- required = true
)
private val AppNameLauncher by stringPatchOption(
key = "AppNameLauncher",
default = APP_NAME_LAUNCHER,
values = mapOf(
- "Full name" to APP_NAME_NOTIFICATION,
- "Short name" to APP_NAME_LAUNCHER
+ "ReVanced Extended Music" to APP_NAME_NOTIFICATION,
+ "RVX Music" to APP_NAME_LAUNCHER,
+ "YouTube Music" to "YouTube Music",
+ "YT Music" to "YT Music",
),
title = "App name in launcher",
description = "The name of the app as it appears in the launcher.",
- required = true
)
override fun execute(context: ResourceContext) {
@@ -64,7 +66,7 @@ object CustomBrandingNamePatch : BaseResourcePatch(
.appendChild(stringElement)
}
}
- } ?: throw PatchException("Invalid app name.")
- } ?: throw PatchException("Invalid app name.")
+ } ?: throw PatchException("Invalid launcher name.")
+ } ?: throw PatchException("Invalid notification name.")
}
}
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/translations/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/translations/TranslationsPatch.kt
new file mode 100644
index 000000000..ee61078f9
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/music/layout/translations/TranslationsPatch.kt
@@ -0,0 +1,60 @@
+package app.revanced.patches.music.layout.translations
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
+import app.revanced.patches.music.utils.settings.SettingsPatch
+import app.revanced.patches.shared.translations.APP_LANGUAGES
+import app.revanced.patches.shared.translations.TranslationsUtils.invoke
+import app.revanced.util.patch.BaseResourcePatch
+
+@Suppress("unused")
+object TranslationsPatch : BaseResourcePatch(
+ name = "Translations YouTube Music",
+ description = "Add translations or remove string resources.",
+ dependencies = setOf(SettingsPatch::class),
+ compatiblePackages = COMPATIBLE_PACKAGE
+) {
+ // Array of supported translations, each represented by its language code.
+ private val TRANSLATIONS = arrayOf(
+ "bg-rBG", "bn", "cs-rCZ", "el-rGR", "es-rES", "fr-rFR", "hu-rHU", "id-rID", "in", "it-rIT",
+ "ja-rJP", "ko-rKR", "nl-rNL", "pl-rPL", "pt-rBR", "ro-rRO", "ru-rRU", "tr-rTR", "uk-rUA",
+ "vi-rVN", "zh-rCN", "zh-rTW"
+ )
+
+ private var CustomTranslations by stringPatchOption(
+ key = "CustomTranslations",
+ default = "",
+ title = "Custom translations",
+ description = """
+ The path to the 'strings.xml' file.
+ Please note that applying the 'strings.xml' file will overwrite all existing language translations.
+ """.trimIndent()
+ )
+
+ private var SelectedTranslations by stringPatchOption(
+ key = "SelectedTranslations",
+ default = TRANSLATIONS.joinToString(", "),
+ title = "Translations to add",
+ description = "A list of translations to be added for the RVX settings, separated by commas."
+ )
+
+ private var SelectedStringResources by stringPatchOption(
+ key = "SelectedStringResources",
+ default = APP_LANGUAGES.joinToString(", "),
+ title = "String resources to keep",
+ description = """
+ A list of string resources to be kept, separated by commas.
+ String resources not in the list will be removed from the app.
+
+ Default string resource, English, is not removed.
+ """.trimIndent()
+ )
+
+ override fun execute(context: ResourceContext) {
+ context.invoke(
+ CustomTranslations, SelectedTranslations, SelectedStringResources,
+ TRANSLATIONS, "music"
+ )
+ }
+}
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/translations/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/translations/TranslationsPatch.kt
deleted file mode 100644
index a903e61dc..000000000
--- a/src/main/kotlin/app/revanced/patches/music/misc/translations/TranslationsPatch.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package app.revanced.patches.music.misc.translations
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patches.music.utils.compatibility.Constants.COMPATIBLE_PACKAGE
-import app.revanced.patches.music.utils.settings.SettingsPatch
-import app.revanced.patches.shared.translations.TranslationsUtils.copyXml
-import app.revanced.util.patch.BaseResourcePatch
-
-@Suppress("unused")
-object TranslationsPatch : BaseResourcePatch(
- name = "Translations",
- description = "Adds Crowdin translations for YouTube Music.",
- dependencies = setOf(SettingsPatch::class),
- compatiblePackages = COMPATIBLE_PACKAGE
-) {
- override fun execute(context: ResourceContext) {
- context.copyXml(
- "music",
- arrayOf(
- "bg-rBG",
- "bn",
- "cs-rCZ",
- "el-rGR",
- "es-rES",
- "fr-rFR",
- "hu-rHU",
- "id-rID",
- "in",
- "it-rIT",
- "ja-rJP",
- "ko-rKR",
- "nl-rNL",
- "pl-rPL",
- "pt-rBR",
- "ro-rRO",
- "ru-rRU",
- "tr-rTR",
- "uk-rUA",
- "vi-rVN",
- "zh-rCN",
- "zh-rTW"
- )
- )
-
- }
-}
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsPatch.kt
index ba129d438..842c8da65 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsPatch.kt
@@ -26,24 +26,80 @@ object SettingsPatch : BaseResourcePatch(
compatiblePackages = COMPATIBLE_PACKAGE,
requiresIntegrations = true
), Closeable {
- private val THREAD_COUNT = Runtime.getRuntime().availableProcessors()
- private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
-
lateinit var contexts: ResourceContext
internal var upward0636 = false
internal var upward0642 = false
override fun execute(context: ResourceContext) {
+
+ /**
+ * set resource context
+ */
contexts = context
- val resourceXmlFile = context["res/values/integers.xml"].readBytes()
+ /**
+ * set version info
+ */
+ setVersionInfo()
- for (threadIndex in 0 until THREAD_COUNT) {
+ /**
+ * copy strings
+ */
+ context.copyXmlNode("music/settings/host", "values/strings.xml", "resources")
+
+ /**
+ * hide divider
+ */
+ val styleFile = context["res/values/styles.xml"]
+
+ styleFile.writeText(
+ styleFile.readText()
+ .replace(
+ "allowDividerAbove\">true",
+ "allowDividerAbove\">false"
+ ).replace(
+ "allowDividerBelow\">true",
+ "allowDividerBelow\">false"
+ )
+ )
+
+ /**
+ * Copy arrays
+ */
+ contexts.copyXmlNode("music/settings/host", "values/arrays.xml", "resources")
+
+ /**
+ * Copy colors
+ */
+ context.xmlEditor["res/values/colors.xml"].use { editor ->
+ val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
+
+ for (i in 0 until resourcesNode.childNodes.length) {
+ val node = resourcesNode.childNodes.item(i) as? Element ?: continue
+
+ node.textContent = when (node.getAttribute("name")) {
+ "material_deep_teal_500" -> "@android:color/white"
+
+ else -> continue
+ }
+ }
+ }
+
+ context.addRVXSettingsPreference()
+ }
+
+ private fun setVersionInfo() {
+ val threadCount = Runtime.getRuntime().availableProcessors()
+ val threadPoolExecutor = Executors.newFixedThreadPool(threadCount)
+
+ val resourceXmlFile = contexts["res/values/integers.xml"].readBytes()
+
+ for (threadIndex in 0 until threadCount) {
threadPoolExecutor.execute thread@{
- context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
+ contexts.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
val resources = editor.file.documentElement.childNodes
val resourcesLength = resources.length
- val jobSize = resourcesLength / THREAD_COUNT
+ val jobSize = resourcesLength / threadCount
val batchStart = jobSize * threadIndex
val batchEnd = jobSize * (threadIndex + 1)
@@ -71,47 +127,6 @@ object SettingsPatch : BaseResourcePatch(
threadPoolExecutor
.also { it.shutdown() }
.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
-
- /**
- * copy strings
- */
- context.copyXmlNode("music/settings/host", "values/strings.xml", "resources")
-
- /**
- * hide divider
- */
- val styleFile = context["res/values/styles.xml"]
-
- styleFile.writeText(
- styleFile.readText()
- .replace(
- "allowDividerAbove\">true",
- "allowDividerAbove\">false"
- ).replace(
- "allowDividerBelow\">true",
- "allowDividerBelow\">false"
- )
- )
-
-
- /**
- * Copy colors
- */
- context.xmlEditor["res/values/colors.xml"].use { editor ->
- val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
-
- for (i in 0 until resourcesNode.childNodes.length) {
- val node = resourcesNode.childNodes.item(i) as? Element ?: continue
-
- node.textContent = when (node.getAttribute("name")) {
- "material_deep_teal_500" -> "@android:color/white"
-
- else -> continue
- }
- }
- }
-
- context.addRVXSettingsPreference()
}
internal fun addSwitchPreference(
@@ -162,11 +177,6 @@ object SettingsPatch : BaseResourcePatch(
}
override fun close() {
- /**
- * Copy arrays
- */
- contexts.copyXmlNode("music/settings/host", "values/arrays.xml", "resources")
-
addPreferenceWithIntent(
CategoryType.MISC,
"revanced_extended_settings_import_export"
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/branding/name/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/branding/name/CustomBrandingNamePatch.kt
index a8ccf1be1..dcb71b903 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/branding/name/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/branding/name/CustomBrandingNamePatch.kt
@@ -32,7 +32,7 @@ object CustomBrandingNamePatch : BaseResourcePatch(
val appName = if (AppName != null) {
AppName!!
} else {
- println("WARNING: Invalid name name. Does not apply patches.")
+ println("WARNING: Invalid app name. Does not apply patches.")
ORIGINAL_APP_NAME
}
diff --git a/src/main/kotlin/app/revanced/patches/shared/elements/StringsElementsUtils.kt b/src/main/kotlin/app/revanced/patches/shared/elements/StringsElementsUtils.kt
index b38966a35..cff3e4594 100644
--- a/src/main/kotlin/app/revanced/patches/shared/elements/StringsElementsUtils.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/elements/StringsElementsUtils.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.shared.elements
import app.revanced.patcher.data.ResourceContext
-@Suppress("DEPRECATION")
+@Suppress("DEPRECATION", "unused")
object StringsElementsUtils {
internal fun ResourceContext.removeStringsElements(
diff --git a/src/main/kotlin/app/revanced/patches/shared/translations/TranslationsUtils.kt b/src/main/kotlin/app/revanced/patches/shared/translations/TranslationsUtils.kt
index 3eda7de2a..79f8006ee 100644
--- a/src/main/kotlin/app/revanced/patches/shared/translations/TranslationsUtils.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/translations/TranslationsUtils.kt
@@ -1,28 +1,172 @@
package app.revanced.patches.shared.translations
import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
import app.revanced.util.inputStreamFromBundledResource
+import org.w3c.dom.Node
+import java.io.File
import java.nio.file.Files
import java.nio.file.StandardCopyOption
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
@Suppress("DEPRECATION")
object TranslationsUtils {
- internal fun ResourceContext.copyXml(
+
+ internal fun ResourceContext.invoke(
+ customTranslations: String?,
+ selectedTranslations: String?,
+ selectedStringResources: String?,
+ translationsArray: Array,
+ sourceDirectory: String
+ ) {
+ // Check if the custom translation path is valid.
+ customTranslations?.takeIf { it.isNotEmpty() }?.let { customLang ->
+ try {
+ val customLangFile = File(customLang)
+ if (!customLangFile.exists() || !customLangFile.isFile || customLangFile.name != "strings.xml") {
+ throw PatchException("Invalid custom language file: $customLang")
+ }
+ val resourceDirectory = this["res"].resolve("values")
+ val destinationFile = resourceDirectory.resolve("strings.xml")
+
+ updateStringsXml(customLangFile, destinationFile)
+ } catch (e: Exception) {
+ // Exception is thrown if an invalid path is used in the patch option.
+ throw PatchException("Invalid custom translations path: $customLang")
+ }
+ }?: run {
+ // Process selected translations if no custom translation is set.
+ val selectedTranslationsArray =
+ selectedTranslations?.split(",")?.map { it.trim() }?.toTypedArray()
+ ?: throw PatchException("Invalid selected languages.")
+ val filteredLanguages = translationsArray.filter { it in selectedTranslationsArray }.toTypedArray()
+ copyXml(sourceDirectory, filteredLanguages)
+ }
+
+ // Process selected string resources.
+ val selectedStringResourcesArray =
+ selectedStringResources?.split(",")?.map { it.trim() }?.toTypedArray()
+ ?: throw PatchException("Invalid selected string resources.")
+ val filteredStringResources =
+ APP_LANGUAGES.filter { it in selectedStringResourcesArray }.toTypedArray()
+ val resourceDirectory = this["res"]
+
+ // Remove unselected app languages.
+ APP_LANGUAGES.filter { it !in filteredStringResources }.forEach { language ->
+ resourceDirectory.resolve("values-$language").takeIf { it.exists() && it.isDirectory }
+ ?.deleteRecursively()
+ }
+ }
+
+ /**
+ * Extension function to ResourceContext to copy XML translation files.
+ *
+ * @param sourceDirectory The source directory containing the translation files.
+ * @param languageArray The array of language codes to process.
+ */
+ private fun ResourceContext.copyXml(
sourceDirectory: String,
languageArray: Array
) {
languageArray.forEach { language ->
- val directory = "values-$language-v21"
- this["res/$directory"].mkdir()
+ inputStreamFromBundledResource(
+ "$sourceDirectory/translations",
+ "$language/strings.xml"
+ )?.let { inputStream ->
+ val directory = "values-$language-v21"
+ val valuesV21Directory = this["res"].resolve(directory)
+ if (!valuesV21Directory.isDirectory) Files.createDirectories(valuesV21Directory.toPath())
- Files.copy(
- inputStreamFromBundledResource(
- "$sourceDirectory/translations",
- "$language/strings.xml"
- )!!,
- this["res"].resolve("$directory/strings.xml").toPath(),
- StandardCopyOption.REPLACE_EXISTING
- )
+ Files.copy(
+ inputStream,
+ this["res"].resolve("$directory/strings.xml").toPath(),
+ StandardCopyOption.REPLACE_EXISTING
+ )
+ }
}
}
+
+ /**
+ * Updates the contents of the destination strings.xml file by merging it with the source strings.xml file.
+ *
+ * This function reads both source and destination XML files, compares each element by their
+ * unique "name" attribute, and if a match is found, it replaces the content in the destination file with
+ * the content from the source file.
+ *
+ * @param sourceFile The source strings.xml file containing new string values.
+ * @param destinationFile The destination strings.xml file to be updated with values from the source file.
+ */
+ private fun updateStringsXml(sourceFile: File, destinationFile: File) {
+ val documentBuilderFactory = DocumentBuilderFactory.newInstance()
+ val documentBuilder = documentBuilderFactory.newDocumentBuilder()
+
+ // Parse the source and destination XML files into Document objects
+ val sourceDoc = documentBuilder.parse(sourceFile)
+ val destinationDoc = documentBuilder.parse(destinationFile)
+
+ val sourceStrings = sourceDoc.getElementsByTagName("string")
+ val destinationStrings = destinationDoc.getElementsByTagName("string")
+
+ // Create a map to store the elements from the source document by their "name" attribute
+ val sourceMap = mutableMapOf()
+
+ // Populate the map with nodes from the source document
+ for (i in 0 until sourceStrings.length) {
+ val node = sourceStrings.item(i)
+ val name = node.attributes.getNamedItem("name").nodeValue
+ sourceMap[name] = node
+ }
+
+ // Update the destination document with values from the source document
+ for (i in 0 until destinationStrings.length) {
+ val node = destinationStrings.item(i)
+ val name = node.attributes.getNamedItem("name").nodeValue
+ if (sourceMap.containsKey(name)) {
+ node.textContent = sourceMap[name]?.textContent
+ }
+ }
+
+ /**
+ * Prepare the transformer for writing the updated document back to the file.
+ * The transformer is configured to indent the output XML for better readability.
+ */
+ val transformerFactory = TransformerFactory.newInstance()
+ val transformer = transformerFactory.newTransformer()
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes")
+ transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2")
+
+ val domSource = DOMSource(destinationDoc)
+ val streamResult = StreamResult(destinationFile)
+ transformer.transform(domSource, streamResult)
+ }
}
+
+// Array of all possible app languages.
+val APP_LANGUAGES = arrayOf(
+ "af", "am", "ar", "ar-rXB", "as", "az",
+ "b+es+419", "b+sr+Latn", "be", "bg", "bn", "bs",
+ "ca", "cs",
+ "da", "de",
+ "el", "en-rAU", "en-rCA", "en-rGB", "en-rIN", "en-rXA", "en-rXC", "es", "es-rUS", "et", "eu",
+ "fa", "fi", "fr", "fr-rCA",
+ "gl", "gu",
+ "hi", "hr", "hu", "hy",
+ "id", "in", "is", "it", "iw",
+ "ja",
+ "ka", "kk", "km", "kn", "ko", "ky",
+ "lo", "lt", "lv",
+ "mk", "ml", "mn", "mr", "ms", "my",
+ "nb", "ne", "nl", "no",
+ "or",
+ "pa", "pl", "pt", "pt-rBR", "pt-rPT",
+ "ro", "ru",
+ "si", "sk", "sl", "sq", "sr", "sv", "sw",
+ "ta", "te", "th", "tl", "tr",
+ "uk", "ur", "uz",
+ "vi",
+ "zh", "zh-rCN", "zh-rHK", "zh-rTW", "zu",
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/actionbuttons/ShortsActionButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/actionbuttons/ShortsActionButtonsPatch.kt
new file mode 100644
index 000000000..e212d508d
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/actionbuttons/ShortsActionButtonsPatch.kt
@@ -0,0 +1,84 @@
+package app.revanced.patches.youtube.layout.actionbuttons
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
+import app.revanced.patches.youtube.utils.settings.SettingsPatch
+import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
+import app.revanced.util.patch.BaseResourcePatch
+
+@Suppress("unused")
+object ShortsActionButtonsPatch : BaseResourcePatch(
+ name = "Custom Shorts action buttons",
+ description = "Changes, at compile time, the icon of the action buttons of the Shorts player.",
+ dependencies = setOf(SettingsPatch::class),
+ compatiblePackages = COMPATIBLE_PACKAGE
+) {
+ private const val DEFAULT_ICON_KEY = "Round"
+
+ private val IconType by stringPatchOption(
+ key = "IconType",
+ default = DEFAULT_ICON_KEY,
+ values = mapOf(
+ "Outline" to "outline",
+ "OutlineCircle" to "outlinecircle",
+ DEFAULT_ICON_KEY to "round"
+ ),
+ title = "Shorts icon style ",
+ description = "The style of the icons for the action buttons in the Shorts player."
+ )
+
+ override fun execute(context: ResourceContext) {
+ IconType?.let { iconType ->
+ val selectedIconType = iconType.lowercase()
+
+ arrayOf(
+ "xxxhdpi",
+ "xxhdpi",
+ "xhdpi",
+ "hdpi",
+ "mdpi"
+ ).forEach { dpi ->
+ context.copyResources(
+ "youtube/shorts/actionbuttons/$selectedIconType",
+ ResourceGroup(
+ "drawable-$dpi",
+ "ic_remix_filled_white_shadowed.webp",
+ "ic_right_comment_shadowed.webp",
+ "ic_right_dislike_off_shadowed.webp",
+ "ic_right_dislike_on_shadowed.webp",
+ "ic_right_like_off_shadowed.webp",
+ "ic_right_like_on_shadowed.webp",
+ "ic_right_share_shadowed.webp",
+
+ // for older versions only
+ "ic_remix_filled_white_24.webp",
+ "ic_right_dislike_on_32c.webp",
+ "ic_right_like_on_32c.webp"
+ ),
+ ResourceGroup(
+ "drawable",
+ "ic_right_comment_32c.xml",
+ "ic_right_dislike_off_32c.xml",
+ "ic_right_like_off_32c.xml",
+ "ic_right_share_32c.xml"
+ )
+ )
+
+ context.copyResources(
+ "youtube/shorts/actionbuttons/shared",
+ ResourceGroup(
+ "drawable",
+ "reel_camera_bold_24dp.xml",
+ "reel_more_vertical_bold_24dp.xml",
+ "reel_search_bold_24dp.xml"
+ )
+ )
+ }
+ } ?: throw PatchException("Invalid icon type.")
+
+ SettingsPatch.updatePatchStatus(this)
+ }
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/animated/AnimatedLikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/animated/AnimatedLikePatch.kt
index fb2edab96..4a97317d0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/animated/AnimatedLikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/animated/AnimatedLikePatch.kt
@@ -21,7 +21,7 @@ object AnimatedLikePatch : BaseResourcePatch(
* Copy json
*/
context.copyResources(
- "youtube/animated",
+ "youtube/shorts/animated",
ResourceGroup(
"raw",
"like_tap_feedback.json"
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
index 2b41eb336..4db560fb6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt
@@ -2,12 +2,14 @@ package app.revanced.patches.youtube.layout.branding.icon
import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.youtube.utils.settings.ResourceUtils.updatePatchStatusIcon
import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.ResourceGroup
import app.revanced.util.copyResources
+import app.revanced.util.copyXmlNode
import app.revanced.util.patch.BaseResourcePatch
import java.io.File
import java.nio.file.Files
@@ -17,47 +19,84 @@ object CustomBrandingIconPatch : BaseResourcePatch(
name = "Custom branding icon YouTube",
description = "Changes the YouTube app icon to the icon specified in options.json.",
dependencies = setOf(SettingsPatch::class),
- compatiblePackages = COMPATIBLE_PACKAGE
+ compatiblePackages = COMPATIBLE_PACKAGE,
) {
private const val DEFAULT_ICON_KEY = "Revancify Blue"
private val availableIcon = mapOf(
+ "AFN Blue" to "afn_blue",
+ "AFN Red" to "afn_red",
"MMT" to "mmt",
DEFAULT_ICON_KEY to "revancify_blue",
- "Revancify Red" to "revancify_red"
+ "Revancify Red" to "revancify_red",
+ "YouTube" to "youtube"
)
- private val drawableIconResourceFileNames = arrayOf(
- "product_logo_youtube_color_24",
- "product_logo_youtube_color_36",
- "product_logo_youtube_color_144",
- "product_logo_youtube_color_192"
- ).map { "$it.png" }.toTypedArray()
-
- private val drawableDirectories = arrayOf(
+ private val sizeArray = arrayOf(
"xxxhdpi",
"xxhdpi",
"xhdpi",
"hdpi",
"mdpi"
- ).map { "drawable-$it" }
+ )
- private val mipmapIconResourceFileNames = arrayOf(
+ private val drawableDirectories = sizeArray.map { "drawable-$it" }
+
+ private val mipmapDirectories = sizeArray.map { "mipmap-$it" }
+
+ private val headerIconResourceFileNames = arrayOf(
+ "yt_premium_wordmark_header_dark",
+ "yt_premium_wordmark_header_light",
+ "yt_wordmark_header_dark",
+ "yt_wordmark_header_light"
+ ).map { "$it.png" }.toTypedArray()
+
+ private val launcherIconResourceFileNames = arrayOf(
"adaptiveproduct_youtube_background_color_108",
"adaptiveproduct_youtube_foreground_color_108",
"ic_launcher",
"ic_launcher_round"
).map { "$it.png" }.toTypedArray()
- private val mipmapDirectories = arrayOf(
- "xxxhdpi",
- "xxhdpi",
- "xhdpi",
- "hdpi",
- "mdpi"
- ).map { "mipmap-$it" }
+ private val splashIconResourceFileNames = arrayOf(
+ "product_logo_youtube_color_24",
+ "product_logo_youtube_color_36",
+ "product_logo_youtube_color_144",
+ "product_logo_youtube_color_192"
+ ).map { "$it.png" }.toTypedArray()
- private var AppIcon by stringPatchOption(
+ private val oldSplashAnimationResourceFileNames = arrayOf(
+ "\$\$avd_anim__1__0",
+ "\$\$avd_anim__1__1",
+ "\$\$avd_anim__2__0",
+ "\$\$avd_anim__2__1",
+ "\$\$avd_anim__3__0",
+ "\$\$avd_anim__3__1",
+ "\$avd_anim__0",
+ "\$avd_anim__1",
+ "\$avd_anim__2",
+ "\$avd_anim__3",
+ "\$avd_anim__4",
+ "avd_anim"
+ ).map { "$it.xml" }.toTypedArray()
+
+ private fun List.getResourceGroup(fileNames: Array) = map { directory ->
+ ResourceGroup(
+ directory, *fileNames
+ )
+ }
+
+ private val headerIconResourceGroups = drawableDirectories.getResourceGroup(headerIconResourceFileNames)
+
+ private val launcherIconResourceGroups = mipmapDirectories.getResourceGroup(launcherIconResourceFileNames)
+
+ private val splashIconResourceGroups = drawableDirectories.getResourceGroup(splashIconResourceFileNames)
+
+ private val oldSplashAnimationResourceGroups = listOf("drawable").getResourceGroup(oldSplashAnimationResourceFileNames)
+
+ // region patch option
+
+ val AppIcon by stringPatchOption(
key = "AppIcon",
default = DEFAULT_ICON_KEY,
values = availableIcon,
@@ -69,22 +108,45 @@ object CustomBrandingIconPatch : BaseResourcePatch(
Each of these folders has to have the following files:
- ${mipmapIconResourceFileNames.joinToString("\n") { "- $it" }}
+ ${launcherIconResourceFileNames.joinToString("\n") { "- $it" }}
"""
.split("\n")
.joinToString("\n") { it.trimIndent() } // Remove the leading whitespace from each line.
.trimIndent(), // Remove the leading newline.
)
+ private val ChangeHeader by booleanPatchOption(
+ key = "ChangeHeader",
+ default = false,
+ title = "Change header",
+ description = "Apply the custom branding icon to the header."
+ )
+
+ private val ChangeSplashIcon by booleanPatchOption(
+ key = "ChangeSplashIcon",
+ default = true,
+ title = "Change splash icons",
+ description = "Apply the custom branding icon to the splash screen."
+ )
+
+ private val RestoreOldSplashAnimation by booleanPatchOption(
+ key = "RestoreOldSplashAnimation",
+ default = false,
+ title = "Restore old splash animation",
+ description = "Restores old style splash animation."
+ )
+
+ // endregion
+
override fun execute(context: ResourceContext) {
AppIcon?.let { appIcon ->
val appIconValue = appIcon.lowercase().replace(" ", "_")
+ val appIconResourcePath = "youtube/branding/$appIconValue"
+ val stockResourcePath = "youtube/branding/stock"
+
+ // Check if a custom path is used in the patch options.
if (!availableIcon.containsValue(appIconValue)) {
- mipmapDirectories.map { directory ->
- ResourceGroup(
- directory, *mipmapIconResourceFileNames
- )
- }.let { resourceGroups ->
+ launcherIconResourceGroups.let { resourceGroups ->
try {
val path = File(appIcon)
val resourceDirectory = context["res"]
@@ -100,48 +162,63 @@ object CustomBrandingIconPatch : BaseResourcePatch(
)
}
}
+
context.updatePatchStatusIcon("custom")
} catch (_: Exception) {
+ // Exception is thrown if an invalid path is used in the patch option.
throw PatchException("Invalid app icon path: $appIcon")
}
}
} else {
- val resourcePath = "youtube/branding/$appIconValue"
-
- // change launcher icon.
- mipmapDirectories.map { directory ->
- ResourceGroup(
- directory, *mipmapIconResourceFileNames
- )
- }.let { resourceGroups ->
+ // Change launcher icon.
+ launcherIconResourceGroups.let { resourceGroups ->
resourceGroups.forEach {
- context.copyResources("$resourcePath/launcher", it)
+ context.copyResources("$appIconResourcePath/launcher", it)
}
}
- // change splash icon.
- drawableDirectories.map { directory ->
- ResourceGroup(
- directory, *drawableIconResourceFileNames
- )
- }.let { resourceGroups ->
- resourceGroups.forEach {
- context.copyResources("$resourcePath/splash", it)
- }
- }
-
- // change monochrome icon.
+ // Change monochrome icon.
arrayOf(
ResourceGroup(
"drawable",
"adaptive_monochrome_ic_youtube_launcher.xml"
)
).forEach { resourceGroup ->
- context.copyResources("$resourcePath/monochrome", resourceGroup)
+ context.copyResources("$appIconResourcePath/monochrome", resourceGroup)
+ }
+
+ // Change header.
+ if (ChangeHeader == true) {
+ headerIconResourceGroups.let { resourceGroups ->
+ resourceGroups.forEach {
+ context.copyResources("$appIconResourcePath/header", it)
+ }
+ }
+ }
+
+ // Change splash icon.
+ if (ChangeSplashIcon == true) {
+ splashIconResourceGroups.let { resourceGroups ->
+ resourceGroups.forEach {
+ context.copyResources("$appIconResourcePath/splash", it)
+ }
+ }
+ }
+
+ // Change splash screen.
+ if (RestoreOldSplashAnimation == true) {
+ oldSplashAnimationResourceGroups.let { resourceGroups ->
+ resourceGroups.forEach {
+ context.copyResources("$stockResourcePath/splash", it)
+ context.copyResources("$appIconResourcePath/splash", it)
+ }
+ }
+
+ context.copyXmlNode("$stockResourcePath/splash", "values-v31/styles.xml", "resources")
}
context.updatePatchStatusIcon(appIconValue)
}
} ?: throw PatchException("Invalid app icon path.")
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
index a3b656a2a..5b0240aa0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt
@@ -22,12 +22,13 @@ object CustomBrandingNamePatch : BaseResourcePatch(
key = "AppName",
default = APP_NAME,
values = mapOf(
- "Full name" to "ReVanced Extended",
- "Short name" to APP_NAME
+ "ReVanced Extended" to "ReVanced Extended",
+ "RVX" to APP_NAME,
+ "YouTube RVX" to "YouTube RVX",
+ "YouTube" to "YouTube",
),
title = "App name",
- description = "The name of the app.",
- required = true
+ description = "The name of the app."
)
override fun execute(context: ResourceContext) {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/translations/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/translations/TranslationsPatch.kt
index aa8b5312c..a62d5cd14 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/translations/TranslationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/translations/TranslationsPatch.kt
@@ -1,42 +1,61 @@
package app.revanced.patches.youtube.layout.translations
import app.revanced.patcher.data.ResourceContext
-import app.revanced.patches.shared.translations.TranslationsUtils.copyXml
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.shared.translations.APP_LANGUAGES
+import app.revanced.patches.shared.translations.TranslationsUtils.invoke
import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.patch.BaseResourcePatch
@Suppress("unused")
object TranslationsPatch : BaseResourcePatch(
- name = "Translations",
- description = "Adds Crowdin translations for YouTube.",
+ name = "Translations YouTube",
+ description = "Add translations or remove string resources.",
dependencies = setOf(SettingsPatch::class),
compatiblePackages = COMPATIBLE_PACKAGE
) {
- override fun execute(context: ResourceContext) {
+ // Array of supported translations, each represented by its language code.
+ private val TRANSLATIONS = arrayOf(
+ "ar", "el-rGR", "es-rES", "fr-rFR", "hu-rHU", "it-rIT", "ja-rJP", "ko-rKR", "pl-rPL",
+ "pt-rBR", "ru-rRU", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
+ )
- context.copyXml(
- "youtube",
- arrayOf(
- "ar",
- "el-rGR",
- "es-rES",
- "fr-rFR",
- "hu-rHU",
- "it-rIT",
- "ja-rJP",
- "ko-rKR",
- "pl-rPL",
- "pt-rBR",
- "ru-rRU",
- "tr-rTR",
- "uk-rUA",
- "vi-rVN",
- "zh-rCN",
- "zh-rTW"
- )
+ private var CustomTranslations by stringPatchOption(
+ key = "CustomTranslations",
+ default = "",
+ title = "Custom translations",
+ description = """
+ The path to the 'strings.xml' file.
+ Please note that applying the 'strings.xml' file will overwrite all existing translations.
+ """.trimIndent()
+ )
+
+ private var SelectedTranslations by stringPatchOption(
+ key = "SelectedTranslations",
+ default = TRANSLATIONS.joinToString(", "),
+ title = "Translations to add",
+ description = "A list of translations to be added for the RVX settings, separated by commas."
+ )
+
+ private var SelectedStringResources by stringPatchOption(
+ key = "SelectedStringResources",
+ default = APP_LANGUAGES.joinToString(", "),
+ title = "String resources to keep",
+ description = """
+ A list of string resources to be kept, separated by commas.
+ String resources not in the list will be removed from the app.
+
+ Default string resource, English, is not removed.
+ """.trimIndent()
+ )
+
+ override fun execute(context: ResourceContext) {
+ context.invoke(
+ CustomTranslations, SelectedTranslations, SelectedStringResources,
+ TRANSLATIONS, "youtube"
)
- SettingsPatch.updatePatchStatus(this)
+ SettingsPatch.updatePatchStatus("Translations")
}
}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt
new file mode 100644
index 000000000..2d1a2ade2
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/visual/VisualPreferencesIconsPatch.kt
@@ -0,0 +1,377 @@
+package app.revanced.patches.youtube.layout.visual
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.youtube.layout.branding.icon.CustomBrandingIconPatch
+import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
+import app.revanced.patches.youtube.utils.settings.SettingsPatch
+import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
+import app.revanced.util.doRecursively
+import app.revanced.util.patch.BaseResourcePatch
+import org.w3c.dom.Element
+
+@Suppress("DEPRECATION", "unused")
+object VisualPreferencesIconsPatch : BaseResourcePatch(
+ name = "Visual preferences icons",
+ description = "Adds icons to specific preferences in the settings.",
+ dependencies = setOf(SettingsPatch::class),
+ compatiblePackages = COMPATIBLE_PACKAGE,
+ use = false
+) {
+ private const val DEFAULT_ICON_KEY = "Extension"
+
+ private val RVXSettingsMenuIcon by stringPatchOption(
+ key = "RVXSettingsMenuIcon",
+ default = DEFAULT_ICON_KEY,
+ values = mapOf(
+ "Custom branding icon" to "custom_branding_icon",
+ DEFAULT_ICON_KEY to "extension",
+ "Gear" to "gear",
+ "ReVanced" to "revanced",
+ "ReVanced Colored" to "revanced_colored",
+ ),
+ title = "RVX settings menu icon",
+ description = "Apply different icons for RVX settings menu."
+ )
+
+ override fun execute(context: ResourceContext) {
+
+ // region copy shared resources.
+
+ arrayOf(
+ ResourceGroup(
+ "drawable",
+ *preferenceIcon.values.map { "$it.xml" }.toTypedArray()
+ ),
+ ResourceGroup(
+ "drawable-xxhdpi",
+ "$emptyIcon.png"
+ ),
+ ).forEach { resourceGroup ->
+ context.copyResources("youtube/visual/shared", resourceGroup)
+ }
+
+ // endregion.
+
+ // region copy RVX settings menu icon.
+
+ RVXSettingsMenuIcon?.lowercase()?.replace(" ", "_")?.let { selectedIconType ->
+ CustomBrandingIconPatch.AppIcon?.lowercase()?.replace(" ", "_")?.let { appIconValue ->
+ val fallbackIconPath = "youtube/visual/icons/extension"
+ val iconPath = when (selectedIconType) {
+ "custom_branding_icon" -> "youtube/branding/$appIconValue/settings"
+ else -> "youtube/visual/icons/$selectedIconType"
+ }
+ val resourceGroup = ResourceGroup(
+ "drawable",
+ "revanced_extended_settings_key_icon.xml"
+ )
+
+ try {
+ context.copyResources(iconPath, resourceGroup)
+ } catch (_: Exception) {
+ // Ignore if resource copy fails
+
+ // Add a fallback extended icon
+ // It's needed if someone provides custom path to icon(s) folder
+ // but custom branding icons for Extended setting are predefined,
+ // so it won't copy custom branding icon
+ // and will raise an error without fallback icon
+ context.copyResources(fallbackIconPath, resourceGroup)
+ }
+ }
+ }
+
+ // endregion.
+
+ // region set visual preferences icon.
+
+ arrayOf(
+ "res/xml/revanced_prefs.xml",
+ "res/xml/settings_fragment.xml"
+ ).forEach { xmlFile ->
+ context.xmlEditor[xmlFile].use { editor ->
+ editor.file.doRecursively loop@{ node ->
+ if (node !is Element) return@loop
+
+ node.getAttributeNode("android:key")
+ ?.textContent
+ ?.removePrefix("@string/")
+ ?.let { title ->
+ val drawableName = when (title) {
+ in preferenceKey -> preferenceIcon[title]
+
+ // Add custom RVX settings menu icon
+ in intentKey -> intentIcon[title]
+ in emptyTitles -> emptyIcon
+ else -> null
+ }
+ drawableName?.let {
+ node.setAttribute("android:icon", "@drawable/$it")
+ }
+ }
+ }
+ }
+ }
+
+ // endregion.
+
+ SettingsPatch.updatePatchStatus(this)
+ }
+
+ // region preference key and icon.
+
+ private val preferenceKey = setOf(
+ // Main settings (sorted as displayed in the settings)
+ "parent_tools_key",
+ "general_key",
+ "account_switcher_key",
+ "data_saving_settings_key",
+ "auto_play_key",
+ "video_quality_settings_key",
+ "offline_key",
+ "pair_with_tv_key",
+ "history_key",
+ "your_data_key",
+ "privacy_key",
+ "premium_early_access_browse_page_key",
+ "subscription_product_setting_key",
+ "billing_and_payment_key",
+ "notification_key",
+ "connected_accounts_browse_page_key",
+ "live_chat_key",
+ "captions_key",
+ "accessibility_settings_key",
+ "about_key",
+
+ // Main RVX settings (sorted as displayed in the settings)
+ "revanced_preference_screen_ads",
+ "revanced_preference_screen_alt_thumbnails",
+ "revanced_preference_screen_feed",
+ "revanced_preference_screen_general",
+ "revanced_preference_screen_player",
+ "revanced_preference_screen_shorts",
+ "revanced_preference_screen_swipe_controls",
+ "revanced_preference_screen_video",
+ "revanced_preference_screen_ryd",
+ "revanced_preference_screen_sb",
+ "revanced_preference_screen_misc",
+
+ // Internal RVX settings (items without prefix are listed first, others are sorted alphabetically)
+ "gms_core_settings",
+ "sb_enable_create_segment",
+ "sb_enable_voting",
+
+ "revanced_alt_thumbnail_home",
+ "revanced_alt_thumbnail_library",
+ "revanced_alt_thumbnail_player",
+ "revanced_alt_thumbnail_search",
+ "revanced_alt_thumbnail_subscriptions",
+ "revanced_change_shorts_repeat_state",
+ "revanced_custom_player_overlay_opacity",
+ "revanced_default_app_settings",
+ "revanced_default_playback_speed",
+ "revanced_default_video_quality_wifi",
+ "revanced_disable_hdr_auto_brightness",
+ "revanced_disable_hdr_video",
+ "revanced_disable_quic_protocol",
+ "revanced_enable_debug_logging",
+ "revanced_enable_default_playback_speed_shorts",
+ "revanced_enable_external_browser",
+ "revanced_enable_old_quality_layout",
+ "revanced_enable_open_links_directly",
+ "revanced_enable_swipe_brightness",
+ "revanced_enable_swipe_haptic_feedback",
+ "revanced_enable_swipe_lowest_value_auto_brightness",
+ "revanced_enable_swipe_press_to_engage",
+ "revanced_enable_swipe_volume",
+ "revanced_enable_watch_panel_gestures",
+ "revanced_hide_clip_button",
+ "revanced_hide_download_button",
+ "revanced_hide_keyword_content_comments",
+ "revanced_hide_keyword_content_home",
+ "revanced_hide_keyword_content_search",
+ "revanced_hide_keyword_content_subscriptions",
+ "revanced_hide_like_dislike_button",
+ "revanced_hide_navigation_create_button",
+ "revanced_hide_navigation_home_button",
+ "revanced_hide_navigation_library_button",
+ "revanced_hide_navigation_notifications_button",
+ "revanced_hide_navigation_shorts_button",
+ "revanced_hide_navigation_subscriptions_button",
+ "revanced_hide_player_autoplay_button",
+ "revanced_hide_player_captions_button",
+ "revanced_hide_player_cast_button",
+ "revanced_hide_player_collapse_button",
+ "revanced_hide_player_flyout_menu_ambient_mode",
+ "revanced_hide_player_flyout_menu_audio_track",
+ "revanced_hide_player_flyout_menu_captions",
+ "revanced_hide_player_flyout_menu_help",
+ "revanced_hide_player_flyout_menu_lock_screen",
+ "revanced_hide_player_flyout_menu_loop_video",
+ "revanced_hide_player_flyout_menu_more_info",
+ "revanced_hide_player_flyout_menu_playback_speed",
+ "revanced_hide_player_flyout_menu_quality_footer",
+ "revanced_hide_player_flyout_menu_report",
+ "revanced_hide_player_flyout_menu_stable_volume",
+ "revanced_hide_player_flyout_menu_stats_for_nerds",
+ "revanced_hide_player_flyout_menu_watch_in_vr",
+ "revanced_hide_player_fullscreen_button",
+ "revanced_hide_player_previous_next_button",
+ "revanced_hide_player_youtube_music_button",
+ "revanced_hide_playlist_button",
+ "revanced_hide_quick_actions_comment_button",
+ "revanced_hide_quick_actions_dislike_button",
+ "revanced_hide_quick_actions_like_button",
+ "revanced_hide_quick_actions_live_chat_button",
+ "revanced_hide_quick_actions_more_button",
+ "revanced_hide_quick_actions_save_to_playlist_button",
+ "revanced_hide_quick_actions_share_button",
+ "revanced_hide_remix_button",
+ "revanced_hide_report_button",
+ "revanced_hide_share_button",
+ "revanced_hide_shorts_comments_button",
+ "revanced_hide_shorts_dislike_button",
+ "revanced_hide_shorts_like_button",
+ "revanced_hide_shorts_navigation_bar",
+ "revanced_hide_shorts_remix_button",
+ "revanced_hide_shorts_share_button",
+ "revanced_hide_shorts_shelf_history",
+ "revanced_hide_shorts_shelf_home_related_videos",
+ "revanced_hide_shorts_shelf_search",
+ "revanced_hide_shorts_shelf_subscriptions",
+ "revanced_hide_shorts_toolbar",
+ "revanced_overlay_button_always_repeat",
+ "revanced_overlay_button_copy_video_url",
+ "revanced_overlay_button_copy_video_url_timestamp",
+ "revanced_overlay_button_external_downloader",
+ "revanced_overlay_button_speed_dialog",
+ "revanced_overlay_button_time_ordered_playlist",
+ "revanced_overlay_button_whitelist",
+ "revanced_preference_screen_account_menu",
+ "revanced_preference_screen_action_buttons",
+ "revanced_preference_screen_ambient_mode",
+ "revanced_preference_screen_category_bar",
+ "revanced_preference_screen_channel_bar",
+ "revanced_preference_screen_channel_profile",
+ "revanced_preference_screen_comments",
+ "revanced_preference_screen_community_posts",
+ "revanced_preference_screen_custom_filter",
+ "revanced_preference_screen_feed_flyout_menu",
+ "revanced_preference_screen_fullscreen",
+ "revanced_preference_screen_haptic_feedback",
+ "revanced_preference_screen_import_export",
+ "revanced_preference_screen_navigation_buttons",
+ "revanced_preference_screen_patch_information",
+ "revanced_preference_screen_player_buttons",
+ "revanced_preference_screen_player_flyout_menu",
+ "revanced_preference_screen_seekbar",
+ "revanced_preference_screen_settings_menu",
+ "revanced_preference_screen_shorts_player",
+ "revanced_preference_screen_spoof_client",
+ "revanced_preference_screen_toolbar",
+ "revanced_preference_screen_video_description",
+ "revanced_preference_screen_video_filter",
+ "revanced_sanitize_sharing_links",
+ "revanced_swipe_gestures_lock_mode",
+ "revanced_swipe_magnitude_threshold",
+ "revanced_swipe_overlay_background_alpha",
+ "revanced_swipe_overlay_rect_size",
+ "revanced_swipe_overlay_text_size",
+ "revanced_swipe_overlay_timeout",
+ "revanced_switch_create_with_notifications_button",
+ "revanced_change_player_flyout_menu_toggle",
+ )
+
+ private val intentKey = setOf(
+ "revanced_extended_settings_key",
+ )
+
+ private val emptyTitles = setOf(
+ "revanced_custom_playback_speeds",
+ "revanced_custom_playback_speed_menu_type",
+ "revanced_default_video_quality_mobile",
+ "revanced_disable_default_playback_speed_live",
+ "revanced_enable_custom_playback_speed",
+ "revanced_external_downloader_package_name",
+ "revanced_hide_shorts_comments_disabled_button",
+ "revanced_hide_player_flyout_menu_captions_footer",
+ "revanced_remember_playback_speed_last_selected",
+ "revanced_remember_video_quality_last_selected",
+ "revanced_restore_old_video_quality_menu",
+ "revanced_enable_debug_buffer_logging",
+ "revanced_whitelist_settings",
+ )
+
+ // A lot of mappings here.
+ // The performance impact should be negligible in this context,
+ // as the operations involved are not computationally intensive.
+ private val preferenceIcon = preferenceKey.associateWith { title ->
+ when (title) {
+ // Main RVX settings
+ "revanced_preference_screen_general" -> "general_key_icon"
+ "revanced_preference_screen_sb" -> "sb_enable_create_segment_icon"
+
+ // Internal RVX settings
+ "revanced_alt_thumbnail_home" -> "revanced_hide_navigation_home_button_icon"
+ "revanced_alt_thumbnail_library" -> "revanced_preference_screen_video_icon"
+ "revanced_alt_thumbnail_player" -> "revanced_preference_screen_player_icon"
+ "revanced_alt_thumbnail_search" -> "revanced_hide_shorts_shelf_search_icon"
+ "revanced_alt_thumbnail_subscriptions" -> "revanced_hide_navigation_subscriptions_button_icon"
+ "revanced_custom_player_overlay_opacity" -> "revanced_swipe_overlay_background_alpha_icon"
+ "revanced_default_app_settings" -> "revanced_preference_screen_settings_menu_icon"
+ "revanced_default_playback_speed" -> "revanced_overlay_button_speed_dialog_icon"
+ "revanced_enable_old_quality_layout" -> "revanced_default_video_quality_wifi_icon"
+ "revanced_enable_watch_panel_gestures" -> "revanced_preference_screen_swipe_controls_icon"
+ "revanced_hide_download_button" -> "revanced_overlay_button_external_downloader_icon"
+ "revanced_hide_keyword_content_comments" -> "revanced_hide_quick_actions_comment_button_icon"
+ "revanced_hide_keyword_content_home" -> "revanced_hide_navigation_home_button_icon"
+ "revanced_hide_keyword_content_search" -> "revanced_hide_shorts_shelf_search_icon"
+ "revanced_hide_keyword_content_subscriptions" -> "revanced_hide_navigation_subscriptions_button_icon"
+ "revanced_hide_like_dislike_button" -> "sb_enable_voting_icon"
+ "revanced_hide_navigation_library_button" -> "revanced_preference_screen_video_icon"
+ "revanced_hide_navigation_notifications_button" -> "notification_key_icon"
+ "revanced_hide_navigation_shorts_button" -> "revanced_preference_screen_shorts_icon"
+ "revanced_hide_player_autoplay_button" -> "revanced_change_player_flyout_menu_toggle_icon"
+ "revanced_hide_player_captions_button" -> "captions_key_icon"
+ "revanced_hide_player_flyout_menu_ambient_mode" -> "revanced_preference_screen_ambient_mode_icon"
+ "revanced_hide_player_flyout_menu_captions" -> "captions_key_icon"
+ "revanced_hide_player_flyout_menu_loop_video" -> "revanced_overlay_button_always_repeat_icon"
+ "revanced_hide_player_flyout_menu_more_info" -> "about_key_icon"
+ "revanced_hide_player_flyout_menu_quality_footer" -> "revanced_default_video_quality_wifi_icon"
+ "revanced_hide_player_flyout_menu_report" -> "revanced_hide_report_button_icon"
+ "revanced_hide_player_fullscreen_button" -> "revanced_preference_screen_fullscreen_icon"
+ "revanced_hide_quick_actions_dislike_button" -> "revanced_preference_screen_ryd_icon"
+ "revanced_hide_quick_actions_live_chat_button" -> "live_chat_key_icon"
+ "revanced_hide_quick_actions_save_to_playlist_button" -> "revanced_hide_playlist_button_icon"
+ "revanced_hide_quick_actions_share_button" -> "revanced_hide_shorts_share_button_icon"
+ "revanced_hide_remix_button" -> "revanced_hide_shorts_remix_button_icon"
+ "revanced_hide_share_button" -> "revanced_hide_shorts_share_button_icon"
+ "revanced_hide_shorts_comments_button" -> "revanced_hide_quick_actions_comment_button_icon"
+ "revanced_hide_shorts_dislike_button" -> "revanced_preference_screen_ryd_icon"
+ "revanced_hide_shorts_like_button" -> "revanced_hide_quick_actions_like_button_icon"
+ "revanced_hide_shorts_navigation_bar" -> "revanced_preference_screen_navigation_buttons_icon"
+ "revanced_hide_shorts_shelf_home_related_videos" -> "revanced_hide_navigation_home_button_icon"
+ "revanced_hide_shorts_shelf_subscriptions" -> "revanced_hide_navigation_subscriptions_button_icon"
+ "revanced_hide_shorts_toolbar" -> "revanced_preference_screen_toolbar_icon"
+ "revanced_preference_screen_account_menu" -> "account_switcher_key_icon"
+ "revanced_preference_screen_channel_bar" -> "account_switcher_key_icon"
+ "revanced_preference_screen_channel_profile" -> "account_switcher_key_icon"
+ "revanced_preference_screen_comments" -> "revanced_hide_quick_actions_comment_button_icon"
+ "revanced_preference_screen_feed_flyout_menu" -> "revanced_preference_screen_player_flyout_menu_icon"
+ "revanced_preference_screen_haptic_feedback" -> "revanced_enable_swipe_haptic_feedback_icon"
+ "revanced_preference_screen_patch_information" -> "about_key_icon"
+ "revanced_preference_screen_shorts_player" -> "revanced_preference_screen_shorts_icon"
+ "revanced_preference_screen_video_filter" -> "revanced_preference_screen_video_icon"
+ "revanced_swipe_gestures_lock_mode" -> "revanced_hide_player_flyout_menu_lock_screen_icon"
+ "revanced_disable_hdr_auto_brightness" -> "revanced_disable_hdr_video_icon"
+ else -> "${title}_icon"
+ }
+ }
+ private val intentIcon = intentKey.associateWith { "${it}_icon" }
+ private const val emptyIcon = "empty_icon"
+
+ // endregion.
+
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
index f2de96b0c..df796109d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt
@@ -299,12 +299,14 @@ object ShortsComponentPatch : BaseBytecodePatch(
/**
* Add settings
*/
- SettingsPatch.addPreference(
- arrayOf(
- "PREFERENCE_SCREEN: SHORTS",
- "SETTINGS: SHORTS_COMPONENTS"
- )
+ var settingArray = arrayOf(
+ "PREFERENCE_SCREEN: SHORTS",
+ "SETTINGS: SHORTS_COMPONENTS"
)
+ if (SettingsPatch.upward1834) {
+ settingArray += "SETTINGS: HIDE_SHORTS_COMMENTS_DISABLED_BUTTON"
+ }
+ SettingsPatch.addPreference(settingArray)
SettingsPatch.updatePatchStatus(this)
}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/outlinebutton/ShortsOutlineButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/outlinebutton/ShortsOutlineButtonPatch.kt
deleted file mode 100644
index 577df9feb..000000000
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/outlinebutton/ShortsOutlineButtonPatch.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package app.revanced.patches.youtube.shorts.outlinebutton
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
-import app.revanced.patches.youtube.utils.settings.SettingsPatch
-import app.revanced.util.ResourceGroup
-import app.revanced.util.copyResources
-import app.revanced.util.patch.BaseResourcePatch
-
-@Suppress("unused")
-object ShortsOutlineButtonPatch : BaseResourcePatch(
- name = "Shorts outline button",
- description = "Applies, at compile time, the outline icon to the action buttons in the Shorts player.",
- dependencies = setOf(SettingsPatch::class),
- compatiblePackages = COMPATIBLE_PACKAGE
-) {
- override fun execute(context: ResourceContext) {
-
- arrayOf(
- "xxxhdpi",
- "xxhdpi",
- "xhdpi",
- "hdpi",
- "mdpi"
- ).forEach { dpi ->
- context.copyResources(
- "youtube/shorts/outline",
- ResourceGroup(
- "drawable-$dpi",
- "ic_remix_filled_white_24.webp",
- "ic_remix_filled_white_shadowed.webp",
- "ic_right_comment_shadowed.webp",
- "ic_right_dislike_off_shadowed.webp",
- "ic_right_dislike_on_32c.webp",
- "ic_right_dislike_on_shadowed.webp",
- "ic_right_like_off_shadowed.webp",
- "ic_right_like_on_32c.webp",
- "ic_right_like_on_shadowed.webp",
- "ic_right_share_shadowed.webp"
- )
- )
- }
-
- arrayOf(
- // Shorts outline icons for older versions of YouTube
- ResourceGroup(
- "drawable",
- "ic_right_comment_32c.xml",
- "ic_right_dislike_off_32c.xml",
- "ic_right_like_off_32c.xml",
- "ic_right_share_32c.xml"
- )
- ).forEach { resourceGroup ->
- context.copyResources("youtube/shorts/outline", resourceGroup)
- }
-
- SettingsPatch.updatePatchStatus(this)
-
- }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
index e8d0eb980..366b3f7c2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt
@@ -152,7 +152,7 @@ object SwipeControlsPatch : BaseBytecodePatch(
SettingsPatch.addPreference(
arrayOf(
"PREFERENCE_CATEGORY: SWIPE_CONTROLS_EXPERIMENTAL_FLAGS",
- "SETTINGS: ENABLE_WATCH_PANEL_GESTEURES"
+ "SETTINGS: ENABLE_WATCH_PANEL_GESTURES"
)
)
} ?: println("WARNING: Failed to resolve WatchPanelGesturesFingerprint")
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/ResourceUtils.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/ResourceUtils.kt
index 6eb03edbe..61710f90e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/ResourceUtils.kt
@@ -100,18 +100,33 @@ object ResourceUtils {
}
}
- fun ResourceContext.addPreferenceFragment(key: String) {
+ fun ResourceContext.addPreferenceFragment(key: String, insertKey: String) {
val targetClass =
"com.google.android.apps.youtube.app.settings.videoquality.VideoQualitySettingsActivity"
this.xmlEditor[YOUTUBE_SETTINGS_PATH].use { editor ->
with(editor.file) {
- doRecursively loop@{
- if (it !is Element) return@loop
- it.getAttributeNode("android:key")?.let { attribute ->
- if (attribute.textContent == "@string/about_key" && it.getAttributeNode("app:iconSpaceReserved").textContent == "false") {
- it.insertNode("Preference", it) {
- setAttribute("android:title", "@string/" + key + "_title")
+ val processedKeys = mutableSetOf() // To track processed keys
+
+ doRecursively loop@{ node ->
+ if (node !is Element) return@loop // Skip if not an element
+
+ val attributeNode = node.getAttributeNode("android:key")
+ ?: return@loop // Skip if no key attribute
+ val currentKey = attributeNode.textContent
+
+ // Check if the current key has already been processed
+ if (processedKeys.contains(currentKey)) {
+ return@loop // Skip if already processed
+ } else {
+ processedKeys.add(currentKey) // Add the current key to processedKeys
+ }
+
+ when (currentKey) {
+ insertKey -> {
+ node.insertNode("Preference", node) {
+ setAttribute("android:key", "${key}_key")
+ setAttribute("android:title", "@string/${key}_title")
this.appendChild(
ownerDocument.createElement("intent").also { intentNode ->
intentNode.setAttribute(
@@ -120,24 +135,18 @@ object ResourceUtils {
)
intentNode.setAttribute("android:data", key + "_intent")
intentNode.setAttribute("android:targetClass", targetClass)
- })
+ }
+ )
}
- it.getAttributeNode("app:iconSpaceReserved").textContent = "true"
- return@loop
+ node.setAttribute("app:iconSpaceReserved", "true")
}
- }
- }
- doRecursively loop@{
- if (it !is Element) return@loop
-
- it.getAttributeNode("app:iconSpaceReserved")?.let { attribute ->
- if (attribute.textContent == "true") {
- attribute.textContent = "false"
+ "true" -> {
+ attributeNode.textContent = "false"
}
}
}
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
index 70a05f2c9..0b1cc6a94 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt
@@ -1,6 +1,7 @@
package app.revanced.patches.youtube.utils.settings
import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patches.shared.elements.StringsElementsUtils.removeStringsElements
import app.revanced.patches.shared.mapping.ResourceMappingPatch
import app.revanced.patches.youtube.utils.compatibility.Constants.COMPATIBLE_PACKAGE
@@ -37,9 +38,48 @@ object SettingsPatch : BaseResourcePatch(
compatiblePackages = COMPATIBLE_PACKAGE,
requiresIntegrations = true
), Closeable {
+ private const val DEFAULT_ELEMENT = "About"
+ private const val DEFAULT_NAME = "ReVanced Extended"
- private val THREAD_COUNT = Runtime.getRuntime().availableProcessors()
- private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
+ private val SETTINGS_ELEMENTS_MAP = mapOf(
+ "Parent settings" to "@string/parent_tools_key",
+ "General" to "@string/general_key",
+ "Account" to "@string/account_switcher_key",
+ "Data saving" to "@string/data_saving_settings_key",
+ "Autoplay" to "@string/auto_play_key",
+ "Video quality preferences" to "@string/video_quality_settings_key",
+ "Background" to "@string/offline_key",
+ "Watch on TV" to "@string/pair_with_tv_key",
+ "Manage all history" to "@string/history_key",
+ "Your data in YouTube" to "@string/your_data_key",
+ "Privacy" to "@string/privacy_key",
+ "History & privacy" to "@string/privacy_key",
+ "Try experimental new features" to "@string/premium_early_access_browse_page_key",
+ "Purchases and memberships" to "@string/subscription_product_setting_key",
+ "Billing & payments" to "@string/billing_and_payment_key",
+ "Billing and payments" to "@string/billing_and_payment_key",
+ "Notifications" to "@string/notification_key",
+ "Connected apps" to "@string/connected_accounts_browse_page_key",
+ "Live chat" to "@string/live_chat_key",
+ "Captions" to "@string/captions_key",
+ "Accessibility" to "@string/accessibility_settings_key",
+ DEFAULT_ELEMENT to "@string/about_key"
+ )
+
+ private val InsertPosition by stringPatchOption(
+ key = "InsertPosition",
+ default = DEFAULT_ELEMENT,
+ values = SETTINGS_ELEMENTS_MAP,
+ title = "Insert position",
+ description = "The settings menu name that the RVX settings menu should be above."
+ )
+
+ private val RVXSettingsMenuName by stringPatchOption(
+ key = "RVXSettingsMenuName",
+ default = DEFAULT_NAME,
+ title = "RVX settings menu name",
+ description = "The name of the RVX settings menu."
+ )
internal lateinit var contexts: ResourceContext
internal var upward1831 = false
@@ -51,48 +91,16 @@ object SettingsPatch : BaseResourcePatch(
internal var upward1912 = false
override fun execute(context: ResourceContext) {
+
+ /**
+ * set resource context
+ */
contexts = context
- val resourceXmlFile = context["res/values/integers.xml"].readBytes()
-
- for (threadIndex in 0 until THREAD_COUNT) {
- threadPoolExecutor.execute thread@{
- context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
- val resources = editor.file.documentElement.childNodes
- val resourcesLength = resources.length
- val jobSize = resourcesLength / THREAD_COUNT
-
- val batchStart = jobSize * threadIndex
- val batchEnd = jobSize * (threadIndex + 1)
- element@ for (i in batchStart until batchEnd) {
- if (i >= resourcesLength) return@thread
-
- val node = resources.item(i)
- if (node !is Element) continue
-
- if (node.nodeName != "integer" || !node.getAttribute("name")
- .startsWith("google_play_services_version")
- ) continue
-
- val playServicesVersion = node.textContent.toInt()
-
- upward1831 = 233200000 <= playServicesVersion
- upward1834 = 233500000 <= playServicesVersion
- upward1839 = 234000000 <= playServicesVersion
- upward1842 = 234302000 <= playServicesVersion
- upward1849 = 235000000 <= playServicesVersion
- upward1902 = 240204000 < playServicesVersion
- upward1912 = 241302000 <= playServicesVersion
-
- break
- }
- }
- }
- }
-
- threadPoolExecutor
- .also { it.shutdown() }
- .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
+ /**
+ * set version info
+ */
+ setVersionInfo()
/**
* remove strings duplicated with RVX resources
@@ -138,7 +146,16 @@ object SettingsPatch : BaseResourcePatch(
/**
* initialize ReVanced Extended Settings
*/
- context.addPreferenceFragment("revanced_extended_settings")
+ val elementKey = SETTINGS_ELEMENTS_MAP[InsertPosition]
+ ?: InsertPosition
+ ?: SETTINGS_ELEMENTS_MAP[DEFAULT_ELEMENT]
+
+ elementKey?.let { insertKey ->
+ context.addPreferenceFragment(
+ "revanced_extended_settings",
+ insertKey
+ )
+ }
/**
* remove ReVanced Extended Settings divider
@@ -164,6 +181,112 @@ object SettingsPatch : BaseResourcePatch(
}
}
+ /**
+ * set revanced-patches version
+ */
+ val jarManifest = classLoader.getResources("META-INF/MANIFEST.MF")
+ while (jarManifest.hasMoreElements())
+ contexts.updatePatchStatusSettings(
+ "ReVanced Patches",
+ Manifest(jarManifest.nextElement().openStream())
+ .mainAttributes
+ .getValue("Version") + ""
+ )
+
+ /**
+ * set revanced-integrations version
+ */
+ val versionName = SettingsBytecodePatch.contexts
+ .findClass { it.sourceFile == "BuildConfig.java" }!!
+ .mutableClass
+ .fields
+ .single { it.name == "VERSION_NAME" }
+ .initialValue
+ .toString()
+ .trim()
+ .replace("\"", "")
+ .replace(""", "")
+
+ contexts.updatePatchStatusSettings(
+ "ReVanced Integrations",
+ versionName
+ )
+ }
+
+ override fun close() {
+ /**
+ * change RVX settings menu name
+ * since it must be invoked after the Translations patch, it must be the last in the order.
+ */
+ RVXSettingsMenuName?.let { customName ->
+ if (customName != DEFAULT_NAME) {
+ contexts.removeStringsElements(
+ arrayOf("revanced_extended_settings_title")
+ )
+ contexts.xmlEditor["res/values/strings.xml"].use { editor ->
+ val document = editor.file
+
+ mapOf(
+ "revanced_extended_settings_title" to customName
+ ).forEach { (k, v) ->
+ val stringElement = document.createElement("string")
+
+ stringElement.setAttribute("name", k)
+ stringElement.textContent = v
+
+ document.getElementsByTagName("resources").item(0)
+ .appendChild(stringElement)
+ }
+ }
+ }
+ } ?: println("WARNING: Invalid RVX settings menu name. RVX settings menu name does not change.")
+
+ }
+
+ private fun setVersionInfo() {
+ val threadCount = Runtime.getRuntime().availableProcessors()
+ val threadPoolExecutor = Executors.newFixedThreadPool(threadCount)
+
+ val resourceXmlFile = contexts["res/values/integers.xml"].readBytes()
+
+ for (threadIndex in 0 until threadCount) {
+ threadPoolExecutor.execute thread@{
+ contexts.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
+ val resources = editor.file.documentElement.childNodes
+ val resourcesLength = resources.length
+ val jobSize = resourcesLength / threadCount
+
+ val batchStart = jobSize * threadIndex
+ val batchEnd = jobSize * (threadIndex + 1)
+ element@ for (i in batchStart until batchEnd) {
+ if (i >= resourcesLength) return@thread
+
+ val node = resources.item(i)
+ if (node !is Element) continue
+
+ if (node.nodeName != "integer" || !node.getAttribute("name")
+ .startsWith("google_play_services_version")
+ ) continue
+
+ val playServicesVersion = node.textContent.toInt()
+
+ upward1831 = 233200000 <= playServicesVersion
+ upward1834 = 233500000 <= playServicesVersion
+ upward1839 = 234000000 <= playServicesVersion
+ upward1842 = 234302000 <= playServicesVersion
+ upward1849 = 235000000 <= playServicesVersion
+ upward1902 = 240204000 < playServicesVersion
+ upward1912 = 241302000 <= playServicesVersion
+
+ break
+ }
+ }
+ }
+ }
+
+ threadPoolExecutor
+ .also { it.shutdown() }
+ .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
}
internal fun addPreference(settingArray: Array) {
@@ -178,39 +301,7 @@ object SettingsPatch : BaseResourcePatch(
updatePatchStatus(patch.name!!)
}
- internal fun updatePatchStatus(patchTitle: String) {
- contexts.updatePatchStatus(patchTitle)
+ internal fun updatePatchStatus(patchName: String) {
+ contexts.updatePatchStatus(patchName)
}
-
- override fun close() {
-
- // region set ReVanced Patches Version
-
- val jarManifest = classLoader.getResources("META-INF/MANIFEST.MF")
- while (jarManifest.hasMoreElements())
- contexts.updatePatchStatusSettings(
- "ReVanced Patches",
- Manifest(jarManifest.nextElement().openStream())
- .mainAttributes
- .getValue("Version") + ""
- )
-
- // endregion
-
- // region set ReVanced Integrations Version
-
- val buildConfigMutableClass =
- SettingsBytecodePatch.contexts.findClass { it.sourceFile == "BuildConfig.java" }!!.mutableClass
- val versionNameField = buildConfigMutableClass.fields.single { it.name == "VERSION_NAME" }
- val versionName =
- versionNameField.initialValue.toString().trim().replace("\"", "").replace(""", "")
-
- contexts.updatePatchStatusSettings(
- "ReVanced Integrations",
- versionName
- )
-
- // endregion
-
- }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/util/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
index b71cb1516..b4a391876 100644
--- a/src/main/kotlin/app/revanced/util/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/ResourceUtils.kt
@@ -63,11 +63,14 @@ fun ResourceContext.copyResources(
for (resourceGroup in resources) {
resourceGroup.resources.forEach { resource ->
val resourceFile = "${resourceGroup.resourceDirectoryName}/$resource"
- Files.copy(
- inputStreamFromBundledResource(sourceResourceDirectory, resourceFile)!!,
- targetResourceDirectory.resolve(resourceFile).toPath(),
- StandardCopyOption.REPLACE_EXISTING,
- )
+
+ inputStreamFromBundledResource(sourceResourceDirectory, resourceFile)?.let { inputStream ->
+ Files.copy(
+ inputStream,
+ targetResourceDirectory.resolve(resourceFile).toPath(),
+ StandardCopyOption.REPLACE_EXISTING,
+ )
+ }
}
}
}
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/action_bar_logo.png
new file mode 100644
index 000000000..5c4fb04e2
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/logo_music.png b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/logo_music.png
new file mode 100644
index 000000000..c7985512b
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/ytm_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/ytm_logo.png
new file mode 100644
index 000000000..c7985512b
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-hdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/action_bar_logo.png
new file mode 100644
index 000000000..f0667b5e0
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/logo_music.png b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/logo_music.png
new file mode 100644
index 000000000..92f52a841
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/ytm_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/ytm_logo.png
new file mode 100644
index 000000000..92f52a841
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-mdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/action_bar_logo.png
new file mode 100644
index 000000000..77c065696
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/logo_music.png b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/logo_music.png
new file mode 100644
index 000000000..f7226d9a2
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/ytm_logo.png
new file mode 100644
index 000000000..f7226d9a2
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..6b6958a67
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/logo_music.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/logo_music.png
new file mode 100644
index 000000000..db804b2cf
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/ytm_logo.png
new file mode 100644
index 000000000..db804b2cf
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..91f4d3895
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/logo_music.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/logo_music.png
new file mode 100644
index 000000000..73d72b9d8
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/ytm_logo.png
new file mode 100644
index 000000000..73d72b9d8
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/header/drawable-xxxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..8e5d409a4
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..9a83fdf59
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_release.png
new file mode 100644
index 000000000..8f7ff25a1
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..a3945bc1e
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..16ae17465
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_release.png
new file mode 100644
index 000000000..9fbf6ca92
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..f9fd08cf0
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..f502f1bfc
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..b9372f249
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..c5ffe6997
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..c4c79c94f
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..1f0852d78
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..e5e7eea39
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..593c2d12c
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..c72ec992e
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/monochrome/drawable/ic_app_icons_themed_youtube_music.xml b/src/main/resources/music/branding/afn_blue/monochrome/drawable/ic_app_icons_themed_youtube_music.xml
new file mode 100644
index 000000000..e88c905d5
--- /dev/null
+++ b/src/main/resources/music/branding/afn_blue/monochrome/drawable/ic_app_icons_themed_youtube_music.xml
@@ -0,0 +1,788 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/action_bar_logo_release.png b/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/action_bar_logo_release.png
new file mode 100644
index 000000000..f4a88d418
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/action_bar_logo_release.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/record.png
new file mode 100644
index 000000000..aecd283f8
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-large-hdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-large-hdpi/record.png
new file mode 100644
index 000000000..7532ae435
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-large-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-large-mdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-large-mdpi/record.png
new file mode 100644
index 000000000..1e783ad8a
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-large-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-large-xhdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-large-xhdpi/record.png
new file mode 100644
index 000000000..5442cc495
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-large-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-mdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-mdpi/record.png
new file mode 100644
index 000000000..f6880b431
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-xhdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-xhdpi/record.png
new file mode 100644
index 000000000..9c3360029
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-hdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-hdpi/record.png
new file mode 100644
index 000000000..32e299191
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-mdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-mdpi/record.png
new file mode 100644
index 000000000..9c3360029
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-xlarge-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_blue/splash/drawable-xxhdpi/record.png b/src/main/resources/music/branding/afn_blue/splash/drawable-xxhdpi/record.png
new file mode 100644
index 000000000..32e299191
Binary files /dev/null and b/src/main/resources/music/branding/afn_blue/splash/drawable-xxhdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-hdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/action_bar_logo.png
new file mode 100644
index 000000000..a0e16ab45
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-hdpi/logo_music.png b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/logo_music.png
new file mode 100644
index 000000000..7907c64c6
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-hdpi/ytm_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/ytm_logo.png
new file mode 100644
index 000000000..7907c64c6
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-hdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-mdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/action_bar_logo.png
new file mode 100644
index 000000000..ee56c1c55
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-mdpi/logo_music.png b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/logo_music.png
new file mode 100644
index 000000000..97d837917
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-mdpi/ytm_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/ytm_logo.png
new file mode 100644
index 000000000..97d837917
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-mdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/action_bar_logo.png
new file mode 100644
index 000000000..01b53c316
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/logo_music.png b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/logo_music.png
new file mode 100644
index 000000000..82fc6916a
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/ytm_logo.png
new file mode 100644
index 000000000..82fc6916a
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..4571ff72e
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/logo_music.png b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/logo_music.png
new file mode 100644
index 000000000..be1c30561
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/ytm_logo.png
new file mode 100644
index 000000000..be1c30561
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/action_bar_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..304d7a330
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/logo_music.png b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/logo_music.png
new file mode 100644
index 000000000..fac6da3bc
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/ytm_logo.png b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/ytm_logo.png
new file mode 100644
index 000000000..fac6da3bc
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/header/drawable-xxxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..8e5d409a4
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..ec15c01bc
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_release.png
new file mode 100644
index 000000000..6f9765153
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..a3945bc1e
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..28aaf6b15
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_release.png
new file mode 100644
index 000000000..ebf57c2c0
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..f9fd08cf0
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..78b0f8339
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..2d6360f41
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..c5ffe6997
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..84d1d81cb
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..365e18cdb
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png
new file mode 100644
index 000000000..e5e7eea39
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
new file mode 100644
index 000000000..09ae721f0
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_release.png
new file mode 100644
index 000000000..0894c72f3
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/monochrome/drawable/ic_app_icons_themed_youtube_music.xml b/src/main/resources/music/branding/afn_red/monochrome/drawable/ic_app_icons_themed_youtube_music.xml
new file mode 100644
index 000000000..e88c905d5
--- /dev/null
+++ b/src/main/resources/music/branding/afn_red/monochrome/drawable/ic_app_icons_themed_youtube_music.xml
@@ -0,0 +1,788 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/action_bar_logo_release.png b/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/action_bar_logo_release.png
new file mode 100644
index 000000000..7f79f7d43
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/action_bar_logo_release.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/record.png
new file mode 100644
index 000000000..b9de7c89c
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-large-hdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-large-hdpi/record.png
new file mode 100644
index 000000000..5859963e7
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-large-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-large-mdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-large-mdpi/record.png
new file mode 100644
index 000000000..61d466154
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-large-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-large-xhdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-large-xhdpi/record.png
new file mode 100644
index 000000000..5b34f7983
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-large-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-mdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-mdpi/record.png
new file mode 100644
index 000000000..03547727e
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-xhdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-xhdpi/record.png
new file mode 100644
index 000000000..176c876cd
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-hdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-hdpi/record.png
new file mode 100644
index 000000000..dbb56cc2d
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-mdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-mdpi/record.png
new file mode 100644
index 000000000..176c876cd
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-xlarge-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/afn_red/splash/drawable-xxhdpi/record.png b/src/main/resources/music/branding/afn_red/splash/drawable-xxhdpi/record.png
new file mode 100644
index 000000000..dbb56cc2d
Binary files /dev/null and b/src/main/resources/music/branding/afn_red/splash/drawable-xxhdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-hdpi/action_bar_logo.png b/src/main/resources/music/branding/mmt/header/drawable-hdpi/action_bar_logo.png
new file mode 100644
index 000000000..8a9e4717c
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-hdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-hdpi/logo_music.png b/src/main/resources/music/branding/mmt/header/drawable-hdpi/logo_music.png
new file mode 100644
index 000000000..1bc545232
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-hdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-hdpi/ytm_logo.png b/src/main/resources/music/branding/mmt/header/drawable-hdpi/ytm_logo.png
new file mode 100644
index 000000000..773cb809f
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-hdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-mdpi/action_bar_logo.png b/src/main/resources/music/branding/mmt/header/drawable-mdpi/action_bar_logo.png
new file mode 100644
index 000000000..0010ea764
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-mdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-mdpi/logo_music.png b/src/main/resources/music/branding/mmt/header/drawable-mdpi/logo_music.png
new file mode 100644
index 000000000..acb03117d
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-mdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-mdpi/ytm_logo.png b/src/main/resources/music/branding/mmt/header/drawable-mdpi/ytm_logo.png
new file mode 100644
index 000000000..95abcc84b
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-mdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xhdpi/action_bar_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/action_bar_logo.png
new file mode 100644
index 000000000..bb20944b2
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xhdpi/logo_music.png b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/logo_music.png
new file mode 100644
index 000000000..953557450
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xhdpi/ytm_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/ytm_logo.png
new file mode 100644
index 000000000..377eb8fbe
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/action_bar_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..0032f8b01
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/logo_music.png b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/logo_music.png
new file mode 100644
index 000000000..2b424bbe7
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/ytm_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/ytm_logo.png
new file mode 100644
index 000000000..377eb8fbe
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/action_bar_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..80caab7d6
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/logo_music.png b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/logo_music.png
new file mode 100644
index 000000000..bc59c1fc7
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/ytm_logo.png b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/ytm_logo.png
new file mode 100644
index 000000000..6cab734f6
Binary files /dev/null and b/src/main/resources/music/branding/mmt/header/drawable-xxxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png
index 995c181bd..129276322 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index b1d397625..98e3d3150 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/ic_launcher_release.png b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/ic_launcher_release.png
index dacf9a503..81bdcaee6 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/ic_launcher_release.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-hdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png
index 8466fd13a..8a6252836 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 73815c022..3588a8e09 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/ic_launcher_release.png b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/ic_launcher_release.png
index 9e5a233d2..74b68e4bf 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/ic_launcher_release.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-mdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png
index 3f149b9ab..a95aff113 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index dab0c17a8..d247f9328 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_release.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_release.png
index 46271d05f..9715ed3ca 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_release.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index 4b09c4031..d6cec4cce 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 9d1d19a49..4ffc08fce 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_release.png
index 607731eda..13b18fa70 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_release.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index 9a71df711..6ef5ac482 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 49a4e07a5..3409847cc 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_release.png b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_release.png
index 7fd682d7c..6d396b95e 100644
Binary files a/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_release.png and b/src/main/resources/music/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_release.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-hdpi/action_bar_logo_release.png b/src/main/resources/music/branding/mmt/splash/drawable-hdpi/action_bar_logo_release.png
new file mode 100644
index 000000000..ab93792c4
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-hdpi/action_bar_logo_release.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-hdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-hdpi/record.png
new file mode 100644
index 000000000..a21f171bd
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-large-hdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-large-hdpi/record.png
new file mode 100644
index 000000000..382f7e510
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-large-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-large-mdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-large-mdpi/record.png
new file mode 100644
index 000000000..4c646b060
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-large-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-large-xhdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-large-xhdpi/record.png
new file mode 100644
index 000000000..b1d2d090a
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-large-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-mdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-mdpi/record.png
new file mode 100644
index 000000000..0dcdff6c4
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-xhdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-xhdpi/record.png
new file mode 100644
index 000000000..c795ce80f
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-xlarge-hdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-xlarge-hdpi/record.png
new file mode 100644
index 000000000..0cbfcef15
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-xlarge-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-xlarge-mdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-xlarge-mdpi/record.png
new file mode 100644
index 000000000..c795ce80f
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-xlarge-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/mmt/splash/drawable-xxhdpi/record.png b/src/main/resources/music/branding/mmt/splash/drawable-xxhdpi/record.png
new file mode 100644
index 000000000..0cbfcef15
Binary files /dev/null and b/src/main/resources/music/branding/mmt/splash/drawable-xxhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/action_bar_logo.png
new file mode 100644
index 000000000..688a8b605
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/logo_music.png b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/logo_music.png
new file mode 100644
index 000000000..1ae44caeb
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/ytm_logo.png
new file mode 100644
index 000000000..58504c654
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-hdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/action_bar_logo.png
new file mode 100644
index 000000000..ef25a0fd5
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/logo_music.png b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/logo_music.png
new file mode 100644
index 000000000..e0f6538e4
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/ytm_logo.png
new file mode 100644
index 000000000..9a6e5ffd1
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-mdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/action_bar_logo.png
new file mode 100644
index 000000000..ca399eb91
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/logo_music.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/logo_music.png
new file mode 100644
index 000000000..4c86d5a8f
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/ytm_logo.png
new file mode 100644
index 000000000..c73e50bf0
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..e36186be3
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/logo_music.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/logo_music.png
new file mode 100644
index 000000000..d14a5a562
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/ytm_logo.png
new file mode 100644
index 000000000..f257b1836
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..7d6a96616
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/logo_music.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/logo_music.png
new file mode 100644
index 000000000..bb7f956b0
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/ytm_logo.png
new file mode 100644
index 000000000..cfec28a75
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/header/drawable-xxxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png
index a5e35c4aa..164cc2a2c 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png
index 367e2d1a5..079092367 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png
index 196398e3e..e2f8eea90 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index becaa791c..76fa6f58a 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index dfb79d7ad..8fcefab72 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 4418c8a54..86f74e27e 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index ceec7611e..2b59a6403 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 0dd262880..674bc9308 100644
Binary files a/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/action_bar_logo_release.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/action_bar_logo_release.png
new file mode 100644
index 000000000..7472c686c
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/action_bar_logo_release.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/record.png
new file mode 100644
index 000000000..05717dd85
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-large-hdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-hdpi/record.png
new file mode 100644
index 000000000..0fe2d5550
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-large-mdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-mdpi/record.png
new file mode 100644
index 000000000..53b607a06
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-large-xhdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-xhdpi/record.png
new file mode 100644
index 000000000..f56fb6a7d
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-large-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-mdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-mdpi/record.png
new file mode 100644
index 000000000..60c1f347b
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-xhdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-xhdpi/record.png
new file mode 100644
index 000000000..2334053fe
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-hdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-hdpi/record.png
new file mode 100644
index 000000000..06bc1b647
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-mdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-mdpi/record.png
new file mode 100644
index 000000000..6a4dd78c6
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-xlarge-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_blue/splash/drawable-xxhdpi/record.png b/src/main/resources/music/branding/revancify_blue/splash/drawable-xxhdpi/record.png
new file mode 100644
index 000000000..a64c82ffe
Binary files /dev/null and b/src/main/resources/music/branding/revancify_blue/splash/drawable-xxhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/action_bar_logo.png
new file mode 100644
index 000000000..6b609fa9b
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/logo_music.png b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/logo_music.png
new file mode 100644
index 000000000..f6ab87843
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/ytm_logo.png
new file mode 100644
index 000000000..87d826885
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-hdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/action_bar_logo.png
new file mode 100644
index 000000000..84f2f5414
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/logo_music.png b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/logo_music.png
new file mode 100644
index 000000000..ab64b8bbf
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/ytm_logo.png
new file mode 100644
index 000000000..5482711d9
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-mdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/action_bar_logo.png
new file mode 100644
index 000000000..10d5ae7b9
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/logo_music.png b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/logo_music.png
new file mode 100644
index 000000000..d6691a287
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/ytm_logo.png
new file mode 100644
index 000000000..fd036d2d3
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..88a0921e6
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/logo_music.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/logo_music.png
new file mode 100644
index 000000000..e8f378233
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/ytm_logo.png
new file mode 100644
index 000000000..09c571a27
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/action_bar_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/action_bar_logo.png
new file mode 100644
index 000000000..40d547b31
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/action_bar_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/logo_music.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/logo_music.png
new file mode 100644
index 000000000..f8a5fe010
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/logo_music.png differ
diff --git a/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/ytm_logo.png b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/ytm_logo.png
new file mode 100644
index 000000000..cb72f2bda
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/header/drawable-xxxhdpi/ytm_logo.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png
index a5e35c4aa..164cc2a2c 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png
index 367e2d1a5..079092367 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png
index 196398e3e..e2f8eea90 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 24e40d717..38ecc2753 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index dfb79d7ad..8fcefab72 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 87cc98cef..a8608f6ea 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png
index ceec7611e..2b59a6403 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_background_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png
index 7cffc6049..e78e1b7a7 100644
Binary files a/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png and b/src/main/resources/music/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_music_foreground_color_108.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/action_bar_logo_release.png b/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/action_bar_logo_release.png
new file mode 100644
index 000000000..fca186593
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/action_bar_logo_release.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/record.png
new file mode 100644
index 000000000..feb17e3ff
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-large-hdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-large-hdpi/record.png
new file mode 100644
index 000000000..7c1595424
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-large-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-large-mdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-large-mdpi/record.png
new file mode 100644
index 000000000..ea5dd0507
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-large-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-large-xhdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-large-xhdpi/record.png
new file mode 100644
index 000000000..9d29083a0
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-large-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-mdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-mdpi/record.png
new file mode 100644
index 000000000..14a6d969c
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-xhdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-xhdpi/record.png
new file mode 100644
index 000000000..857bd6e8d
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-xhdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-hdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-hdpi/record.png
new file mode 100644
index 000000000..5735e4d42
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-hdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-mdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-mdpi/record.png
new file mode 100644
index 000000000..c5f0ef48c
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-xlarge-mdpi/record.png differ
diff --git a/src/main/resources/music/branding/revancify_red/splash/drawable-xxhdpi/record.png b/src/main/resources/music/branding/revancify_red/splash/drawable-xxhdpi/record.png
new file mode 100644
index 000000000..5735e4d42
Binary files /dev/null and b/src/main/resources/music/branding/revancify_red/splash/drawable-xxhdpi/record.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..03fbb653e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..d61bb3a7f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..6a28155cc
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..70cdd15b6
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-hdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..6b41ffe05
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..c9ced776f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..5841e9adb
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..77a308d6c
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-mdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..c32c8b541
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..fac29e4a9
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..84a9a7311
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..f6b5dccd2
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..c268a01cc
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..1eaffe3c7
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..f59c359f3
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..ef9be93a6
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..37c8ad160
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..e127417aa
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..cf230cd57
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..aa531ca8f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..8e5d409a4
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..ad5e83d23
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..8ebb71332
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..8ebb71332
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..a3945bc1e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..cc7eaa188
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..ec2d9ec06
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..8fe9c1628
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..f9fd08cf0
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..40a8bb6c4
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..3dfd3b49e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..3dfd3b49e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..c5ffe6997
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..3d4ca8030
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..d79bc7c10
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..2d1a27c9f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..e5e7eea39
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..c3e7d9440
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0aa283963
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..c0dab78bd
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/launcher/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml b/src/main/resources/youtube/branding/afn_blue/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml
new file mode 100644
index 000000000..3cadf9916
--- /dev/null
+++ b/src/main/resources/youtube/branding/afn_blue/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..ede82d9f1
--- /dev/null
+++ b/src/main/resources/youtube/branding/afn_blue/settings/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,2032 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..2a573eec3
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..f760691c9
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..83f71304a
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..4bdf23199
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-hdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..ed8d269c1
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..0aa283963
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..e00f9d119
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..83f71304a
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-mdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..f760691c9
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..218903e78
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..274305676
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..89eae8b61
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..96f793340
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..d0cee589c
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..89eae8b61
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..e94ac2f4f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..a50fa4564
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..9c8f15d81
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..66ea02c1b
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..ed8d269c1
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..7c70d290e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..33e4a8eb7
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..61ab42750
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..9f2ef14f7
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-hdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..5324afa71
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..c21e6adcb
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..12e42f3f3
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..3bbacbfeb
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-mdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..bd14ab151
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..f5c29a93c
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..5ec7f83e3
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..eb05951ba
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..42e8ef713
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..15a343eec
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..06ccd5a9e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..042d9c595
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..73145771d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..edfbce9da
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..04b2060d1
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..6cdbdd289
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..8e5d409a4
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..a27f5ef87
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..9ee4d0058
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..9ee4d0058
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..a3945bc1e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..d30bc182f
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..50d0af609
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..50d0af609
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..f9fd08cf0
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..9f8295c4d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..9ee4d0058
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..9ee4d0058
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..c5ffe6997
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..175fae810
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..357e8a0f0
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..357e8a0f0
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
new file mode 100644
index 000000000..e5e7eea39
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
new file mode 100644
index 000000000..de0251357
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..1842c956d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..1842c956d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/launcher/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml b/src/main/resources/youtube/branding/afn_red/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml
new file mode 100644
index 000000000..3cadf9916
--- /dev/null
+++ b/src/main/resources/youtube/branding/afn_red/monochrome/drawable/adaptive_monochrome_ic_youtube_launcher.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..bc9942311
--- /dev/null
+++ b/src/main/resources/youtube/branding/afn_red/settings/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,2232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..a4b557b9d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..423136f25
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..e902b6f9d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..baf6e0efe
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-hdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..357e8a0f0
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..1842c956d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..b04bc6ea3
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..e902b6f9d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-mdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..423136f25
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..34209953d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..40750231e
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..c67aeada8
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..7830483c9
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..07820f431
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..c67aeada8
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..2abca470d
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png
new file mode 100644
index 000000000..07820f431
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png
new file mode 100644
index 000000000..ba7f22416
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png
new file mode 100644
index 000000000..cb0a9f9fc
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png
new file mode 100644
index 000000000..7c2491ee5
Binary files /dev/null and b/src/main/resources/youtube/branding/afn_red/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..56c32909a
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..bacd45159
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..a2628f80b
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..39d63b12c
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-hdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..b440aabf8
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..b7aa63b91
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..260a46e4d
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..7808b7dfe
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-mdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..8986187c6
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..7f40e7cc6
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..61b151f99
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..1e48e8d4e
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..3c72ac6b6
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..bf5e72f53
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..cfdaccbec
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..445b4ca4f
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..de7ed1264
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..947710523
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..b70e18c7e
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..09261a249
Binary files /dev/null and b/src/main/resources/youtube/branding/mmt/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
index fb3a5878c..2d613316b 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png
index 76cd36a96..dc68a49db 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher.png
index c6ab29d43..acf855afa 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher_round.png
index c6ab29d43..acf855afa 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher_round.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
index 0bba584ce..8a0338471 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png
index 45ce791a2..cada53b34 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher.png
index e48102439..b66d97a83 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher_round.png
index e48102439..b66d97a83 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher_round.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
index 7fe2d2ad1..bfae264c6 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 4a8d14a16..8fd06c6bd 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher.png
index 28e18cf30..949121d5e 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_round.png
index 28e18cf30..949121d5e 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_round.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
index 0669723ff..b65f6eb3c 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index ed06ff380..598cdca34 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher.png
index 34ef7e819..9302a8b19 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_round.png
index 34ef7e819..9302a8b19 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_round.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
index e7dcfb0b2..03414d112 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 1fc7cb0aa..a733f5743 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher.png
index 021cb91e4..51aff32df 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_round.png b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_round.png
index 021cb91e4..51aff32df 100644
Binary files a/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_round.png and b/src/main/resources/youtube/branding/mmt/launcher/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..085d98c17
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/settings/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,3288 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_144.png
index 175fdb450..cffa92cb6 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_192.png
index 7d0f64998..1b2ab1572 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_24.png
index 779a3ee11..0e8279f43 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_24.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_36.png
index cc0bfdff8..24bfd5c6e 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_36.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-hdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_144.png
index 34bf5bc58..1caa101bc 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_192.png
index 785a72606..b773de850 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_24.png
index daa0641d1..e964c0ca3 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_24.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_36.png
index 779a3ee11..0e8279f43 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_36.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-mdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_144.png
index 7d0f64998..1b2ab1572 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_192.png
index ae2672fe9..fa13a78dc 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_24.png
index 82d90a7c8..049b95ad7 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_24.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_36.png
index 93f1f1032..6c1e409f4 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_36.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_144.png
index 5ad611bd6..2419abd5f 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_192.png
index d5bfb0965..84187139c 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_24.png
index 93f1f1032..6c1e409f4 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_24.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_36.png
index 7c4f0cfd7..904549664 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_36.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png
index d5bfb0965..84187139c 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png
index 83703b24e..459998aea 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png
index 252ca1240..92ae43494 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_24.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png
index 34bf5bc58..1caa101bc 100644
Binary files a/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png and b/src/main/resources/youtube/branding/mmt/splash/drawable-xxxhdpi/product_logo_youtube_color_36.png differ
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__0.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__0.xml
new file mode 100644
index 000000000..536c6071f
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__0.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__1.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__1.xml
new file mode 100644
index 000000000..d429418bf
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__1.xml
@@ -0,0 +1,10 @@
+
+
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__2.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__2.xml
new file mode 100644
index 000000000..be41663af
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__2.xml
@@ -0,0 +1,10 @@
+
+
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__3.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__3.xml
new file mode 100644
index 000000000..b91965d0c
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__3.xml
@@ -0,0 +1,11 @@
+
+
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__4.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__4.xml
new file mode 100644
index 000000000..bd8a269b3
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/$avd_anim__4.xml
@@ -0,0 +1,11 @@
+
+
diff --git a/src/main/resources/youtube/branding/mmt/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/mmt/splash/drawable/avd_anim.xml
new file mode 100644
index 000000000..6a569c5b9
--- /dev/null
+++ b/src/main/resources/youtube/branding/mmt/splash/drawable/avd_anim.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..2b57000df
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..ed7b6924f
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..87c3639b2
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..1af020168
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-hdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..145f4b0cb
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..7a2fc6614
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..efafcba7a
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..00579f8b7
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-mdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..9dd30d82b
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..86293a34e
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..1df779630
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..d7b3e9034
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..f4c53dbef
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..04fba7b58
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..63c0a9cc6
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..f806c6661
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..4fc4ea710
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..0099c52d2
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..d7cd58aa3
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..791439f60
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_blue/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
index a5e35c4aa..164cc2a2c 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
index 367e2d1a5..079092367 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
index 196398e3e..e2f8eea90 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 991abb959..e8d8df81e 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
index dfb79d7ad..8fcefab72 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index e78114682..d4be471d2 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
index ceec7611e..2b59a6403 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 4d9981540..dbd1fcb92 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_blue/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..c088bcfcc
--- /dev/null
+++ b/src/main/resources/youtube/branding/revancify_blue/settings/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,1034 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png b/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png
index 8c9e511a0..ba413c468 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png and b/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_144.png differ
diff --git a/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png
index f3f68baba..7f1577437 100644
Binary files a/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/revancify_blue/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..ba0703200
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..4fe05974a
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..bf48763e4
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..1f4c747c6
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-hdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..64aa9cfd5
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..67be0f5c7
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..106ae86dc
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..d5cbe9ece
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-mdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..fff3c154e
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..f35ce498e
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..20b5cd426
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..d90b3f1d5
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..1a1536fce
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..100bc1639
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..b8d6fa478
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..60696294a
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png
new file mode 100644
index 000000000..bb213f044
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png
new file mode 100644
index 000000000..665b19871
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_premium_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png
new file mode 100644
index 000000000..3aac9e216
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_dark.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png
new file mode 100644
index 000000000..641619a34
Binary files /dev/null and b/src/main/resources/youtube/branding/revancify_red/header/drawable-xxxhdpi/yt_wordmark_header_light.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png
index a5e35c4aa..164cc2a2c 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-hdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png
index 367e2d1a5..079092367 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-mdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png
index 196398e3e..e2f8eea90 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 72a4c9fee..19ff8c80b 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png
index dfb79d7ad..8fcefab72 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index 14af95446..8d8ed8c1c 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png
index ceec7611e..2b59a6403 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_background_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png
index f2ddefc62..64db1705d 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png and b/src/main/resources/youtube/branding/revancify_red/launcher/mipmap-xxxhdpi/adaptiveproduct_youtube_foreground_color_108.png differ
diff --git a/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..98cfb9ccc
--- /dev/null
+++ b/src/main/resources/youtube/branding/revancify_red/settings/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,1026 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/youtube/branding/revancify_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png b/src/main/resources/youtube/branding/revancify_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png
index 8f7c43c93..3546de4da 100644
Binary files a/src/main/resources/youtube/branding/revancify_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png and b/src/main/resources/youtube/branding/revancify_red/splash/drawable-xxxhdpi/product_logo_youtube_color_192.png differ
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__0.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__0.xml
new file mode 100644
index 000000000..35eb1ac38
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__0.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__1.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__1.xml
new file mode 100644
index 000000000..35eb1ac38
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__1__1.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__0.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__0.xml
new file mode 100644
index 000000000..d6566bd9f
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__0.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__1.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__1.xml
new file mode 100644
index 000000000..d6566bd9f
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__2__1.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__0.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__0.xml
new file mode 100644
index 000000000..d6566bd9f
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__0.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__1.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__1.xml
new file mode 100644
index 000000000..d6566bd9f
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$$avd_anim__3__1.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__0.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__0.xml
new file mode 100644
index 000000000..4d4459196
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__0.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__1.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__1.xml
new file mode 100644
index 000000000..6e99759e1
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__1.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__2.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__2.xml
new file mode 100644
index 000000000..15d9885e9
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__2.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__3.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__3.xml
new file mode 100644
index 000000000..8d6ff8a2e
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__3.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__4.xml b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__4.xml
new file mode 100644
index 000000000..d4e222862
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/$avd_anim__4.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/drawable/avd_anim.xml b/src/main/resources/youtube/branding/stock/splash/drawable/avd_anim.xml
new file mode 100644
index 000000000..49266b4f4
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/drawable/avd_anim.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/branding/stock/splash/values-v31/styles.xml b/src/main/resources/youtube/branding/stock/splash/values-v31/styles.xml
new file mode 100644
index 000000000..c7462f74a
--- /dev/null
+++ b/src/main/resources/youtube/branding/stock/splash/values-v31/styles.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 19082ab19..c56b4ed96 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -6,6 +6,7 @@
ReVanced Extended
+ Search settings
Experimental Flags
@@ -344,8 +345,8 @@ This does not bypass the age restriction. It just accepts it automatically.""18.48.39 - Disables 'views' and 'likes' from being updated in real time"
- Account menu
- Hide or show elements in account menu and You tab.
+ Account menu
+ Hide or show elements in account menu and You tab.
Hide account menu
"Hide elements of the account menu and You tab.
@@ -379,8 +380,8 @@ Some components may not be hidden."
Create button is hidden.
Create button is shown.
Hide Home button
- Home button is shown.
Home button is hidden.
+ Home button is shown.
Hide Library button
Library button is hidden.
Library button is shown.
@@ -404,8 +405,8 @@ Some components may not be hidden."
• You should disable this setting to make video ads visible."
- Settings menu
- Hide elements of the YouTube settings menu.
+ Settings menu
+ Hide elements of the YouTube settings menu.
Hide YouTube settings menu
Hide elements of the YouTube settings menu.
@@ -992,6 +993,9 @@ Limitation: Official headers in search results will be hidden."
Hide info panels
Info panels are hidden.
Info panels are shown.
+ Hide live chat header
+ Live chat header is hidden.\n\nBack button in header will not be hidden.
+ Live chat header is shown.\n\nBack button in header will not be hidden.
Hide channel bar
Channel bar is hidden.
Channel bar is shown.
@@ -1016,6 +1020,9 @@ Limitation: Official headers in search results will be hidden."
Hide comments button
Comments button is hidden.
Comments button is shown.
+ Hide disabled comments button
+ Disabled comments button or with label \"0\" is hidden.
+ Disabled comments button or with label \"0\" is shown.
Hide Remix button
Remix button is hidden.
Remix button is shown.
@@ -1529,9 +1536,12 @@ Side effects include:
Others
Custom
Stock
+ Afn Blue
+ Afn Red
MMT
Revancify Blue
Revancify Red
+ YouTube
Stock
Excluded
Included
diff --git a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml b/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
index 097787484..e469de982 100644
--- a/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
+++ b/src/main/resources/youtube/settings/layout/revanced_settings_with_toolbar.xml
@@ -1,6 +1,6 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
-
\ No newline at end of file
+
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 393494afa..91911d134 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -1,6 +1,6 @@
+ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto">
+
@@ -111,7 +112,7 @@
PREFERENCE_SCREEN: GENERAL -->
@@ -150,8 +151,10 @@
SETTINGS: TOOLBAR_COMPONENTS -->
+
+
-
+
-
+
@@ -366,11 +369,13 @@
SETTINGS: SEEKBAR_COMPONENTS -->
+
+
+
+
+
+
-
+
@@ -512,10 +523,13 @@
PREFERENCE_SCREEN: VIDEO -->
+
+
@@ -549,7 +563,7 @@
-
+
@@ -568,10 +582,10 @@
-
+
@@ -585,7 +599,7 @@
SETTINGS: SPOOF_PLAYER_PARAMETER -->
-
+
@@ -662,6 +676,7 @@
+
@@ -673,8 +688,9 @@
+
-
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..c053a518c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..c053a518c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..e7ffaeffb
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..8d2b017e7
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..8957fc311
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..d0e4b98dc
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..fdd95ec9a
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..5af6636a6
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..775d54969
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..1eec9e8d3
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-hdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..e4f5bc110
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..e4f5bc110
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..caba165f4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..d975d7bbe
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..27aa75873
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..5827b6046
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..03af3a19c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..310aadde9
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..ca58de272
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..9fcd88df5
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-mdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..5e6a011d4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..5e6a011d4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..644eb9dfc
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..da055a661
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..7cca2e5c8
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..a5b09e29f
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..c05fa19dd
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..4d48ac028
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..e8d4fd36c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..db4bb317d
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..3b85c4799
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..3b85c4799
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..d642f30a3
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..fa1b30531
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..091a5c040
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..b563f7a3a
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..c79e558a9
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..0f2cd98f6
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..b43ff8f7b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..f9e49b219
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..66ae95896
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..66ae95896
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..34889c38e
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..42b448543
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..3a0b455b4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..99501124e
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..18e8ffa67
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..ee7b0a590
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..90c65f729
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..d9091f07b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_comment_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_comment_32c.xml
new file mode 100644
index 000000000..2079567b3
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_comment_32c.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/outline/drawable/ic_right_dislike_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_dislike_off_32c.xml
similarity index 100%
rename from src/main/resources/youtube/shorts/outline/drawable/ic_right_dislike_off_32c.xml
rename to src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_dislike_off_32c.xml
diff --git a/src/main/resources/youtube/shorts/outline/drawable/ic_right_like_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_like_off_32c.xml
similarity index 100%
rename from src/main/resources/youtube/shorts/outline/drawable/ic_right_like_off_32c.xml
rename to src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_like_off_32c.xml
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_share_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_share_32c.xml
new file mode 100644
index 000000000..050616d8f
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outline/drawable/ic_right_share_32c.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..c053a518c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..773ba98d7
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..9476a7eac
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..771edf48d
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..8957fc311
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..3a94ff43e
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..0b2207583
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..5af6636a6
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..3edbd431e
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..fd73fd557
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-hdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..e4f5bc110
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..c0ecf8a4c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..4aab1a369
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..ec0f165e3
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..27aa75873
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..6e4bcc79f
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..dcb1a5942
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..310aadde9
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..61499e376
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..64878845d
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-mdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..5e6a011d4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..18dd041ad
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..d409b12bf
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..7e1c03109
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..7cca2e5c8
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..56930ae5b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..09fbb17b5
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..4d48ac028
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..3152b9440
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..3a2d65b22
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..3b85c4799
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..c70704f80
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..0f0e63aab
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..8af775560
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..091a5c040
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..822490a23
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..adb01d726
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..0f2cd98f6
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..44187fe5b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..2d826d059
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..66ae95896
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..2ddb17518
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..bce157563
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..3d507c966
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..3a0b455b4
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..228a97627
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..c58289610
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..ee7b0a590
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..82f8d94d7
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..a8283f811
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable-xxxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_comment_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_comment_32c.xml
new file mode 100644
index 000000000..2079567b3
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_comment_32c.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_dislike_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_dislike_off_32c.xml
new file mode 100644
index 000000000..8a719f8d4
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_dislike_off_32c.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_like_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_like_off_32c.xml
new file mode 100644
index 000000000..ea2903cc7
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_like_off_32c.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_share_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_share_32c.xml
new file mode 100644
index 000000000..050616d8f
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/outlinecircle/drawable/ic_right_share_32c.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..6ad2ea7b5
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..6ad2ea7b5
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..51e7672d0
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..2a300abab
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..330530e11
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..330530e11
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..dfc501459
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..354251245
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..354251245
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..842bc3ae3
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-hdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..e1cb20d7f
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..e1cb20d7f
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..24670eef3
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..709c2d6c7
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..2da048edb
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..2da048edb
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..3b780e8c1
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..1f3bb4795
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..1f3bb4795
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..d9cda5353
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-mdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..d085d0a55
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..d085d0a55
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..e5600516c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..3058b5b7c
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..fefda4680
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..fefda4680
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..54e1bfd47
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..af54b9f0b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..af54b9f0b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..43119f0ea
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..44c2a9a8b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..44c2a9a8b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..49be4ddf1
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..a200cde23
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..f1b4d242b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..f1b4d242b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..7ca07a4bb
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..0a2f5cf78
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..0a2f5cf78
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..7f76a7132
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_24.webp
new file mode 100644
index 000000000..bc7167acc
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_24.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp
new file mode 100644
index 000000000..bc7167acc
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_comment_shadowed.webp
new file mode 100644
index 000000000..4a41d149d
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_comment_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp
new file mode 100644
index 000000000..1f4171ed0
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_32c.webp
new file mode 100644
index 000000000..f1b4d242b
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp
new file mode 100644
index 000000000..baaa1a1ee
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_off_shadowed.webp
new file mode 100644
index 000000000..3201b5e5f
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_off_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_32c.webp
new file mode 100644
index 000000000..0a2f5cf78
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_32c.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_shadowed.webp
new file mode 100644
index 000000000..0dfa1b66a
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_like_on_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_share_shadowed.webp
new file mode 100644
index 000000000..744c9bede
Binary files /dev/null and b/src/main/resources/youtube/shorts/actionbuttons/round/drawable-xxxhdpi/ic_right_share_shadowed.webp differ
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_comment_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_comment_32c.xml
new file mode 100644
index 000000000..310cb4c61
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_comment_32c.xml
@@ -0,0 +1,2794 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_dislike_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_dislike_off_32c.xml
new file mode 100644
index 000000000..c73427293
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_dislike_off_32c.xml
@@ -0,0 +1,2414 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_like_off_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_like_off_32c.xml
new file mode 100644
index 000000000..1c64e2832
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_like_off_32c.xml
@@ -0,0 +1,2174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_share_32c.xml b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_share_32c.xml
new file mode 100644
index 000000000..2c26a6c02
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/round/drawable/ic_right_share_32c.xml
@@ -0,0 +1,2159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_camera_bold_24dp.xml b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_camera_bold_24dp.xml
new file mode 100644
index 000000000..ccfe3dfb2
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_camera_bold_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_more_vertical_bold_24dp.xml b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_more_vertical_bold_24dp.xml
new file mode 100644
index 000000000..3f84f037a
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_more_vertical_bold_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_search_bold_24dp.xml b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_search_bold_24dp.xml
new file mode 100644
index 000000000..66dd2c35c
--- /dev/null
+++ b/src/main/resources/youtube/shorts/actionbuttons/shared/drawable/reel_search_bold_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/animated/raw/like_tap_feedback.json b/src/main/resources/youtube/shorts/animated/raw/like_tap_feedback.json
similarity index 100%
rename from src/main/resources/youtube/animated/raw/like_tap_feedback.json
rename to src/main/resources/youtube/shorts/animated/raw/like_tap_feedback.json
diff --git a/src/main/resources/youtube/animated/raw/pause_tap_feedback.json b/src/main/resources/youtube/shorts/animated/raw/pause_tap_feedback.json
similarity index 100%
rename from src/main/resources/youtube/animated/raw/pause_tap_feedback.json
rename to src/main/resources/youtube/shorts/animated/raw/pause_tap_feedback.json
diff --git a/src/main/resources/youtube/animated/raw/play_tap_feedback.json b/src/main/resources/youtube/shorts/animated/raw/play_tap_feedback.json
similarity index 100%
rename from src/main/resources/youtube/animated/raw/play_tap_feedback.json
rename to src/main/resources/youtube/shorts/animated/raw/play_tap_feedback.json
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_24.webp
deleted file mode 100644
index 5d7d16f0c..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_24.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp
deleted file mode 100644
index 5d7d16f0c..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_remix_filled_white_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_comment_shadowed.webp
deleted file mode 100644
index fb19fae39..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_comment_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp
deleted file mode 100644
index 384aedaac..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_32c.webp
deleted file mode 100644
index 0449ecc3d..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp
deleted file mode 100644
index b8b4a7509..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_dislike_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_off_shadowed.webp
deleted file mode 100644
index 085a2ba89..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_32c.webp
deleted file mode 100644
index fe7d11d27..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_shadowed.webp
deleted file mode 100644
index 828383163..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_like_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_share_shadowed.webp
deleted file mode 100644
index e94020fb8..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-hdpi/ic_right_share_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_24.webp
deleted file mode 100644
index 8cff49fb4..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_24.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp
deleted file mode 100644
index 8cff49fb4..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_remix_filled_white_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_comment_shadowed.webp
deleted file mode 100644
index 482671497..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_comment_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp
deleted file mode 100644
index cde67cdf0..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_32c.webp
deleted file mode 100644
index ce8ad042a..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp
deleted file mode 100644
index 1c302f277..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_dislike_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_off_shadowed.webp
deleted file mode 100644
index 02a1ba854..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_32c.webp
deleted file mode 100644
index 084c86f80..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_shadowed.webp
deleted file mode 100644
index 85d5b969a..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_like_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_share_shadowed.webp
deleted file mode 100644
index 6b04eaf46..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-mdpi/ic_right_share_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_24.webp
deleted file mode 100644
index ba1632286..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_24.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp
deleted file mode 100644
index ba1632286..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_remix_filled_white_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_comment_shadowed.webp
deleted file mode 100644
index 53df07030..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_comment_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp
deleted file mode 100644
index 1cebac92b..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp
deleted file mode 100644
index 50fceae99..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp
deleted file mode 100644
index e466cd62c..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_dislike_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp
deleted file mode 100644
index 0b42c67d7..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_32c.webp
deleted file mode 100644
index 2f69ac362..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp
deleted file mode 100644
index 806f6970c..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_like_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_share_shadowed.webp
deleted file mode 100644
index e12774f6e..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xhdpi/ic_right_share_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp
deleted file mode 100644
index 288334135..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_24.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp
deleted file mode 100644
index 288334135..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_remix_filled_white_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp
deleted file mode 100644
index c2f4bccc1..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_comment_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp
deleted file mode 100644
index 7f2295690..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp
deleted file mode 100644
index d05134d6e..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp
deleted file mode 100644
index 686fec928..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_dislike_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp
deleted file mode 100644
index 739160f07..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_32c.webp
deleted file mode 100644
index 316e47db8..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp
deleted file mode 100644
index 85c063b3f..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_like_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_share_shadowed.webp
deleted file mode 100644
index 59f2f0e90..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxhdpi/ic_right_share_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp
deleted file mode 100644
index 22b62522a..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_24.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp
deleted file mode 100644
index 22b62522a..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_remix_filled_white_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp
deleted file mode 100644
index 91a318617..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_comment_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp
deleted file mode 100644
index bdcc08482..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp
deleted file mode 100644
index 84a3d4e90..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp
deleted file mode 100644
index c5e3cb8a2..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_dislike_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp
deleted file mode 100644
index bb39cf38d..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_off_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp
deleted file mode 100644
index c292a611b..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_32c.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp
deleted file mode 100644
index 49ae9d8aa..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_like_on_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp b/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp
deleted file mode 100644
index b3032a562..000000000
Binary files a/src/main/resources/youtube/shorts/outline/drawable-xxxhdpi/ic_right_share_shadowed.webp and /dev/null differ
diff --git a/src/main/resources/youtube/shorts/outline/drawable/ic_right_comment_32c.xml b/src/main/resources/youtube/shorts/outline/drawable/ic_right_comment_32c.xml
deleted file mode 100644
index 2b8bf7781..000000000
--- a/src/main/resources/youtube/shorts/outline/drawable/ic_right_comment_32c.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/youtube/shorts/outline/drawable/ic_right_share_32c.xml b/src/main/resources/youtube/shorts/outline/drawable/ic_right_share_32c.xml
deleted file mode 100644
index 0da3f079d..000000000
--- a/src/main/resources/youtube/shorts/outline/drawable/ic_right_share_32c.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/youtube/translations/ar/strings.xml b/src/main/resources/youtube/translations/ar/strings.xml
index 3c8d2d01c..da9e36d01 100644
--- a/src/main/resources/youtube/translations/ar/strings.xml
+++ b/src/main/resources/youtube/translations/ar/strings.xml
@@ -313,8 +313,8 @@
18.38.45 - استعادة سلوك جودة الفيديو الافتراضي القديم
"18.48.39 - تعطيل تحديث 'المشاهدات' و'الإعجابات' في الوقت الفعلي"
- قائمة الحساب
- إخفاء أو عرض العناصر في قائمة الحساب وعلامة التبويب أنت.
+ قائمة الحساب
+ إخفاء أو عرض العناصر في قائمة الحساب وعلامة التبويب أنت.
إخفاء قائمة الحساب
"إخفاء عناصر قائمة الحساب وعلامة التبويب أنت.
قد لا يتم إخفاء بعض المكونات."
@@ -367,8 +367,8 @@
• يؤدي تعطيل هذا الإعداد إلى تحميل المزيد من الإعلانات من جانب الخادم.
• يجب عليك تعطيل هذا الإعداد لجعل إعلانات الفيديو مرئية."
- قائمة الإعدادات
- إخفاء عناصر قائمة إعدادات YouTube.
+ قائمة الإعدادات
+ إخفاء عناصر قائمة إعدادات YouTube.
إخفاء قائمة إعدادات YouTube
إخفاء العناصر في قائمة إعدادات YouTube.
فلتر قائمة إعدادات اليوتيوب
diff --git a/src/main/resources/youtube/translations/el-rGR/strings.xml b/src/main/resources/youtube/translations/el-rGR/strings.xml
index 0b8e0cd48..73f67feee 100644
--- a/src/main/resources/youtube/translations/el-rGR/strings.xml
+++ b/src/main/resources/youtube/translations/el-rGR/strings.xml
@@ -312,8 +312,8 @@ Playlists
18.38.45 - Επαναφορά της παλιάς συμπεριφοράς προεπιλεγμένης ποιότητας βίντεο
"18.48.39 - Απενεργοποίηση ενημέρωσης των προβολών & αριθμού των «Μου αρέσει» σε πραγματικό χρόνο"
- Μενού λογαριασμού
- Απόκρυψη ή εμφάνιση στοιχείων στο μενού λογαριασμού και στην καρτέλα «Εσείς».
+ Μενού λογαριασμού
+ Απόκρυψη ή εμφάνιση στοιχείων στο μενού λογαριασμού και στην καρτέλα «Εσείς».
Φιλτράρισμα μενού λογαριασμού
"Απόκρυψη στοιχείων του μενού λογαριασμού και της καρτέλας «Εσείς»
Κάποια στοιχεία ενδέχεται να μην αποκρύπτονται."
@@ -365,8 +365,8 @@ Playlists
• Όταν ενεργοποιηθεί, μπορεί να μη λειτουργήσει μέχρι να γίνει επανεκκίνηση της συσκευής σας.
• Αν θέλετε να εμφανίζονται οι διαφημίσεις βίντεο, απενεργοποιήστε αυτή τη ρύθμιση."
- Μενού ρυθμίσεων
- Απόκρυψη στοιχείων στο μενού ρυθμίσεων του YouTube.
+ Μενού ρυθμίσεων
+ Απόκρυψη στοιχείων στο μενού ρυθμίσεων του YouTube.
Φιλτράρισμα του μενού ρυθμίσεων YouTube
Απόκρυψη στοιχείων στο μενού ρυθμίσεων του YouTube.
Αλλαγή φίλτρου μενού ρυθμίσεων του YouTube
diff --git a/src/main/resources/youtube/translations/es-rES/strings.xml b/src/main/resources/youtube/translations/es-rES/strings.xml
index e8f0860d1..cded25947 100644
--- a/src/main/resources/youtube/translations/es-rES/strings.xml
+++ b/src/main/resources/youtube/translations/es-rES/strings.xml
@@ -314,8 +314,8 @@ Esto no evita la restricción de edad. Solo la acepta automáticamente."18.38.45 - Restaura el antiguo comportamiento de la calidad predeterminada de vídeo
"18.48.39 - Desactiva la actualización en tiempo real de las visualizaciones y los me gusta"
- Menú de cuenta
- Ocultar o mostrar elementos en el menú de la cuenta y la pestaña Tú.
+ Menú de cuenta
+ Ocultar o mostrar elementos en el menú de la cuenta y la pestaña Tú.
Ocultar menú de cuenta
"Oculta elementos del menú de la cuenta y de la pestaña Tú.
Algunos componentes pueden no estar ocultos."
@@ -368,8 +368,8 @@ Algunos componentes pueden no estar ocultos."
• Al desactivar este ajuste se cargan más anuncios desde el servidor.
• Debes desactivar este ajuste para que los anuncios de vídeo sean visibles."
- Menú de configuración
- Ocultar elementos del menú de configuración de YouTube.
+ Menú de configuración
+ Ocultar elementos del menú de configuración de YouTube.
Ocultar menú de configuración de YouTube
Ocultar elementos del menú de configuración de YouTube.
Filtro de menú de configuración de YouTube
diff --git a/src/main/resources/youtube/translations/fr-rFR/strings.xml b/src/main/resources/youtube/translations/fr-rFR/strings.xml
index 49c2829ca..f15a48081 100644
--- a/src/main/resources/youtube/translations/fr-rFR/strings.xml
+++ b/src/main/resources/youtube/translations/fr-rFR/strings.xml
@@ -320,8 +320,8 @@ Cela ne contourne pas la restriction d'âge, mais confirme automatiquement."18.38.45 - Restaure l\'ancien fonctionnement par défaut de la qualité vidéo
"18.48.39 - Désactive les \"vues\" et \"j'aimes\" en temps réel"
- Menu du compte YouTube
- Masque ou affiche les éléments dans le menu du compte et dans l\'onglet \"Vous\".
+ Menu du compte YouTube
+ Masque ou affiche les éléments dans le menu du compte et dans l\'onglet \"Vous\".
Menu du compte YouTube
"Masque les éléments du menu du compte et de la catégorie \"Vous\"
Certains composants peuvent ne pas être masqués"
@@ -374,8 +374,8 @@ Certains composants peuvent ne pas être masqués"
• Désactiver ce paramètre fait chargé plus de pubs côté serveur
• Vous devez désactiver ce paramètre pour pouvoir avoir des publicités vidéos."
- Menu paramètre
- Masque les éléments dans le menu des paramètres YouTube.
+ Menu paramètre
+ Masque les éléments dans le menu des paramètres YouTube.
Menu paramètre YouTube
Masque les éléments dans le menu des paramètres YouTube.
Filtre du menu paramètre YouTube
diff --git a/src/main/resources/youtube/translations/hu-rHU/strings.xml b/src/main/resources/youtube/translations/hu-rHU/strings.xml
index 1eaf595f2..71d979c45 100644
--- a/src/main/resources/youtube/translations/hu-rHU/strings.xml
+++ b/src/main/resources/youtube/translations/hu-rHU/strings.xml
@@ -304,8 +304,8 @@ Ez nem kerüli meg a korhatárt. Csak automatikusan fogadja el."
18.38.45 - Visszaállítja a régi alapértelmezett videó minőség viselkedést
"18.48.39 - Letiltja a 'nézetek' és 'kedvelések' valós idejű frissítését"
- Fiók menü
- Elemek elrejtése vagy megjelenítése a fiók menüben és a Te fülön.
+ Fiók menü
+ Elemek elrejtése vagy megjelenítése a fiók menüben és a Te fülön.
Fiókmenü elrejtése
"Fiókmenü és az Ön lap elemeinek elrejtése.
Előfordulhat, hogy egyes komponensek nincsenek elrejtve."
@@ -358,8 +358,8 @@ Előfordulhat, hogy egyes komponensek nincsenek elrejtve."
• Ha ezt a beállítást letiltja, több hirdetést tölt be a szerver oldalról.
• Ha a videó hirdetések láthatóak akarja tenni, letiltja ezt a beállítást."
- Beállítások menü
- Elrejt a YouTube beállítások menü elemeit.
+ Beállítások menü
+ Elrejt a YouTube beállítások menü elemeit.
YouTube beállítások menü elrejtése
Elrejt elemeket a YouTube beállítások menüben.
YouTube beállítások menü szűrő
diff --git a/src/main/resources/youtube/translations/it-rIT/strings.xml b/src/main/resources/youtube/translations/it-rIT/strings.xml
index 9bdb1247a..c488efdb2 100644
--- a/src/main/resources/youtube/translations/it-rIT/strings.xml
+++ b/src/main/resources/youtube/translations/it-rIT/strings.xml
@@ -313,8 +313,8 @@ Note:
18.38.45 - Ripristina il comportamento della vecchia qualità video predefinita
"18.48.39 - Disabilita 'visualizzazioni' e 'mi piace' dall'essere aggiornato in tempo reale"
- Menù account
- Nascondi o mostra gli elementi nel menu account e nella scheda Tu.
+ Menù account
+ Nascondi o mostra gli elementi nel menu account e nella scheda Tu.
Nascondi i menù dell\'account
"Nascondi gli elementi del menù dell'account e della scheda Tu.
Alcuni componenti potrebbero non essere nascosti"
@@ -367,8 +367,8 @@ Alcuni componenti potrebbero non essere nascosti"
• Disabilitare questa impostazione carica più annunci dal lato server.
• Dovresti disabilitare questa impostazione per rendere visibili gli annunci video."
- Menu Impostazioni
- Nascondi gli elementi del menu delle impostazioni di YouTube.
+ Menu Impostazioni
+ Nascondi gli elementi del menu delle impostazioni di YouTube.
Nascondi menu impostazioni di YouTube
Nascondi elementi nel menu delle impostazioni di YouTube.
Filtro menu impostazioni di YouTube
diff --git a/src/main/resources/youtube/translations/ja-rJP/strings.xml b/src/main/resources/youtube/translations/ja-rJP/strings.xml
index 6c2527113..e9d0dc796 100644
--- a/src/main/resources/youtube/translations/ja-rJP/strings.xml
+++ b/src/main/resources/youtube/translations/ja-rJP/strings.xml
@@ -311,8 +311,8 @@ DeArrowの詳細については、ここをタップしてください。"18.38.45 - 以前のデフォルトの画質の動作を復元
"18.48.39 - リアルタイムで更新される「再生回数」と「高評価数」を無効化"
- アカウントメニュー
- アカウントメニューとマイページ タブで要素を非表示または表示します。
+ アカウントメニュー
+ アカウントメニューとマイページ タブで要素を非表示または表示します。
アカウントメニューを非表示
"アカウントメニューとマイページタブの要素を非表示にします。
一部のコンポーネントは非表示にならない可能性があります。"
@@ -364,8 +364,8 @@ DeArrowの詳細については、ここをタップしてください。"
- 設定メニュー
- YouTube 設定メニューの要素を非表示にします。
+ 設定メニュー
+ YouTube 設定メニューの要素を非表示にします。
YouTube 設定メニューを非表示
YouTube 設定メニューの要素を非表示にします。
YouTube 設定メニューフィルター
diff --git a/src/main/resources/youtube/translations/ko-rKR/strings.xml b/src/main/resources/youtube/translations/ko-rKR/strings.xml
index fa89803a9..153b34995 100644
--- a/src/main/resources/youtube/translations/ko-rKR/strings.xml
+++ b/src/main/resources/youtube/translations/ko-rKR/strings.xml
@@ -318,8 +318,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."
18.38.45 - 이전 기본 동영상 화질 적용 방식을 복원합니다.
"18.48.39 - '조회수' & '좋아요'의 실시간 업데이트를 비활성화합니다."
- 계정 메뉴
- 계정 메뉴와 나(보관함) 탭에서 구성요소를 숨기거나 표시할 수 있습니다.
+ 계정 메뉴
+ 계정 메뉴와 나(보관함) 탭에서 구성요소를 숨기거나 표시할 수 있습니다.
계정 메뉴 숨기기
"계정 메뉴 및 나 탭에서 구성요소가 숨겨집니다.
일부 구성요소는 숨겨지지 않을 수 있습니다."
@@ -372,8 +372,8 @@ DeArrow에 대해 자세히 알아보려면 여기를 누르세요."
• 이 설정을 활성화하면 일부 광고가 강제로 숨겨집니다. (동영상 광고, 일반 레이아웃 광고)
• 광고 설정에 있는 일부 설정들을 비활성화하려면 이 설정도 비활성화해야 합니다."
- 설정 메뉴
- YouTube 설정 메뉴에서 구성요소를 숨길 수 있습니다.
+ 설정 메뉴
+ YouTube 설정 메뉴에서 구성요소를 숨길 수 있습니다.
YouTube 설정 메뉴 숨기기
YouTube 설정 메뉴에서 구성요소를 숨깁니다.
YouTube 설정 메뉴 필터
diff --git a/src/main/resources/youtube/translations/pl-rPL/strings.xml b/src/main/resources/youtube/translations/pl-rPL/strings.xml
index 0e0858e59..9b15261bb 100644
--- a/src/main/resources/youtube/translations/pl-rPL/strings.xml
+++ b/src/main/resources/youtube/translations/pl-rPL/strings.xml
@@ -312,8 +312,8 @@ Nie pomija to ograniczeń wiekowych, lecz akceptuje je automatycznie."
18.38.45 - Przywraca stare zachowanie domyślnej jakości wideo
"18.48.39 - Wyłącza aktualizowanie wyświetleń i łapek w górę w czasie rzeczywistym"
- Menu konta
- Ukrywa elementy menu konta i zakładki Ty
+ Menu konta
+ Ukrywa elementy menu konta i zakładki Ty
Menu konta
"Ukrywa elementy menu konta i zakładki Ty.
Niektóre komponenty mogą nie być ukryte."
@@ -366,8 +366,8 @@ Niektóre komponenty mogą nie być ukryte."
• Wyłączenie tego ustawienia powoduje zwiększenie ilości reklam.
• Powinieneś wyłączyć to ustawienie jeśli chcesz, by reklamy wideo były widoczne."
- Menu ustawień
- Ukryj ustawienia w ustawieniach YouTube
+ Menu ustawień
+ Ukryj ustawienia w ustawieniach YouTube
Menu ustawień YouTube
Ukryj elementy menu ustawień YouTube
Filtr ustawień YouTube
diff --git a/src/main/resources/youtube/translations/pt-rBR/strings.xml b/src/main/resources/youtube/translations/pt-rBR/strings.xml
index 2980fac00..33c5b6e5b 100644
--- a/src/main/resources/youtube/translations/pt-rBR/strings.xml
+++ b/src/main/resources/youtube/translations/pt-rBR/strings.xml
@@ -314,8 +314,8 @@ Isso não ignora a restrição de idade, apenas aceita isso automaticamente."18.38.45 - Restaurar antigo comportamento padrão de qualidade de vídeo
"18.48.39 - Desativa a atualização em tempo real de 'visualizações' e 'curtidas'"
- Menu da Conta
- Ocultar ou mostrar elementos no menu de contas e na aba Você.
+ Menu da Conta
+ Ocultar ou mostrar elementos no menu de contas e na aba Você.
Ocultar menu de contas
"Ocultar elementos do menu de contas e aba Você
Alguns componentes podem não ser ocultos"
@@ -368,8 +368,8 @@ Alguns componentes podem não ser ocultos"
• Desativar esta configuração carrega mais anúncios do lado do servidor.
• Você deve desativar esta configuração para tornar os anúncios em vídeo visíveis."
- Menu de configurações
- Ocultar elementos no menu de configurações do YouTube.
+ Menu de configurações
+ Ocultar elementos no menu de configurações do YouTube.
Ocultar menu de configurações do YouTube
Ocultar elementos no menu de configurações do YouTube.
Filtro do menu de configurações do YouTube
diff --git a/src/main/resources/youtube/translations/ru-rRU/strings.xml b/src/main/resources/youtube/translations/ru-rRU/strings.xml
index d3e6b5dc2..a4821035e 100644
--- a/src/main/resources/youtube/translations/ru-rRU/strings.xml
+++ b/src/main/resources/youtube/translations/ru-rRU/strings.xml
@@ -320,8 +320,8 @@ Store"
18.38.45 - Восстановить старое поведение качества по умолчанию
"18.48.39 - Отключает обновления в реальном времени для 'просмотры' и 'лайки'"
- Меню аккаунта
- Элементы в меню аккаунта и вкладке Вы.
+ Меню аккаунта
+ Элементы в меню аккаунта и вкладке Вы.
Скрыть меню аккаунта
"Скрыть элементы меню аккаунта и вкладки \"Вы\".
Некоторые компоненты не могут быть скрыты."
@@ -374,8 +374,8 @@ Store"
• Отключая этот параметр, получите больше рекламы.
• Отключите параметр поменять местами, чтобы сделать рекламу видимой."
- Меню настроек
- Элементы в меню настроек YouTube.
+ Меню настроек
+ Элементы в меню настроек YouTube.
Меню настроек YouTube
Скрытие элементов в меню настроек YouTube.
Фильтр меню настроек YouTube
diff --git a/src/main/resources/youtube/translations/tr-rTR/strings.xml b/src/main/resources/youtube/translations/tr-rTR/strings.xml
index 1edcafa9e..0aac3b078 100644
--- a/src/main/resources/youtube/translations/tr-rTR/strings.xml
+++ b/src/main/resources/youtube/translations/tr-rTR/strings.xml
@@ -306,8 +306,8 @@ Kısıtlamalar:
18.38.45 - Eski varsayılan video kalitesi davranışını geri getir
"18.48.39 - \"Görüntülemelerin\" ve \"beğenilerin\" gerçek zamanlı olarak güncellenmesini devre dışı bırakır"
- Hesap Menüsü
- Hesap menüsünde ve siz sekmesinde gizli veya göster.
+ Hesap Menüsü
+ Hesap menüsünde ve siz sekmesinde gizli veya göster.
Hesap menüsünü gizle
"Özel filtredeki hesap menüsü elementlerini gizle."
Hesap menüsü filtresini düzenle
@@ -359,8 +359,8 @@ Kısıtlamalar:
• Bu ayarın devre dışı bırakılması, sunucu tarafından daha fazla reklamın yüklenmesine neden olur.
• Video reklamların görünür olması için bu ayarı devre dışı bırakmalısınız."
- Ayarlar menüsü
- YouTube ayarlar menüsünde elementleri gizle.
+ Ayarlar menüsü
+ YouTube ayarlar menüsünde elementleri gizle.
YouTube ayarlar menüsünü gizle
YouTube ayarlar menüsünde elementleri gizle.
YouTube ayarlar menüsü filtresi
diff --git a/src/main/resources/youtube/translations/uk-rUA/strings.xml b/src/main/resources/youtube/translations/uk-rUA/strings.xml
index d1488839a..903aa4cca 100644
--- a/src/main/resources/youtube/translations/uk-rUA/strings.xml
+++ b/src/main/resources/youtube/translations/uk-rUA/strings.xml
@@ -312,8 +312,8 @@
18.38.45 - Відновлення старої поведінки типової якості відео
"18.48.39 - Виключає 'переглянуті' та 'вподобані' з оновлення в режимі реального часу"
- Меню облікового запису
- Приховувати чи показувати елементи меню облікового запису і вкладки Ви.
+ Меню облікового запису
+ Приховувати чи показувати елементи меню облікового запису і вкладки Ви.
Приховати меню акаунту
"Приховуються елементи меню облікового запису і вкладки Ви.
Деякі компоненти не можуть бути приховані."
@@ -366,8 +366,8 @@
• Вимкнувши це налаштування, вантажиться більше реклами з боку сервера.
• Ви повинні вимкнути це налаштування, щоб зробити відеорекламу видимою."
- Меню налаштувань
- Приховати елементи в меню налаштувань YouTube.
+ Меню налаштувань
+ Приховати елементи в меню налаштувань YouTube.
Приховати меню налаштувань YouTube
Приховати елементи в меню налаштувань YouTube.
Фільтр меню налаштувань YouTube
diff --git a/src/main/resources/youtube/translations/vi-rVN/strings.xml b/src/main/resources/youtube/translations/vi-rVN/strings.xml
index 0aff94f41..02e1e8a5c 100644
--- a/src/main/resources/youtube/translations/vi-rVN/strings.xml
+++ b/src/main/resources/youtube/translations/vi-rVN/strings.xml
@@ -308,8 +308,8 @@ Lưu ý: Tùy chọn này chỉ tự động chấp nhận hộp thoại cảnh
18.38.45 - Khôi phục phương thức áp dụng chất lượng video mặc định kiểu cũ
"18.48.39 - Tắt tính năng cập nhật 'lượt xem' và 'lượt thích' theo thời gian thực"
- Menu Tài khoản
- Ẩn hoặc hiển thị các thành phần menu tài khoản và thẻ Bạn.
+ Menu Tài khoản
+ Ẩn hoặc hiển thị các thành phần menu tài khoản và thẻ Bạn.
Bộ lọc menu Tài khoản
"Ẩn các thành phần của menu Tài khoản và thẻ Bạn.
Lưu ý: Một số thành phần có thể không được ẩn."
@@ -361,8 +361,8 @@ Lưu ý: Một số thành phần có thể không được ẩn."
• Tắt cài đặt này sẽ tải thêm quảng cáo từ phía máy chủ.
• Tắt cài đặt này có thể hiển thị quảng cáo dạng video."
- Menu Cài đặt
- Ẩn các thành phần trong menu cài đặt YouTube.
+ Menu Cài đặt
+ Ẩn các thành phần trong menu cài đặt YouTube.
Ẩn menu cài đặt YouTube
Ẩn các thành phần trong menu cài đặt YouTube.
Bộ lọc menu cài đặt YouTube
diff --git a/src/main/resources/youtube/translations/zh-rCN/strings.xml b/src/main/resources/youtube/translations/zh-rCN/strings.xml
index cebed3440..104cbd4e8 100644
--- a/src/main/resources/youtube/translations/zh-rCN/strings.xml
+++ b/src/main/resources/youtube/translations/zh-rCN/strings.xml
@@ -314,8 +314,8 @@
18.38.45 - 恢复旧的默认视频质量行为
"\"18.48.39 - 禁止实时更新“播放量”和“喜欢次数”"
- 账户菜单
- 隐藏或显示账户菜单和“你的”选项卡中的元素
+ 账户菜单
+ 隐藏或显示账户菜单和“你的”选项卡中的元素
账号菜单
"隐藏帐户菜单和你的选项卡的元素
某些组件可能不会隐藏"
@@ -368,8 +368,8 @@
• 禁用此设置会从服务器端加载更多广告
• 你应该禁用此设置以显示视频广告"
- 设置菜单
- 隐藏 YouTube 设置菜单中的元素
+ 设置菜单
+ 隐藏 YouTube 设置菜单中的元素
YouTube 设置菜单
隐藏 YouTube 设置菜单中的元素
YouTube 设置菜单过滤器
diff --git a/src/main/resources/youtube/translations/zh-rTW/strings.xml b/src/main/resources/youtube/translations/zh-rTW/strings.xml
index 9f724c905..cd1277220 100644
--- a/src/main/resources/youtube/translations/zh-rTW/strings.xml
+++ b/src/main/resources/youtube/translations/zh-rTW/strings.xml
@@ -314,8 +314,8 @@
18.38.45 - 恢復舊的預設影片畫質
"18.48.39 - 停用即時更新「播放量」和「喜歡次數」"
- 帳戶選單
- 隱藏或顯示帳戶選單和「你的」選項卡中的元素
+ 帳戶選單
+ 隱藏或顯示帳戶選單和「你的」選項卡中的元素
賬號選單
"隱藏帳戶選單和你的選項卡的元素
某些組件可能不會隱藏"
@@ -368,8 +368,8 @@
• 停用此設定會從伺服器端載入更多廣告
• 你應該停用此設定以顯示影片廣告"
- 設定選單
- 隱藏 YouTube 設定選單中的元素
+ 設定選單
+ 隱藏 YouTube 設定選單中的元素
YouTube 設定選單
隱藏 YouTube 設定選單中的元素
YouTube 設定選單過濾器
diff --git a/src/main/resources/youtube/visual/icons/extension/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/visual/icons/extension/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..c1c480339
--- /dev/null
+++ b/src/main/resources/youtube/visual/icons/extension/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/icons/gear/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/visual/icons/gear/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..925d49d88
--- /dev/null
+++ b/src/main/resources/youtube/visual/icons/gear/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/icons/revanced/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/visual/icons/revanced/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..693f70a1b
--- /dev/null
+++ b/src/main/resources/youtube/visual/icons/revanced/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/icons/revanced_colored/drawable/revanced_extended_settings_key_icon.xml b/src/main/resources/youtube/visual/icons/revanced_colored/drawable/revanced_extended_settings_key_icon.xml
new file mode 100644
index 000000000..d48f055ba
--- /dev/null
+++ b/src/main/resources/youtube/visual/icons/revanced_colored/drawable/revanced_extended_settings_key_icon.xml
@@ -0,0 +1,12702 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/visual/shared/drawable-xxhdpi/empty_icon.png b/src/main/resources/youtube/visual/shared/drawable-xxhdpi/empty_icon.png
new file mode 100644
index 000000000..8b97b78ae
Binary files /dev/null and b/src/main/resources/youtube/visual/shared/drawable-xxhdpi/empty_icon.png differ
diff --git a/src/main/resources/youtube/visual/shared/drawable/about_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/about_key_icon.xml
new file mode 100644
index 000000000..65d6188b8
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/about_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/accessibility_settings_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/accessibility_settings_key_icon.xml
new file mode 100644
index 000000000..bc9b7a0cc
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/accessibility_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/account_switcher_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/account_switcher_key_icon.xml
new file mode 100644
index 000000000..49c727bde
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/account_switcher_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/auto_play_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/auto_play_key_icon.xml
new file mode 100644
index 000000000..33423b728
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/auto_play_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/billing_and_payment_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/billing_and_payment_key_icon.xml
new file mode 100644
index 000000000..41d3c62fe
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/billing_and_payment_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/captions_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/captions_key_icon.xml
new file mode 100644
index 000000000..17f90209c
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/captions_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/connected_accounts_browse_page_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/connected_accounts_browse_page_key_icon.xml
new file mode 100644
index 000000000..639b5d81d
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/connected_accounts_browse_page_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/data_saving_settings_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/data_saving_settings_key_icon.xml
new file mode 100644
index 000000000..1d3403920
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/data_saving_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/general_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/general_key_icon.xml
new file mode 100644
index 000000000..0c94f9b8c
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/general_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/gms_core_settings_icon.xml b/src/main/resources/youtube/visual/shared/drawable/gms_core_settings_icon.xml
new file mode 100644
index 000000000..5f709f52e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/gms_core_settings_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/history_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/history_key_icon.xml
new file mode 100644
index 000000000..306abfb49
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/history_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/live_chat_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/live_chat_key_icon.xml
new file mode 100644
index 000000000..08489dd92
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/live_chat_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/notification_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/notification_key_icon.xml
new file mode 100644
index 000000000..1e9ed7418
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/notification_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/offline_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/offline_key_icon.xml
new file mode 100644
index 000000000..c99064376
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/offline_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/pair_with_tv_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/pair_with_tv_key_icon.xml
new file mode 100644
index 000000000..1615769df
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/pair_with_tv_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/parent_tools_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/parent_tools_key_icon.xml
new file mode 100644
index 000000000..cccfe46e1
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/parent_tools_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml
new file mode 100644
index 000000000..b7a18cb13
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/premium_early_access_browse_page_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/privacy_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/privacy_key_icon.xml
new file mode 100644
index 000000000..0df4afe0b
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/privacy_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_change_player_flyout_menu_toggle_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_change_player_flyout_menu_toggle_icon.xml
new file mode 100644
index 000000000..01d26b9be
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_change_player_flyout_menu_toggle_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_change_shorts_repeat_state_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_change_shorts_repeat_state_icon.xml
new file mode 100644
index 000000000..769a52b48
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_change_shorts_repeat_state_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_default_video_quality_wifi_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_default_video_quality_wifi_icon.xml
new file mode 100644
index 000000000..14e0a7dd4
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_default_video_quality_wifi_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_disable_hdr_video_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_disable_hdr_video_icon.xml
new file mode 100644
index 000000000..92ac000c9
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_disable_hdr_video_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_disable_quic_protocol_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_disable_quic_protocol_icon.xml
new file mode 100644
index 000000000..371cd6ff5
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_disable_quic_protocol_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_debug_logging_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_debug_logging_icon.xml
new file mode 100644
index 000000000..fded1eed9
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_debug_logging_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_default_playback_speed_shorts_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_default_playback_speed_shorts_icon.xml
new file mode 100644
index 000000000..bf0bf46c5
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_default_playback_speed_shorts_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_external_browser_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_external_browser_icon.xml
new file mode 100644
index 000000000..efc0980e9
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_external_browser_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_open_links_directly_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_open_links_directly_icon.xml
new file mode 100644
index 000000000..448405fe0
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_open_links_directly_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_brightness_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_brightness_icon.xml
new file mode 100644
index 000000000..58b0c6965
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_brightness_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_haptic_feedback_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_haptic_feedback_icon.xml
new file mode 100644
index 000000000..c8490d52e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_haptic_feedback_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_lowest_value_auto_brightness_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_lowest_value_auto_brightness_icon.xml
new file mode 100644
index 000000000..359ed4a4a
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_lowest_value_auto_brightness_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_press_to_engage_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_press_to_engage_icon.xml
new file mode 100644
index 000000000..100fd41de
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_press_to_engage_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_volume_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_volume_icon.xml
new file mode 100644
index 000000000..1fc49e55e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_enable_swipe_volume_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_clip_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_clip_button_icon.xml
new file mode 100644
index 000000000..a4893fd96
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_clip_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_create_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_create_button_icon.xml
new file mode 100644
index 000000000..83a69aad9
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_create_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_home_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_home_button_icon.xml
new file mode 100644
index 000000000..cd3b39ffc
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_home_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_subscriptions_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_subscriptions_button_icon.xml
new file mode 100644
index 000000000..da418b738
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_navigation_subscriptions_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_cast_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_cast_button_icon.xml
new file mode 100644
index 000000000..5766cfaca
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_cast_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_collapse_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_collapse_button_icon.xml
new file mode 100644
index 000000000..12e717e3f
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_collapse_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_audio_track_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_audio_track_icon.xml
new file mode 100644
index 000000000..b9184f767
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_audio_track_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_help_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_help_icon.xml
new file mode 100644
index 000000000..8be796d10
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_help_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_lock_screen_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_lock_screen_icon.xml
new file mode 100644
index 000000000..2815b7acf
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_lock_screen_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_playback_speed_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_playback_speed_icon.xml
new file mode 100644
index 000000000..27dcbd4c3
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_playback_speed_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stable_volume_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stable_volume_icon.xml
new file mode 100644
index 000000000..7a38b24da
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stable_volume_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stats_for_nerds_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stats_for_nerds_icon.xml
new file mode 100644
index 000000000..884e6ff29
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_stats_for_nerds_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_watch_in_vr_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_watch_in_vr_icon.xml
new file mode 100644
index 000000000..aa03ad77f
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_flyout_menu_watch_in_vr_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_previous_next_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_previous_next_button_icon.xml
new file mode 100644
index 000000000..59ddaebb6
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_previous_next_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_youtube_music_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_youtube_music_button_icon.xml
new file mode 100644
index 000000000..fa15dff3a
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_player_youtube_music_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_playlist_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_playlist_button_icon.xml
new file mode 100644
index 000000000..15554747c
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_playlist_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_comment_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_comment_button_icon.xml
new file mode 100644
index 000000000..83ae67b1f
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_comment_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_like_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_like_button_icon.xml
new file mode 100644
index 000000000..fa3e87faa
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_like_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_more_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_more_button_icon.xml
new file mode 100644
index 000000000..0192f67de
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_quick_actions_more_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_report_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_report_button_icon.xml
new file mode 100644
index 000000000..fc4b86641
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_report_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_remix_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_remix_button_icon.xml
new file mode 100644
index 000000000..47c1309a1
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_remix_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_share_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_share_button_icon.xml
new file mode 100644
index 000000000..b38b308c5
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_share_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_history_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_history_icon.xml
new file mode 100644
index 000000000..c063c1d7c
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_history_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_search_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_search_icon.xml
new file mode 100644
index 000000000..6fbac8aaf
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_hide_shorts_shelf_search_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_always_repeat_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_always_repeat_icon.xml
new file mode 100644
index 000000000..f3505e7c8
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_always_repeat_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_icon.xml
new file mode 100644
index 000000000..e812241f1
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_timestamp_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_timestamp_icon.xml
new file mode 100644
index 000000000..b797826c2
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_copy_video_url_timestamp_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_external_downloader_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_external_downloader_icon.xml
new file mode 100644
index 000000000..f5944f65d
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_external_downloader_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_speed_dialog_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_speed_dialog_icon.xml
new file mode 100644
index 000000000..264f4b78d
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_speed_dialog_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_time_ordered_playlist_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_time_ordered_playlist_icon.xml
new file mode 100644
index 000000000..f2e9c1cae
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_time_ordered_playlist_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_whitelist_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_whitelist_icon.xml
new file mode 100644
index 000000000..54dc1d485
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_overlay_button_whitelist_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_action_buttons_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_action_buttons_icon.xml
new file mode 100644
index 000000000..ab8104efa
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_action_buttons_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ads_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ads_icon.xml
new file mode 100644
index 000000000..508b14d0e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ads_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_alt_thumbnails_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_alt_thumbnails_icon.xml
new file mode 100644
index 000000000..47eaee3b0
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_alt_thumbnails_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ambient_mode_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ambient_mode_icon.xml
new file mode 100644
index 000000000..d5f196ed1
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ambient_mode_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_category_bar_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_category_bar_icon.xml
new file mode 100644
index 000000000..9271889d1
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_category_bar_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_community_posts_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_community_posts_icon.xml
new file mode 100644
index 000000000..dac714d18
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_community_posts_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_custom_filter_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_custom_filter_icon.xml
new file mode 100644
index 000000000..65c8cc3ca
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_custom_filter_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_feed_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_feed_icon.xml
new file mode 100644
index 000000000..be371c3d8
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_feed_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_fullscreen_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_fullscreen_icon.xml
new file mode 100644
index 000000000..dfc340ba3
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_fullscreen_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_import_export_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_import_export_icon.xml
new file mode 100644
index 000000000..6f86fe8eb
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_import_export_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_misc_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_misc_icon.xml
new file mode 100644
index 000000000..18ff9f1dc
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_misc_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_navigation_buttons_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_navigation_buttons_icon.xml
new file mode 100644
index 000000000..be6b717bc
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_navigation_buttons_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_buttons_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_buttons_icon.xml
new file mode 100644
index 000000000..c4a766458
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_buttons_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_flyout_menu_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_flyout_menu_icon.xml
new file mode 100644
index 000000000..843950b7d
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_flyout_menu_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_icon.xml
new file mode 100644
index 000000000..053304da9
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_player_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ryd_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ryd_icon.xml
new file mode 100644
index 000000000..d6256a588
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_ryd_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_seekbar_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_seekbar_icon.xml
new file mode 100644
index 000000000..db42c6604
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_seekbar_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_settings_menu_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_settings_menu_icon.xml
new file mode 100644
index 000000000..925d49d88
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_settings_menu_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_shorts_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_shorts_icon.xml
new file mode 100644
index 000000000..2ae04cdac
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_shorts_icon.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_spoof_client_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_spoof_client_icon.xml
new file mode 100644
index 000000000..8d08d6d16
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_spoof_client_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_swipe_controls_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_swipe_controls_icon.xml
new file mode 100644
index 000000000..851d550c7
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_swipe_controls_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_toolbar_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_toolbar_icon.xml
new file mode 100644
index 000000000..f032b5810
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_toolbar_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_description_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_description_icon.xml
new file mode 100644
index 000000000..ad573986e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_description_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_icon.xml
new file mode 100644
index 000000000..cad4d175a
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_preference_screen_video_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_sanitize_sharing_links_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_sanitize_sharing_links_icon.xml
new file mode 100644
index 000000000..8fcf3fe27
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_sanitize_sharing_links_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_magnitude_threshold_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_magnitude_threshold_icon.xml
new file mode 100644
index 000000000..ef7732c4e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_magnitude_threshold_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_background_alpha_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_background_alpha_icon.xml
new file mode 100644
index 000000000..e822a5985
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_background_alpha_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_rect_size_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_rect_size_icon.xml
new file mode 100644
index 000000000..2530d081f
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_rect_size_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_text_size_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_text_size_icon.xml
new file mode 100644
index 000000000..28aef96a8
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_text_size_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_timeout_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_timeout_icon.xml
new file mode 100644
index 000000000..5e51143e8
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_swipe_overlay_timeout_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/revanced_switch_create_with_notifications_button_icon.xml b/src/main/resources/youtube/visual/shared/drawable/revanced_switch_create_with_notifications_button_icon.xml
new file mode 100644
index 000000000..d2708b8b2
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/revanced_switch_create_with_notifications_button_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/sb_enable_create_segment_icon.xml b/src/main/resources/youtube/visual/shared/drawable/sb_enable_create_segment_icon.xml
new file mode 100644
index 000000000..2e7657d21
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/sb_enable_create_segment_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/sb_enable_voting_icon.xml b/src/main/resources/youtube/visual/shared/drawable/sb_enable_voting_icon.xml
new file mode 100644
index 000000000..08ea883d3
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/sb_enable_voting_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/subscription_product_setting_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/subscription_product_setting_key_icon.xml
new file mode 100644
index 000000000..2274d9c0e
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/subscription_product_setting_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/video_quality_settings_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/video_quality_settings_key_icon.xml
new file mode 100644
index 000000000..5619ba91f
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/video_quality_settings_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/main/resources/youtube/visual/shared/drawable/your_data_key_icon.xml b/src/main/resources/youtube/visual/shared/drawable/your_data_key_icon.xml
new file mode 100644
index 000000000..5d48b5f45
--- /dev/null
+++ b/src/main/resources/youtube/visual/shared/drawable/your_data_key_icon.xml
@@ -0,0 +1,18 @@
+
+
+
+
+