From 449531c6963cdb87a96f5bb19561f4790ba69d4d Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Tue, 4 Feb 2025 07:41:03 +0000
Subject: [PATCH] [Physical Keyboard] update mouse key images color

replace drawable color with tokenzied color

Bug:389665773
Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled
Test: atest
packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod/

Change-Id: Ib24add0a12ab21d5e6c4b88e5f2ba4bb584f0c3f
---
 res/drawable-night/mouse_keys_click.xml       | 192 --------------
 res/drawable-night/mouse_keys_directional.xml | 248 ------------------
 res/drawable-night/mouse_keys_press_hold.xml  | 192 --------------
 res/drawable-night/mouse_keys_release.xml     | 192 --------------
 res/drawable-night/mouse_keys_release2.xml    | 192 --------------
 .../mouse_keys_toggle_scroll.xml              | 192 --------------
 res/drawable/mouse_keys_click.xml             | 113 ++++----
 res/drawable/mouse_keys_directional.xml       | 131 ++++-----
 res/drawable/mouse_keys_press_hold.xml        | 113 ++++----
 res/drawable/mouse_keys_release.xml           | 113 ++++----
 res/drawable/mouse_keys_release2.xml          | 113 ++++----
 res/drawable/mouse_keys_toggle_scroll.xml     | 113 ++++----
 res/layout/mouse_keys_image_item.xml          |   2 +
 13 files changed, 353 insertions(+), 1553 deletions(-)
 delete mode 100644 res/drawable-night/mouse_keys_click.xml
 delete mode 100644 res/drawable-night/mouse_keys_directional.xml
 delete mode 100644 res/drawable-night/mouse_keys_press_hold.xml
 delete mode 100644 res/drawable-night/mouse_keys_release.xml
 delete mode 100644 res/drawable-night/mouse_keys_release2.xml
 delete mode 100644 res/drawable-night/mouse_keys_toggle_scroll.xml

diff --git a/res/drawable-night/mouse_keys_click.xml b/res/drawable-night/mouse_keys_click.xml
deleted file mode 100644
index e5e8d5a486e..00000000000
--- a/res/drawable-night/mouse_keys_click.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#F1B3E6"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable-night/mouse_keys_directional.xml b/res/drawable-night/mouse_keys_directional.xml
deleted file mode 100644
index fd49f1e33e8..00000000000
--- a/res/drawable-night/mouse_keys_directional.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M172.4,18h12v12h-12z"/>
-        <path
-            android:pathData="M181.24,27.41L176.46,22.64V26.69H174.99V20.11H181.56V21.59H177.51L182.29,26.36L181.24,27.41Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M194.63,18h12v12h-12z"/>
-        <path
-            android:pathData="M199.89,28.02V22.81L197.66,25.05L196.61,24L200.63,19.98L204.66,24L203.61,25.05L201.37,22.81V28.02H199.89Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M216.86,18h12v12h-12z"/>
-        <path
-            android:pathData="M220.02,27.41L218.98,26.36L223.75,21.59H219.7V20.11H226.27V26.69H224.8V22.64L220.02,27.41Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.66,14 282.77,14H297C298.1,14 299,14.9 299,16V32C299,33.1 298.1,34 297,34H282.77C281.66,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.3,42 121.2,42.9 121.2,44V60C121.2,61.1 120.3,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M180.79,46h12v12h-12z"/>
-        <path
-            android:pathData="M185.6,52.74L187.84,54.97L186.79,56.03L182.76,52L186.79,47.97L187.84,49.03L185.6,51.26H190.81V52.74H185.6Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M231.59,46h12v12h-12z"/>
-        <path
-            android:pathData="M238.77,52.74H233.56V51.26H238.77L236.54,49.03L237.59,47.97L241.61,52L237.59,56.03L236.54,54.97L238.77,52.74Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M187.67,74h12v12h-12z"/>
-        <path
-            android:pathData="M190.09,83.59V78.51H191.56V81.07L196.64,76L197.67,77.04L192.6,82.11H195.16V83.59H190.09Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.44C229.55,70 230.44,70.9 230.44,72V88C230.44,89.1 229.55,90 228.44,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M213.45,74h12v12h-12z"/>
-        <path
-            android:pathData="M218.71,75.97H220.19V81.19L222.43,78.95L223.48,80L219.45,84.03L215.43,80L216.48,78.95L218.71,81.19V75.97Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F1B3E6"/>
-    <group>
-        <clip-path
-            android:pathData="M239.23,74h12v12h-12z"/>
-        <path
-            android:pathData="M243.84,83.69V82.21H246.4L241.21,77.01L242.24,75.97L247.44,81.18V78.61H248.92V83.69H243.84Z"
-            android:fillColor="#4C1F49"/>
-    </group>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.44C243.55,98 244.44,98.9 244.44,100V116C244.44,117.11 243.55,118 242.44,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable-night/mouse_keys_press_hold.xml b/res/drawable-night/mouse_keys_press_hold.xml
deleted file mode 100644
index eb8560255ff..00000000000
--- a/res/drawable-night/mouse_keys_press_hold.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F1B3E6"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable-night/mouse_keys_release.xml b/res/drawable-night/mouse_keys_release.xml
deleted file mode 100644
index 4fb7c4ad26f..00000000000
--- a/res/drawable-night/mouse_keys_release.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F1B3E6"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable-night/mouse_keys_release2.xml b/res/drawable-night/mouse_keys_release2.xml
deleted file mode 100644
index e844bc9790c..00000000000
--- a/res/drawable-night/mouse_keys_release2.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F1B3E6"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable-night/mouse_keys_toggle_scroll.xml b/res/drawable-night/mouse_keys_toggle_scroll.xml
deleted file mode 100644
index 3d6cbf3409a..00000000000
--- a/res/drawable-night/mouse_keys_toggle_scroll.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="348dp"
-        android:height="160dp"
-        android:viewportWidth="348"
-        android:viewportHeight="160">
-    <path
-        android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#171216"/>
-    <path
-        android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F1B3E6"/>
-    <path
-        android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#554151"/>
-    <path
-        android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#4E444B"/>
-    <path
-        android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#3A3338"/>
-    <path
-        android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
-        android:strokeWidth="6"
-        android:fillColor="#00000000"
-        android:strokeColor="#3A3338"/>
-</vector>
diff --git a/res/drawable/mouse_keys_click.xml b/res/drawable/mouse_keys_click.xml
index 2dd62389d41..bc9863280dd 100644
--- a/res/drawable/mouse_keys_click.xml
+++ b/res/drawable/mouse_keys_click.xml
@@ -15,178 +15,179 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/drawable/mouse_keys_directional.xml b/res/drawable/mouse_keys_directional.xml
index ae79563447e..207a930566b 100644
--- a/res/drawable/mouse_keys_directional.xml
+++ b/res/drawable/mouse_keys_directional.xml
@@ -15,237 +15,238 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M172.4,18h12v12h-12z"/>
         <path
             android:pathData="M181.24,27.41L176.46,22.64V26.69H174.99V20.11H181.56V21.59H177.51L182.29,26.36L181.24,27.41Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M194.63,18h12v12h-12z"/>
         <path
             android:pathData="M199.89,28.02V22.81L197.66,25.05L196.61,24L200.63,19.98L204.66,24L203.61,25.05L201.37,22.81V28.02H199.89Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M216.86,18h12v12h-12z"/>
         <path
             android:pathData="M220.02,27.41L218.98,26.36L223.75,21.59H219.7V20.11H226.27V26.69H224.8V22.64L220.02,27.41Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.66,14 282.77,14H297C298.1,14 299,14.9 299,16V32C299,33.1 298.1,34 297,34H282.77C281.66,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.3,42 121.2,42.9 121.2,44V60C121.2,61.1 120.3,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M180.79,46h12v12h-12z"/>
         <path
             android:pathData="M185.6,52.74L187.84,54.97L186.79,56.03L182.76,52L186.79,47.97L187.84,49.03L185.6,51.26H190.81V52.74H185.6Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M231.59,46h12v12h-12z"/>
         <path
             android:pathData="M238.77,52.74H233.56V51.26H238.77L236.54,49.03L237.59,47.97L241.61,52L237.59,56.03L236.54,54.97L238.77,52.74Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M187.67,74h12v12h-12z"/>
         <path
             android:pathData="M190.09,83.59V78.51H191.56V81.07L196.64,76L197.67,77.04L192.6,82.11H195.16V83.59H190.09Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.44C229.55,70 230.44,70.9 230.44,72V88C230.44,89.1 229.55,90 228.44,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M213.45,74h12v12h-12z"/>
         <path
             android:pathData="M218.71,75.97H220.19V81.19L222.43,78.95L223.48,80L219.45,84.03L215.43,80L216.48,78.95L218.71,81.19V75.97Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <group>
         <clip-path
             android:pathData="M239.23,74h12v12h-12z"/>
         <path
             android:pathData="M243.84,83.69V82.21H246.4L241.21,77.01L242.24,75.97L247.44,81.18V78.61H248.92V83.69H243.84Z"
-            android:fillColor="#ffffff"/>
+            android:fillColor="@androidprv:color/materialColorOnPrimary"/>
     </group>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.44C243.55,98 244.44,98.9 244.44,100V116C244.44,117.11 243.55,118 242.44,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#F2E5EB"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHigh"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/drawable/mouse_keys_press_hold.xml b/res/drawable/mouse_keys_press_hold.xml
index af20290c053..b8523fe5ed7 100644
--- a/res/drawable/mouse_keys_press_hold.xml
+++ b/res/drawable/mouse_keys_press_hold.xml
@@ -15,178 +15,179 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/drawable/mouse_keys_release.xml b/res/drawable/mouse_keys_release.xml
index 232d5e721e8..40666094f15 100644
--- a/res/drawable/mouse_keys_release.xml
+++ b/res/drawable/mouse_keys_release.xml
@@ -15,178 +15,179 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/drawable/mouse_keys_release2.xml b/res/drawable/mouse_keys_release2.xml
index 88422cbd80e..2198922d75d 100644
--- a/res/drawable/mouse_keys_release2.xml
+++ b/res/drawable/mouse_keys_release2.xml
@@ -15,178 +15,179 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/drawable/mouse_keys_toggle_scroll.xml b/res/drawable/mouse_keys_toggle_scroll.xml
index 1a1a55084ac..506a250432f 100644
--- a/res/drawable/mouse_keys_toggle_scroll.xml
+++ b/res/drawable/mouse_keys_toggle_scroll.xml
@@ -15,178 +15,179 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:width="348dp"
         android:height="160dp"
         android:viewportWidth="348"
         android:viewportHeight="160">
     <path
         android:pathData="M6,14C6,9.58 9.58,6 14,6H334C338.42,6 342,9.58 342,14V146C342,150.42 338.42,154 334,154H14C9.58,154 6,150.42 6,146V14Z"
-        android:fillColor="#FFF7F9"/>
+        android:fillColor="@androidprv:color/materialColorSurface"/>
     <path
         android:pathData="M14,16C14,14.9 14.9,14 16,14H30.23C31.34,14 32.23,14.9 32.23,16V32C32.23,33.1 31.34,34 30.23,34H16C14.9,34 14,33.1 14,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M36.23,16C36.23,14.9 37.13,14 38.23,14H52.46C53.57,14 54.46,14.9 54.46,16V32C54.46,33.1 53.57,34 52.46,34H38.23C37.13,34 36.23,33.1 36.23,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M58.46,16C58.46,14.9 59.36,14 60.46,14H74.69C75.8,14 76.69,14.9 76.69,16V32C76.69,33.1 75.8,34 74.69,34H60.46C59.36,34 58.46,33.1 58.46,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M80.69,16C80.69,14.9 81.59,14 82.69,14H96.92C98.03,14 98.92,14.9 98.92,16V32C98.92,33.1 98.03,34 96.92,34H82.69C81.59,34 80.69,33.1 80.69,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M102.92,16C102.92,14.9 103.82,14 104.92,14H119.15C120.26,14 121.15,14.9 121.15,16V32C121.15,33.1 120.26,34 119.15,34H104.92C103.82,34 102.92,33.1 102.92,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.15,16C125.15,14.9 126.05,14 127.15,14H141.38C142.49,14 143.38,14.9 143.38,16V32C143.38,33.1 142.49,34 141.38,34H127.15C126.05,34 125.15,33.1 125.15,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M147.38,16C147.38,14.9 148.28,14 149.38,14H163.62C164.72,14 165.62,14.9 165.62,16V32C165.62,33.1 164.72,34 163.62,34H149.38C148.28,34 147.38,33.1 147.38,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M169.62,16C169.62,14.9 170.51,14 171.62,14H185.85C186.95,14 187.85,14.9 187.85,16V32C187.85,33.1 186.95,34 185.85,34H171.62C170.51,34 169.62,33.1 169.62,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M191.85,16C191.85,14.9 192.74,14 193.85,14H208.08C209.18,14 210.08,14.9 210.08,16V32C210.08,33.1 209.18,34 208.08,34H193.85C192.74,34 191.85,33.1 191.85,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M214.08,16C214.08,14.9 214.97,14 216.08,14H230.31C231.41,14 232.31,14.9 232.31,16V32C232.31,33.1 231.41,34 230.31,34H216.08C214.97,34 214.08,33.1 214.08,32V16Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M236.31,16C236.31,14.9 237.2,14 238.31,14H252.54C253.64,14 254.54,14.9 254.54,16V32C254.54,33.1 253.64,34 252.54,34H238.31C237.2,34 236.31,33.1 236.31,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M258.54,16C258.54,14.9 259.43,14 260.54,14H274.77C275.87,14 276.77,14.9 276.77,16V32C276.77,33.1 275.87,34 274.77,34H260.54C259.43,34 258.54,33.1 258.54,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M280.77,16C280.77,14.9 281.67,14 282.77,14H297C298.11,14 299,14.9 299,16V32C299,33.1 298.11,34 297,34H282.77C281.67,34 280.77,33.1 280.77,32V16Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,16C303,14.9 303.89,14 305,14H332C333.11,14 334,14.9 334,16V32C334,33.1 333.11,34 332,34H305C303.89,34 303,33.1 303,32V16Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,44C14,42.9 14.9,42 16,42H43C44.1,42 45,42.9 45,44V60C45,61.1 44.1,62 43,62H16C14.9,62 14,61.1 14,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M49,44C49,42.9 49.9,42 51,42H68.4C69.5,42 70.4,42.9 70.4,44V60C70.4,61.1 69.5,62 68.4,62H51C49.9,62 49,61.1 49,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M74.4,44C74.4,42.9 75.3,42 76.4,42H93.8C94.9,42 95.8,42.9 95.8,44V60C95.8,61.1 94.9,62 93.8,62H76.4C75.3,62 74.4,61.1 74.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M99.8,44C99.8,42.9 100.69,42 101.8,42H119.2C120.31,42 121.2,42.9 121.2,44V60C121.2,61.1 120.31,62 119.2,62H101.8C100.69,62 99.8,61.1 99.8,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M125.2,44C125.2,42.9 126.1,42 127.2,42H144.6C145.71,42 146.6,42.9 146.6,44V60C146.6,61.1 145.71,62 144.6,62H127.2C126.1,62 125.2,61.1 125.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M150.6,44C150.6,42.9 151.5,42 152.6,42H170C171.1,42 172,42.9 172,44V60C172,61.1 171.1,62 170,62H152.6C151.5,62 150.6,61.1 150.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M176,44C176,42.9 176.9,42 178,42H195.4C196.51,42 197.4,42.9 197.4,44V60C197.4,61.1 196.51,62 195.4,62H178C176.9,62 176,61.1 176,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M201.4,44C201.4,42.9 202.29,42 203.4,42H220.8C221.9,42 222.8,42.9 222.8,44V60C222.8,61.1 221.9,62 220.8,62H203.4C202.29,62 201.4,61.1 201.4,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M226.8,44C226.8,42.9 227.7,42 228.8,42H246.2C247.3,42 248.2,42.9 248.2,44V60C248.2,61.1 247.3,62 246.2,62H228.8C227.7,62 226.8,61.1 226.8,60V44Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M252.2,44C252.2,42.9 253.1,42 254.2,42H271.6C272.7,42 273.6,42.9 273.6,44V60C273.6,61.1 272.7,62 271.6,62H254.2C253.1,62 252.2,61.1 252.2,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M277.6,44C277.6,42.9 278.5,42 279.6,42H297C298.11,42 299,42.9 299,44V60C299,61.1 298.11,62 297,62H279.6C278.5,62 277.6,61.1 277.6,60V44Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M303,44C303,42.9 303.89,42 305,42H332C333.11,42 334,42.9 334,44V60C334,61.1 333.11,62 332,62H305C303.89,62 303,61.1 303,60V44Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,72C14,70.9 14.9,70 16,70H48C49.1,70 50,70.9 50,72V88C50,89.1 49.1,90 48,90H16C14.9,90 14,89.1 14,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,72C54,70.9 54.9,70 56,70H73.78C74.88,70 75.78,70.9 75.78,72V88C75.78,89.1 74.88,90 73.78,90H56C54.9,90 54,89.1 54,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M79.78,72C79.78,70.9 80.67,70 81.78,70H99.56C100.66,70 101.56,70.9 101.56,72V88C101.56,89.1 100.66,90 99.56,90H81.78C80.67,90 79.78,89.1 79.78,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M105.56,72C105.56,70.9 106.45,70 107.56,70H125.33C126.44,70 127.33,70.9 127.33,72V88C127.33,89.1 126.44,90 125.33,90H107.56C106.45,90 105.56,89.1 105.56,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M131.33,72C131.33,70.9 132.23,70 133.33,70H151.11C152.22,70 153.11,70.9 153.11,72V88C153.11,89.1 152.22,90 151.11,90H133.33C132.23,90 131.33,89.1 131.33,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M157.11,72C157.11,70.9 158.01,70 159.11,70H176.89C177.99,70 178.89,70.9 178.89,72V88C178.89,89.1 177.99,90 176.89,90H159.11C158.01,90 157.11,89.1 157.11,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M182.89,72C182.89,70.9 183.78,70 184.89,70H202.67C203.77,70 204.67,70.9 204.67,72V88C204.67,89.1 203.77,90 202.67,90H184.89C183.78,90 182.89,89.1 182.89,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M208.67,72C208.67,70.9 209.56,70 210.67,70H228.45C229.55,70 230.45,70.9 230.45,72V88C230.45,89.1 229.55,90 228.45,90H210.67C209.56,90 208.67,89.1 208.67,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M234.44,72C234.44,70.9 235.34,70 236.44,70H254.22C255.33,70 256.22,70.9 256.22,72V88C256.22,89.1 255.33,90 254.22,90H236.44C235.34,90 234.44,89.1 234.44,88V72Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M260.22,72C260.22,70.9 261.12,70 262.22,70H280C281.11,70 282,70.9 282,72V88C282,89.1 281.11,90 280,90H262.22C261.12,90 260.22,89.1 260.22,88V72Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M286,72C286,70.9 286.89,70 288,70H332C333.11,70 334,70.9 334,72V88C334,89.1 333.11,90 332,90H288C286.89,90 286,89.1 286,88V72Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,100C14,98.9 14.9,98 16,98H62C63.1,98 64,98.9 64,100V116C64,117.11 63.1,118 62,118H16C14.9,118 14,117.11 14,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M68,100C68,98.9 68.9,98 70,98H87.78C88.88,98 89.78,98.9 89.78,100V116C89.78,117.11 88.88,118 87.78,118H70C68.9,118 68,117.11 68,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M93.78,100C93.78,98.9 94.67,98 95.78,98H113.56C114.66,98 115.56,98.9 115.56,100V116C115.56,117.11 114.66,118 113.56,118H95.78C94.67,118 93.78,117.11 93.78,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M119.56,100C119.56,98.9 120.45,98 121.56,98H139.33C140.44,98 141.33,98.9 141.33,100V116C141.33,117.11 140.44,118 139.33,118H121.56C120.45,118 119.56,117.11 119.56,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M145.33,100C145.33,98.9 146.23,98 147.33,98H165.11C166.22,98 167.11,98.9 167.11,100V116C167.11,117.11 166.22,118 165.11,118H147.33C146.23,118 145.33,117.11 145.33,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M171.11,100C171.11,98.9 172.01,98 173.11,98H190.89C191.99,98 192.89,98.9 192.89,100V116C192.89,117.11 191.99,118 190.89,118H173.11C172.01,118 171.11,117.11 171.11,116V100Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M196.89,100C196.89,98.9 197.78,98 198.89,98H216.67C217.77,98 218.67,98.9 218.67,100V116C218.67,117.11 217.77,118 216.67,118H198.89C197.78,118 196.89,117.11 196.89,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M222.67,100C222.67,98.9 223.56,98 224.67,98H242.45C243.55,98 244.45,98.9 244.45,100V116C244.45,117.11 243.55,118 242.45,118H224.67C223.56,118 222.67,117.11 222.67,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M248.44,100C248.44,98.9 249.34,98 250.44,98H268.22C269.33,98 270.22,98.9 270.22,100V116C270.22,117.11 269.33,118 268.22,118H250.44C249.34,118 248.44,117.11 248.44,116V100Z"
-        android:fillColor="#804D7A"/>
+        android:fillColor="@androidprv:color/materialColorPrimary"/>
     <path
         android:pathData="M274.22,100C274.22,98.9 275.12,98 276.22,98H294C295.11,98 296,98.9 296,100V116C296,117.11 295.11,118 294,118H276.22C275.12,118 274.22,117.11 274.22,116V100Z"
-        android:fillColor="#F8DAEE"/>
+        android:fillColor="@androidprv:color/materialColorSecondaryContainer"/>
     <path
         android:pathData="M300,100C300,98.9 300.89,98 302,98H332C333.11,98 334,98.9 334,100V116C334,117.11 333.11,118 332,118H302C300.89,118 300,117.11 300,116V100Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M14,128C14,126.89 14.9,126 16,126H48C49.1,126 50,126.89 50,128V144C50,145.1 49.1,146 48,146H16C14.9,146 14,145.1 14,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M54,128C54,126.89 54.9,126 56,126H88C89.1,126 90,126.89 90,128V144C90,145.1 89.1,146 88,146H56C54.9,146 54,145.1 54,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M94,128C94,126.89 94.9,126 96,126H248C249.1,126 250,126.89 250,128V144C250,145.1 249.1,146 248,146H96C94.9,146 94,145.1 94,144V128Z"
-        android:fillColor="#D1C2CB"/>
+        android:fillColor="@androidprv:color/materialColorOutlineVariant"/>
     <path
         android:pathData="M254,128C254,126.89 254.9,126 256,126H276C277.11,126 278,126.89 278,128V144C278,145.1 277.11,146 276,146H256C254.9,146 254,145.1 254,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M282,128C282,126.89 282.89,126 284,126H304C305.11,126 306,126.89 306,128V144C306,145.1 305.11,146 304,146H284C282.89,146 282,145.1 282,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M310,128C310,126.89 310.89,126 312,126H332C333.11,126 334,126.89 334,128V144C334,145.1 333.11,146 332,146H312C310.89,146 310,145.1 310,144V128Z"
-        android:fillColor="#ECDFE5"/>
+        android:fillColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
     <path
         android:pathData="M18,3C9.72,3 3,9.72 3,18V142C3,150.28 9.72,157 18,157H330C338.28,157 345,150.28 345,142V18C345,9.72 338.28,3 330,3H18Z"
         android:strokeWidth="6"
         android:fillColor="#00000000"
-        android:strokeColor="#ECDFE5"/>
+        android:strokeColor="@androidprv:color/materialColorSurfaceContainerHighest"/>
 </vector>
diff --git a/res/layout/mouse_keys_image_item.xml b/res/layout/mouse_keys_image_item.xml
index 52ee31a9e15..207a5bd2328 100644
--- a/res/layout/mouse_keys_image_item.xml
+++ b/res/layout/mouse_keys_image_item.xml
@@ -16,6 +16,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
@@ -35,5 +36,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="8dp"
+        android:textColor="@androidprv:color/materialColorOnSurface"
         android:gravity="center" />
 </LinearLayout>
\ No newline at end of file