diff --git a/lawnchair/res/drawable/calculator.xml b/lawnchair/res/drawable/calculator.xml
index 9b75021086..a59e61da3b 100644
--- a/lawnchair/res/drawable/calculator.xml
+++ b/lawnchair/res/drawable/calculator.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM13.03,7.06L14.09,6l1.41,1.41L16.91,6l1.06,1.06l-1.41,1.41l1.41,1.41l-1.06,1.06L15.5,9.54l-1.41,1.41l-1.06,-1.06l1.41,-1.41L13.03,7.06zM6.25,7.72h5v1.5h-5V7.72zM11.5,16h-2v2H8v-2H6v-1.5h2v-2h1.5v2h2V16zM18,17.25h-5v-1.5h5V17.25zM18,14.75h-5v-1.5h5V14.75z"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM13.03,7.06L14.09,6l1.41,1.41L16.91,6l1.06,1.06l-1.41,1.41l1.41,1.41l-1.06,1.06L15.5,9.54l-1.41,1.41l-1.06,-1.06l1.41,-1.41L13.03,7.06zM6.25,7.72h5v1.5h-5V7.72zM11.5,16h-2v2H8v-2H6v-1.5h2v-2h1.5v2h2V16zM18,17.25h-5v-1.5h5V17.25zM18,14.75h-5v-1.5h5V14.75z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_about.xml b/lawnchair/res/drawable/ic_about.xml
index 1cf99c56bd..2a361b38b8 100644
--- a/lawnchair/res/drawable/ic_about.xml
+++ b/lawnchair/res/drawable/ic_about.xml
@@ -3,14 +3,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12,8m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12,11L12,11A1,1 0,0 1,13 12L13,16A1,1 0,0 1,12 17L12,17A1,1 0,0 1,11 16L11,12A1,1 0,0 1,12 11z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,8m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,11L12,11A1,1 0,0 1,13 12L13,16A1,1 0,0 1,12 17L12,17A1,1 0,0 1,11 16L11,12A1,1 0,0 1,12 11z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_app_drawer.xml b/lawnchair/res/drawable/ic_app_drawer.xml
index fdd4f789a0..ab410cb95a 100644
--- a/lawnchair/res/drawable/ic_app_drawer.xml
+++ b/lawnchair/res/drawable/ic_app_drawer.xml
@@ -3,31 +3,31 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M6,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M6,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M6,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M6,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M6,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M6,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M18,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_back.xml b/lawnchair/res/drawable/ic_back.xml
index eeb51e457e..9e4c05918e 100644
--- a/lawnchair/res/drawable/ic_back.xml
+++ b/lawnchair/res/drawable/ic_back.xml
@@ -1,14 +1,13 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:name="vector"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/textColorPrimary"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/textColorPrimary">
+    android:viewportHeight="24">
     <path
         android:name="path"
-        android:pathData="M 20 11 L 7.83 11 L 13.42 5.41 L 12 4 L 4 12 L 12 20 L 13.41 18.59 L 7.83 13 L 20 13 L 20 11 Z"
         android:fillColor="#000"
-        android:strokeWidth="1"/>
+        android:pathData="M 20 11 L 7.83 11 L 13.42 5.41 L 12 4 L 4 12 L 12 20 L 13.41 18.59 L 7.83 13 L 20 13 L 20 11 Z"
+        android:strokeWidth="1" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_battery_low.xml b/lawnchair/res/drawable/ic_battery_low.xml
index 7dbf6460b9..f095b2b610 100644
--- a/lawnchair/res/drawable/ic_battery_low.xml
+++ b/lawnchair/res/drawable/ic_battery_low.xml
@@ -1,5 +1,4 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:name="vector"
     android:width="24dp"
     android:height="24dp"
@@ -7,6 +6,6 @@
     android:viewportHeight="24">
     <path
         android:name="path"
-        android:pathData="M9.5 4H7.33C6.6 4 6 4.6 6 5.33V15V20.67C6 21.4 6.6 22 7.33 22H16.66C17.4 22 18 21.4 18 20.67V15V5.33C18 4.6 17.4 4 16.67 4H14.5V2H9.5V4ZM8 18V13V6H16V15V18H8Z"
-        android:fillColor="#000" />
+        android:fillColor="#000"
+        android:pathData="M9.5 4H7.33C6.6 4 6 4.6 6 5.33V15V20.67C6 21.4 6.6 22 7.33 22H16.66C17.4 22 18 21.4 18 20.67V15V5.33C18 4.6 17.4 4 16.67 4H14.5V2H9.5V4ZM8 18V13V6H16V15V18H8Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_bing.xml b/lawnchair/res/drawable/ic_bing.xml
index 539a6dc728..6fb62f68e8 100644
--- a/lawnchair/res/drawable/ic_bing.xml
+++ b/lawnchair/res/drawable/ic_bing.xml
@@ -1,35 +1,73 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="48" android:viewportWidth="48"
-    android:width="24dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
     <path android:pathData="M17.572,37.076L20,35.619V10.603c0,-1.632 -0.796,-3.161 -2.133,-4.096L12.36,2.652C11.366,1.956 10,2.667 10,3.881V32.5c0,0.22 0.02,0.555 0.033,0.772C10.369,36.867 14.382,38.99 17.572,37.076z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="17.941" android:endY="40.401"
-                android:startX="11.905" android:startY="1.952" android:type="linear">
-                <item android:color="#FF3DBFFC" android:offset="0"/>
-                <item android:color="#FF183EFB" android:offset="1"/>
+            <gradient
+                android:endX="17.941"
+                android:endY="40.401"
+                android:startX="11.905"
+                android:startY="1.952"
+                android:type="linear">
+                <item
+                    android:color="#FF3DBFFC"
+                    android:offset="0" />
+                <item
+                    android:color="#FF183EFB"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
     <path android:pathData="M32.682,27.904L20,35.5v0l-2.428,1.457c-3.191,1.915 -7.203,-0.209 -7.54,-3.804C10.372,38.922 15.145,43.5 21,43.5c1.963,0 3.888,-0.536 5.568,-1.551l6.834,-4.126c0.817,-0.493 1.522,-1.075 2.15,-1.707C37.906,33.415 36.739,28.669 32.682,27.904z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="34.121" android:endY="25.575"
-                android:startX="14.342" android:startY="41.478" android:type="linear">
-                <item android:color="#FF33BEF0" android:offset="0"/>
-                <item android:color="#FF32B9F0" android:offset="0.159"/>
-                <item android:color="#FF2FACF2" android:offset="0.341"/>
-                <item android:color="#FF2A95F4" android:offset="0.533"/>
-                <item android:color="#FF2475F6" android:offset="0.733"/>
-                <item android:color="#FF1B4CFA" android:offset="0.936"/>
-                <item android:color="#FF183EFB" android:offset="1"/>
+            <gradient
+                android:endX="34.121"
+                android:endY="25.575"
+                android:startX="14.342"
+                android:startY="41.478"
+                android:type="linear">
+                <item
+                    android:color="#FF33BEF0"
+                    android:offset="0" />
+                <item
+                    android:color="#FF32B9F0"
+                    android:offset="0.159" />
+                <item
+                    android:color="#FF2FACF2"
+                    android:offset="0.341" />
+                <item
+                    android:color="#FF2A95F4"
+                    android:offset="0.533" />
+                <item
+                    android:color="#FF2475F6"
+                    android:offset="0.733" />
+                <item
+                    android:color="#FF1B4CFA"
+                    android:offset="0.936" />
+                <item
+                    android:color="#FF183EFB"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
     <path android:pathData="M33.636,19.568l-7.607,-3.803c-1.234,-0.617 -2.576,0.618 -2.064,1.899l1.755,5.886c0.499,1.248 1.479,2.242 2.719,2.758L32.5,28c4.057,0.766 5.352,5.251 3.052,8.117C40.399,31.24 40.088,22.794 33.636,19.568z">
         <aapt:attr name="android:fillColor">
-            <gradient android:endX="45.699" android:endY="38.588"
-                android:startX="24.223" android:startY="17.113" android:type="linear">
-                <item android:color="#FF3DBFFD" android:offset="0"/>
-                <item android:color="#FF1DE9B6" android:offset="1"/>
+            <gradient
+                android:endX="45.699"
+                android:endY="38.588"
+                android:startX="24.223"
+                android:startY="17.113"
+                android:type="linear">
+                <item
+                    android:color="#FF3DBFFD"
+                    android:offset="0" />
+                <item
+                    android:color="#FF1DE9B6"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/lawnchair/res/drawable/ic_brave.xml b/lawnchair/res/drawable/ic_brave.xml
index 366c23f296..77157833cc 100644
--- a/lawnchair/res/drawable/ic_brave.xml
+++ b/lawnchair/res/drawable/ic_brave.xml
@@ -4,46 +4,58 @@
     android:height="24dp"
     android:viewportWidth="218"
     android:viewportHeight="256">
-  <path
-      android:pathData="M210.1,61.28L216.08,46.58C216.08,46.58 208.47,38.41 199.22,29.15C189.97,19.89 170.39,25.34 170.39,25.34L148.08,0L108.91,0L69.75,0L47.44,25.34C47.44,25.34 27.86,19.89 18.61,29.15C9.36,38.41 1.75,46.58 1.75,46.58L7.73,61.28L0.11,83.07C0.11,83.07 22.51,168.02 25.14,178.39C30.31,198.82 33.84,206.71 48.53,217.06C63.22,227.41 89.87,245.39 94.23,248.11C98.58,250.83 104.02,255.47 108.91,255.47C113.81,255.47 119.25,250.83 123.6,248.11C127.95,245.39 154.61,227.41 169.3,217.06C183.99,206.71 187.52,198.82 192.69,178.39C195.31,168.02 217.71,83.07 217.71,83.07L210.1,61.28Z"
-      android:strokeWidth="1"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startX="0.11"
-          android:startY="129.54"
-          android:endX="217.71"
-          android:endY="129.54"
-          android:type="linear">
-        <item android:offset="0" android:color="#FFFF5500"/>
-        <item android:offset="0.41" android:color="#FFFF5500"/>
-        <item android:offset="0.58" android:color="#FFFF2000"/>
-        <item android:offset="1" android:color="#FFFF2000"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M164.13,41.4C164.13,41.4 192.82,76.13 192.82,83.55C192.82,90.97 189.21,92.93 185.58,96.79C181.95,100.64 166.11,117.49 164.07,119.66C162.04,121.82 157.8,125.1 160.29,131.01C162.78,136.91 166.46,144.43 162.37,152.05C158.28,159.67 151.28,164.75 146.79,163.91C142.3,163.07 131.76,157.56 127.89,155.04C124.01,152.52 111.73,142.37 111.73,138.49C111.73,134.61 124.42,127.64 126.77,126.06C129.12,124.48 139.82,118.35 140.04,115.94C140.26,113.54 140.17,112.83 137.01,106.89C133.86,100.95 128.17,93.01 129.12,87.74C130.06,82.46 139.23,79.72 145.78,77.24C152.32,74.77 164.93,70.09 166.5,69.37C168.07,68.64 167.67,67.95 162.9,67.49C158.13,67.04 144.6,65.24 138.5,66.94C132.4,68.65 121.97,71.24 121.13,72.61C120.28,73.99 119.54,74.03 120.41,78.77C121.27,83.51 125.74,106.25 126.17,110.29C126.6,114.32 127.45,116.99 123.1,117.99C118.75,118.99 111.43,120.72 108.91,120.72C106.4,120.72 99.08,118.99 94.73,117.99C90.38,116.99 91.22,114.32 91.66,110.29C92.09,106.25 96.56,83.51 97.42,78.77C98.29,74.03 97.54,73.99 96.7,72.61C95.86,71.24 85.43,68.65 79.33,66.94C73.23,65.24 59.7,67.04 54.93,67.49C50.16,67.95 49.75,68.64 51.33,69.37C52.9,70.09 65.5,74.77 72.05,77.24C78.59,79.72 87.77,82.46 88.71,87.74C89.66,93.01 83.97,100.95 80.81,106.89C77.66,112.83 77.57,113.54 77.79,115.94C78.01,118.35 88.71,124.48 91.06,126.06C93.4,127.64 106.1,134.61 106.1,138.49C106.1,142.37 93.82,152.52 89.94,155.04C86.07,157.56 75.53,163.07 71.04,163.91C66.55,164.75 59.55,159.67 55.46,152.05C51.37,144.43 55.05,136.91 57.54,131.01C60.03,125.1 55.79,121.82 53.76,119.66C51.72,117.49 35.88,100.64 32.25,96.79C28.62,92.93 25.01,90.97 25.01,83.55C25.01,76.13 53.7,41.4 53.7,41.4C53.7,41.4 77.91,46.03 81.17,46.03C84.43,46.03 91.51,43.31 98.03,41.13C104.56,38.95 108.91,38.94 108.91,38.94C108.91,38.94 113.27,38.95 119.79,41.13C126.32,43.31 133.39,46.03 136.66,46.03C139.92,46.03 164.13,41.4 164.13,41.4ZM142.62,174.23C144.4,175.34 143.32,177.44 141.7,178.58C140.08,179.73 118.34,196.58 116.23,198.45C114.12,200.31 111.02,203.39 108.91,203.39C106.81,203.39 103.71,200.31 101.6,198.45C99.49,196.58 77.75,179.73 76.13,178.58C74.51,177.44 73.43,175.34 75.2,174.23C76.98,173.12 82.54,170.31 90.2,166.33C97.87,162.36 107.42,158.99 108.91,158.99C110.41,158.99 119.96,162.36 127.63,166.33C135.29,170.31 140.85,173.12 142.62,174.23Z"
-      android:strokeWidth="1"
-      android:fillColor="#FFFFFF"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M170.38,25.34L148.08,0L108.91,0L69.74,0L47.44,25.34C47.44,25.34 27.85,19.89 18.61,29.15C18.61,29.15 44.72,26.79 53.69,41.4C53.69,41.4 77.9,46.03 81.17,46.03C84.43,46.03 91.5,43.31 98.03,41.13C104.56,38.95 108.91,38.94 108.91,38.94C108.91,38.94 113.26,38.95 119.79,41.13C126.32,43.31 133.39,46.03 136.65,46.03C139.92,46.03 164.13,41.4 164.13,41.4C173.1,26.79 199.21,29.15 199.21,29.15C189.97,19.89 170.38,25.34 170.38,25.34"
-      android:strokeWidth="1"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startX="22.49"
-          android:startY="23.34"
-          android:endX="199.21"
-          android:endY="23.34"
-          android:type="linear">
-        <item android:offset="0" android:color="#FFFF452A"/>
-        <item android:offset="1" android:color="#FFFF2000"/>
-      </gradient>
-    </aapt:attr>
-  </path>
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M210.1,61.28L216.08,46.58C216.08,46.58 208.47,38.41 199.22,29.15C189.97,19.89 170.39,25.34 170.39,25.34L148.08,0L108.91,0L69.75,0L47.44,25.34C47.44,25.34 27.86,19.89 18.61,29.15C9.36,38.41 1.75,46.58 1.75,46.58L7.73,61.28L0.11,83.07C0.11,83.07 22.51,168.02 25.14,178.39C30.31,198.82 33.84,206.71 48.53,217.06C63.22,227.41 89.87,245.39 94.23,248.11C98.58,250.83 104.02,255.47 108.91,255.47C113.81,255.47 119.25,250.83 123.6,248.11C127.95,245.39 154.61,227.41 169.3,217.06C183.99,206.71 187.52,198.82 192.69,178.39C195.31,168.02 217.71,83.07 217.71,83.07L210.1,61.28Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="217.71"
+                android:endY="129.54"
+                android:startX="0.11"
+                android:startY="129.54"
+                android:type="linear">
+                <item
+                    android:color="#FFFF5500"
+                    android:offset="0" />
+                <item
+                    android:color="#FFFF5500"
+                    android:offset="0.41" />
+                <item
+                    android:color="#FFFF2000"
+                    android:offset="0.58" />
+                <item
+                    android:color="#FFFF2000"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M164.13,41.4C164.13,41.4 192.82,76.13 192.82,83.55C192.82,90.97 189.21,92.93 185.58,96.79C181.95,100.64 166.11,117.49 164.07,119.66C162.04,121.82 157.8,125.1 160.29,131.01C162.78,136.91 166.46,144.43 162.37,152.05C158.28,159.67 151.28,164.75 146.79,163.91C142.3,163.07 131.76,157.56 127.89,155.04C124.01,152.52 111.73,142.37 111.73,138.49C111.73,134.61 124.42,127.64 126.77,126.06C129.12,124.48 139.82,118.35 140.04,115.94C140.26,113.54 140.17,112.83 137.01,106.89C133.86,100.95 128.17,93.01 129.12,87.74C130.06,82.46 139.23,79.72 145.78,77.24C152.32,74.77 164.93,70.09 166.5,69.37C168.07,68.64 167.67,67.95 162.9,67.49C158.13,67.04 144.6,65.24 138.5,66.94C132.4,68.65 121.97,71.24 121.13,72.61C120.28,73.99 119.54,74.03 120.41,78.77C121.27,83.51 125.74,106.25 126.17,110.29C126.6,114.32 127.45,116.99 123.1,117.99C118.75,118.99 111.43,120.72 108.91,120.72C106.4,120.72 99.08,118.99 94.73,117.99C90.38,116.99 91.22,114.32 91.66,110.29C92.09,106.25 96.56,83.51 97.42,78.77C98.29,74.03 97.54,73.99 96.7,72.61C95.86,71.24 85.43,68.65 79.33,66.94C73.23,65.24 59.7,67.04 54.93,67.49C50.16,67.95 49.75,68.64 51.33,69.37C52.9,70.09 65.5,74.77 72.05,77.24C78.59,79.72 87.77,82.46 88.71,87.74C89.66,93.01 83.97,100.95 80.81,106.89C77.66,112.83 77.57,113.54 77.79,115.94C78.01,118.35 88.71,124.48 91.06,126.06C93.4,127.64 106.1,134.61 106.1,138.49C106.1,142.37 93.82,152.52 89.94,155.04C86.07,157.56 75.53,163.07 71.04,163.91C66.55,164.75 59.55,159.67 55.46,152.05C51.37,144.43 55.05,136.91 57.54,131.01C60.03,125.1 55.79,121.82 53.76,119.66C51.72,117.49 35.88,100.64 32.25,96.79C28.62,92.93 25.01,90.97 25.01,83.55C25.01,76.13 53.7,41.4 53.7,41.4C53.7,41.4 77.91,46.03 81.17,46.03C84.43,46.03 91.51,43.31 98.03,41.13C104.56,38.95 108.91,38.94 108.91,38.94C108.91,38.94 113.27,38.95 119.79,41.13C126.32,43.31 133.39,46.03 136.66,46.03C139.92,46.03 164.13,41.4 164.13,41.4ZM142.62,174.23C144.4,175.34 143.32,177.44 141.7,178.58C140.08,179.73 118.34,196.58 116.23,198.45C114.12,200.31 111.02,203.39 108.91,203.39C106.81,203.39 103.71,200.31 101.6,198.45C99.49,196.58 77.75,179.73 76.13,178.58C74.51,177.44 73.43,175.34 75.2,174.23C76.98,173.12 82.54,170.31 90.2,166.33C97.87,162.36 107.42,158.99 108.91,158.99C110.41,158.99 119.96,162.36 127.63,166.33C135.29,170.31 140.85,173.12 142.62,174.23Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M170.38,25.34L148.08,0L108.91,0L69.74,0L47.44,25.34C47.44,25.34 27.85,19.89 18.61,29.15C18.61,29.15 44.72,26.79 53.69,41.4C53.69,41.4 77.9,46.03 81.17,46.03C84.43,46.03 91.5,43.31 98.03,41.13C104.56,38.95 108.91,38.94 108.91,38.94C108.91,38.94 113.26,38.95 119.79,41.13C126.32,43.31 133.39,46.03 136.65,46.03C139.92,46.03 164.13,41.4 164.13,41.4C173.1,26.79 199.21,29.15 199.21,29.15C189.97,19.89 170.38,25.34 170.38,25.34"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="199.21"
+                android:endY="23.34"
+                android:startX="22.49"
+                android:startY="23.34"
+                android:type="linear">
+                <item
+                    android:color="#FFFF452A"
+                    android:offset="0" />
+                <item
+                    android:color="#FFFF2000"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/lawnchair/res/drawable/ic_brave_tinted.xml b/lawnchair/res/drawable/ic_brave_tinted.xml
index 36ef58163e..0eaf642696 100644
--- a/lawnchair/res/drawable/ic_brave_tinted.xml
+++ b/lawnchair/res/drawable/ic_brave_tinted.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="84"
     android:viewportHeight="98">
-  <path
-      android:pathData="M81.029,24.739L83.562,32.004C83.694,32.383 83.71,32.792 83.608,33.18C83.59,33.248 83.59,33.248 83.505,33.574C83.388,34.02 83.388,34.02 83.212,34.689C82.896,35.89 82.544,37.228 82.165,38.669C81.083,42.787 80.001,46.909 78.991,50.759C76.497,60.264 74.863,66.523 74.469,68.082C72.326,76.572 70.627,79.519 65.132,83.4C60.318,86.801 50.274,93.624 48.342,94.835C48.158,94.951 47.954,95.086 47.683,95.27C47.578,95.341 47.068,95.691 46.921,95.791C45.983,96.428 45.313,96.836 44.591,97.173C43.676,97.601 42.8,97.839 41.911,97.839C41.023,97.839 40.147,97.601 39.232,97.173C38.51,96.836 37.84,96.428 36.901,95.791C36.755,95.691 36.245,95.341 36.14,95.27C35.869,95.086 35.665,94.951 35.481,94.835C33.549,93.624 23.504,86.801 18.691,83.4C13.196,79.519 11.496,76.572 9.354,68.082C8.96,66.523 7.325,60.264 4.85,50.829C3.822,46.909 2.74,42.788 1.657,38.669C1.279,37.228 0.927,35.89 0.611,34.689C0.435,34.02 0.435,34.02 0.318,33.574C0.232,33.248 0.232,33.248 0.214,33.18C0.112,32.792 0.128,32.383 0.26,32.004L2.793,24.739L0.892,20.055C0.598,19.33 0.75,18.5 1.283,17.927C1.517,17.676 1.639,17.546 1.778,17.398C2.173,16.978 2.622,16.504 3.114,15.988C4.521,14.512 6.004,12.987 7.493,11.492C8.92,10.06 10.839,9.288 13.082,9.025C14.838,8.818 16.667,8.932 18.441,9.244C18.539,9.261 18.634,9.278 18.726,9.296L26.094,0.905C26.474,0.471 27.022,0.223 27.598,0.223L56.225,0.223C56.8,0.223 57.349,0.471 57.729,0.905L65.097,9.296C65.188,9.278 65.283,9.261 65.381,9.244C67.156,8.932 68.985,8.818 70.741,9.025C72.984,9.288 74.903,10.06 76.329,11.492C77.819,12.987 79.301,14.512 80.709,15.988C81.201,16.504 81.649,16.978 82.045,17.398C82.183,17.546 82.306,17.676 82.41,17.788C83.072,18.5 83.225,19.33 82.931,20.055L81.029,24.739ZM76.995,25.349C76.834,24.887 76.846,24.381 77.03,23.928L78.732,19.736C78.447,19.434 78.139,19.11 77.811,18.766C76.423,17.31 74.96,15.805 73.493,14.332C72.786,13.623 71.694,13.184 70.274,13.017C68.958,12.862 67.497,12.953 66.073,13.203C65.748,13.26 65.453,13.321 65.194,13.381C65.047,13.416 64.951,13.44 64.912,13.451C64.172,13.658 63.378,13.421 62.87,12.843L55.319,4.243L28.504,4.243L20.952,12.843C20.444,13.421 19.651,13.658 18.911,13.451C18.872,13.44 18.776,13.416 18.628,13.381C18.37,13.321 18.075,13.26 17.749,13.203C16.326,12.953 14.865,12.862 13.549,13.017C12.129,13.184 11.037,13.623 10.33,14.332C8.863,15.805 7.4,17.31 6.012,18.766C5.684,19.11 5.376,19.434 5.091,19.736L6.793,23.928C6.977,24.381 6.989,24.887 6.828,25.349L4.248,32.75C4.318,33.016 4.343,33.113 4.488,33.664C4.804,34.865 5.155,36.204 5.534,37.645C6.617,41.764 7.699,45.886 8.709,49.737C11.209,59.266 12.842,65.518 13.241,67.096C15.168,74.734 16.395,76.862 21,80.114C25.759,83.476 35.751,90.263 37.607,91.428C37.841,91.575 38.082,91.734 38.39,91.943C38.504,92.021 39.013,92.37 39.149,92.462C39.924,92.988 40.444,93.305 40.924,93.53C41.352,93.729 41.683,93.819 41.911,93.819C42.14,93.819 42.471,93.729 42.898,93.53C43.379,93.305 43.898,92.988 44.673,92.462C44.81,92.37 45.319,92.021 45.433,91.943C45.74,91.734 45.982,91.575 46.215,91.428C48.072,90.263 58.064,83.476 62.823,80.114C67.427,76.862 68.655,74.734 70.582,67.096C70.98,65.518 72.614,59.266 75.095,49.806C76.124,45.886 77.206,41.764 78.288,37.645C78.667,36.203 79.019,34.865 79.335,33.664C79.48,33.113 79.505,33.016 79.575,32.75L76.995,25.349ZM62.089,17.402C62.089,17.402 72.572,30.123 72.572,32.842C72.572,35.561 71.254,36.279 69.928,37.692C68.602,39.105 62.811,45.278 62.067,46.071C61.323,46.864 59.775,48.066 60.686,50.229C61.597,52.392 62.94,55.145 61.446,57.937C59.952,60.73 57.392,62.593 55.752,62.285C54.112,61.977 50.261,59.956 48.844,59.033C47.428,58.11 42.939,54.394 42.939,52.972C42.939,51.55 47.579,48.997 48.436,48.417C49.294,47.837 53.204,45.592 53.284,44.711C53.364,43.829 53.334,43.571 52.18,41.393C51.026,39.216 48.948,36.31 49.294,34.376C49.639,32.443 52.991,31.438 55.383,30.531C57.775,29.624 62.38,27.912 62.955,27.646C63.53,27.379 63.381,27.126 61.639,26.96C59.896,26.794 54.951,26.135 52.722,26.759C50.492,27.383 46.683,28.332 46.375,28.835C46.066,29.338 45.794,29.355 46.111,31.091C46.428,32.828 48.059,41.158 48.217,42.638C48.376,44.117 48.685,45.096 47.096,45.46C45.506,45.825 42.831,46.459 41.911,46.459C40.992,46.459 38.316,45.825 36.727,45.46C35.137,45.096 35.447,44.117 35.605,42.638C35.764,41.158 37.395,32.828 37.712,31.091C38.029,29.355 37.756,29.338 37.448,28.835C37.14,28.332 33.33,27.383 31.101,26.759C28.872,26.135 23.927,26.794 22.184,26.96C20.441,27.126 20.293,27.379 20.868,27.646C21.443,27.912 26.048,29.624 28.44,30.531C30.831,31.438 34.183,32.443 34.529,34.376C34.875,36.31 32.797,39.216 31.643,41.393C30.489,43.571 30.458,43.829 30.538,44.711C30.618,45.592 34.529,47.837 35.386,48.417C36.244,48.997 40.884,51.55 40.884,52.972C40.884,54.394 36.395,58.11 34.978,59.033C33.562,59.956 29.71,61.977 28.07,62.285C26.43,62.593 23.871,60.73 22.377,57.937C20.883,55.145 22.226,52.392 23.137,50.229C24.047,48.066 22.499,46.864 21.756,46.071C21.012,45.278 15.221,39.105 13.895,37.692C12.569,36.279 11.25,35.561 11.25,32.842C11.25,30.123 21.734,17.402 21.734,17.402C21.734,17.402 30.58,19.098 31.773,19.098C32.966,19.098 35.55,18.1 37.936,17.302C40.321,16.504 41.911,16.498 41.911,16.498C41.911,16.498 43.502,16.504 45.887,17.302C48.273,18.1 50.857,19.098 52.05,19.098C53.243,19.098 62.089,17.402 62.089,17.402ZM54.23,66.064C54.879,66.472 54.483,67.241 53.892,67.66C53.301,68.079 45.357,74.254 44.586,74.937C43.815,75.62 42.682,76.747 41.911,76.747C41.141,76.747 40.008,75.62 39.237,74.937C38.466,74.254 30.522,68.079 29.931,67.66C29.34,67.241 28.944,66.472 29.593,66.064C30.242,65.656 32.272,64.627 35.074,63.172C37.875,61.717 41.366,60.479 41.911,60.479C42.456,60.479 45.947,61.717 48.749,63.172C51.55,64.627 53.581,65.656 54.23,66.064Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M81.029,24.739L83.562,32.004C83.694,32.383 83.71,32.792 83.608,33.18C83.59,33.248 83.59,33.248 83.505,33.574C83.388,34.02 83.388,34.02 83.212,34.689C82.896,35.89 82.544,37.228 82.165,38.669C81.083,42.787 80.001,46.909 78.991,50.759C76.497,60.264 74.863,66.523 74.469,68.082C72.326,76.572 70.627,79.519 65.132,83.4C60.318,86.801 50.274,93.624 48.342,94.835C48.158,94.951 47.954,95.086 47.683,95.27C47.578,95.341 47.068,95.691 46.921,95.791C45.983,96.428 45.313,96.836 44.591,97.173C43.676,97.601 42.8,97.839 41.911,97.839C41.023,97.839 40.147,97.601 39.232,97.173C38.51,96.836 37.84,96.428 36.901,95.791C36.755,95.691 36.245,95.341 36.14,95.27C35.869,95.086 35.665,94.951 35.481,94.835C33.549,93.624 23.504,86.801 18.691,83.4C13.196,79.519 11.496,76.572 9.354,68.082C8.96,66.523 7.325,60.264 4.85,50.829C3.822,46.909 2.74,42.788 1.657,38.669C1.279,37.228 0.927,35.89 0.611,34.689C0.435,34.02 0.435,34.02 0.318,33.574C0.232,33.248 0.232,33.248 0.214,33.18C0.112,32.792 0.128,32.383 0.26,32.004L2.793,24.739L0.892,20.055C0.598,19.33 0.75,18.5 1.283,17.927C1.517,17.676 1.639,17.546 1.778,17.398C2.173,16.978 2.622,16.504 3.114,15.988C4.521,14.512 6.004,12.987 7.493,11.492C8.92,10.06 10.839,9.288 13.082,9.025C14.838,8.818 16.667,8.932 18.441,9.244C18.539,9.261 18.634,9.278 18.726,9.296L26.094,0.905C26.474,0.471 27.022,0.223 27.598,0.223L56.225,0.223C56.8,0.223 57.349,0.471 57.729,0.905L65.097,9.296C65.188,9.278 65.283,9.261 65.381,9.244C67.156,8.932 68.985,8.818 70.741,9.025C72.984,9.288 74.903,10.06 76.329,11.492C77.819,12.987 79.301,14.512 80.709,15.988C81.201,16.504 81.649,16.978 82.045,17.398C82.183,17.546 82.306,17.676 82.41,17.788C83.072,18.5 83.225,19.33 82.931,20.055L81.029,24.739ZM76.995,25.349C76.834,24.887 76.846,24.381 77.03,23.928L78.732,19.736C78.447,19.434 78.139,19.11 77.811,18.766C76.423,17.31 74.96,15.805 73.493,14.332C72.786,13.623 71.694,13.184 70.274,13.017C68.958,12.862 67.497,12.953 66.073,13.203C65.748,13.26 65.453,13.321 65.194,13.381C65.047,13.416 64.951,13.44 64.912,13.451C64.172,13.658 63.378,13.421 62.87,12.843L55.319,4.243L28.504,4.243L20.952,12.843C20.444,13.421 19.651,13.658 18.911,13.451C18.872,13.44 18.776,13.416 18.628,13.381C18.37,13.321 18.075,13.26 17.749,13.203C16.326,12.953 14.865,12.862 13.549,13.017C12.129,13.184 11.037,13.623 10.33,14.332C8.863,15.805 7.4,17.31 6.012,18.766C5.684,19.11 5.376,19.434 5.091,19.736L6.793,23.928C6.977,24.381 6.989,24.887 6.828,25.349L4.248,32.75C4.318,33.016 4.343,33.113 4.488,33.664C4.804,34.865 5.155,36.204 5.534,37.645C6.617,41.764 7.699,45.886 8.709,49.737C11.209,59.266 12.842,65.518 13.241,67.096C15.168,74.734 16.395,76.862 21,80.114C25.759,83.476 35.751,90.263 37.607,91.428C37.841,91.575 38.082,91.734 38.39,91.943C38.504,92.021 39.013,92.37 39.149,92.462C39.924,92.988 40.444,93.305 40.924,93.53C41.352,93.729 41.683,93.819 41.911,93.819C42.14,93.819 42.471,93.729 42.898,93.53C43.379,93.305 43.898,92.988 44.673,92.462C44.81,92.37 45.319,92.021 45.433,91.943C45.74,91.734 45.982,91.575 46.215,91.428C48.072,90.263 58.064,83.476 62.823,80.114C67.427,76.862 68.655,74.734 70.582,67.096C70.98,65.518 72.614,59.266 75.095,49.806C76.124,45.886 77.206,41.764 78.288,37.645C78.667,36.203 79.019,34.865 79.335,33.664C79.48,33.113 79.505,33.016 79.575,32.75L76.995,25.349ZM62.089,17.402C62.089,17.402 72.572,30.123 72.572,32.842C72.572,35.561 71.254,36.279 69.928,37.692C68.602,39.105 62.811,45.278 62.067,46.071C61.323,46.864 59.775,48.066 60.686,50.229C61.597,52.392 62.94,55.145 61.446,57.937C59.952,60.73 57.392,62.593 55.752,62.285C54.112,61.977 50.261,59.956 48.844,59.033C47.428,58.11 42.939,54.394 42.939,52.972C42.939,51.55 47.579,48.997 48.436,48.417C49.294,47.837 53.204,45.592 53.284,44.711C53.364,43.829 53.334,43.571 52.18,41.393C51.026,39.216 48.948,36.31 49.294,34.376C49.639,32.443 52.991,31.438 55.383,30.531C57.775,29.624 62.38,27.912 62.955,27.646C63.53,27.379 63.381,27.126 61.639,26.96C59.896,26.794 54.951,26.135 52.722,26.759C50.492,27.383 46.683,28.332 46.375,28.835C46.066,29.338 45.794,29.355 46.111,31.091C46.428,32.828 48.059,41.158 48.217,42.638C48.376,44.117 48.685,45.096 47.096,45.46C45.506,45.825 42.831,46.459 41.911,46.459C40.992,46.459 38.316,45.825 36.727,45.46C35.137,45.096 35.447,44.117 35.605,42.638C35.764,41.158 37.395,32.828 37.712,31.091C38.029,29.355 37.756,29.338 37.448,28.835C37.14,28.332 33.33,27.383 31.101,26.759C28.872,26.135 23.927,26.794 22.184,26.96C20.441,27.126 20.293,27.379 20.868,27.646C21.443,27.912 26.048,29.624 28.44,30.531C30.831,31.438 34.183,32.443 34.529,34.376C34.875,36.31 32.797,39.216 31.643,41.393C30.489,43.571 30.458,43.829 30.538,44.711C30.618,45.592 34.529,47.837 35.386,48.417C36.244,48.997 40.884,51.55 40.884,52.972C40.884,54.394 36.395,58.11 34.978,59.033C33.562,59.956 29.71,61.977 28.07,62.285C26.43,62.593 23.871,60.73 22.377,57.937C20.883,55.145 22.226,52.392 23.137,50.229C24.047,48.066 22.499,46.864 21.756,46.071C21.012,45.278 15.221,39.105 13.895,37.692C12.569,36.279 11.25,35.561 11.25,32.842C11.25,30.123 21.734,17.402 21.734,17.402C21.734,17.402 30.58,19.098 31.773,19.098C32.966,19.098 35.55,18.1 37.936,17.302C40.321,16.504 41.911,16.498 41.911,16.498C41.911,16.498 43.502,16.504 45.887,17.302C48.273,18.1 50.857,19.098 52.05,19.098C53.243,19.098 62.089,17.402 62.089,17.402ZM54.23,66.064C54.879,66.472 54.483,67.241 53.892,67.66C53.301,68.079 45.357,74.254 44.586,74.937C43.815,75.62 42.682,76.747 41.911,76.747C41.141,76.747 40.008,75.62 39.237,74.937C38.466,74.254 30.522,68.079 29.931,67.66C29.34,67.241 28.944,66.472 29.593,66.064C30.242,65.656 32.272,64.627 35.074,63.172C37.875,61.717 41.366,60.479 41.911,60.479C42.456,60.479 45.947,61.717 48.749,63.172C51.55,64.627 53.581,65.656 54.23,66.064Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_bug_notification.xml b/lawnchair/res/drawable/ic_bug_notification.xml
index aadcec8ede..1ee4366573 100644
--- a/lawnchair/res/drawable/ic_bug_notification.xml
+++ b/lawnchair/res/drawable/ic_bug_notification.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~     This file is part of Lawnchair Launcher.
   ~
   ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
@@ -17,9 +16,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z" />
+    <path
+        android:fillColor="#000"
+        android:pathData="M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_charging.xml b/lawnchair/res/drawable/ic_charging.xml
index 4a0dc8b97c..9cad440e49 100644
--- a/lawnchair/res/drawable/ic_charging.xml
+++ b/lawnchair/res/drawable/ic_charging.xml
@@ -1,5 +1,4 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:name="vector"
     android:width="24dp"
     android:height="24dp"
@@ -7,6 +6,6 @@
     android:viewportHeight="24">
     <path
         android:name="path"
-        android:pathData="M10.75 23.625V14H7.25L14.25 0.875V10.5H17.75L10.75 23.625Z"
-        android:fillColor="#000" />
+        android:fillColor="#000"
+        android:pathData="M10.75 23.625V14H7.25L14.25 0.875V10.5H17.75L10.75 23.625Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_close.xml b/lawnchair/res/drawable/ic_close.xml
index b1f8850dfb..f1ae878d18 100644
--- a/lawnchair/res/drawable/ic_close.xml
+++ b/lawnchair/res/drawable/ic_close.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?android:attr/textColorPrimary"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/textColorPrimary">
+    android:viewportHeight="24.0">
 
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
-</vector>
\ No newline at end of file
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z" />
+</vector>
diff --git a/lawnchair/res/drawable/ic_copy.xml b/lawnchair/res/drawable/ic_copy.xml
index 09b81dfe5c..2d555f43fa 100644
--- a/lawnchair/res/drawable/ic_copy.xml
+++ b/lawnchair/res/drawable/ic_copy.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~     This file is part of Lawnchair Launcher.
   ~
   ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
@@ -17,9 +16,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="?android:textColorSecondary" android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_discord.xml b/lawnchair/res/drawable/ic_discord.xml
index 34f495b538..beb379db9d 100644
--- a/lawnchair/res/drawable/ic_discord.xml
+++ b/lawnchair/res/drawable/ic_discord.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M19.6239,5.39C18.2217,4.7467 16.7181,4.2726 15.1459,4.0011C15.1173,3.9959 15.0887,4.009 15.0739,4.0352C14.8805,4.3791 14.6663,4.8278 14.5163,5.1805C12.8254,4.9274 11.1431,4.9274 9.4868,5.1805C9.3368,4.82 9.1148,4.3791 8.9205,4.0352C8.9058,4.0099 8.8772,3.9968 8.8485,4.0011C7.2772,4.2718 5.7736,4.7458 4.3705,5.39C4.3584,5.3953 4.348,5.404 4.3411,5.4154C1.4889,9.6764 0.7076,13.8326 1.0909,17.9374C1.0927,17.9574 1.1039,17.9766 1.1195,17.9889C3.0013,19.3708 4.8241,20.2097 6.613,20.7658C6.6416,20.7745 6.672,20.764 6.6902,20.7405C7.1134,20.1626 7.4906,19.5532 7.814,18.9125C7.8331,18.8749 7.8149,18.8304 7.7759,18.8156C7.1775,18.5886 6.6078,18.3119 6.0598,17.9976C6.0164,17.9723 6.0129,17.9103 6.0528,17.8806C6.1681,17.7942 6.2835,17.7043 6.3936,17.6135C6.4135,17.5969 6.4413,17.5934 6.4647,17.6039C10.0652,19.2477 13.9631,19.2477 17.521,17.6039C17.5445,17.5925 17.5722,17.596 17.593,17.6126C17.7032,17.7034 17.8185,17.7942 17.9347,17.8806C17.9746,17.9103 17.972,17.9723 17.9286,17.9976C17.3806,18.318 16.8108,18.5886 16.2116,18.8147C16.1726,18.8295 16.1553,18.8749 16.1744,18.9125C16.5047,19.5523 16.882,20.1617 17.2973,20.7396C17.3147,20.764 17.3459,20.7745 17.3745,20.7658C19.1721,20.2097 20.9949,19.3708 22.8766,17.9889C22.8931,17.9766 22.9035,17.9583 22.9053,17.9382C23.364,13.1927 22.1369,9.0705 19.6525,5.4162C19.6465,5.404 19.6361,5.3953 19.6239,5.39ZM8.3517,15.438C7.2677,15.438 6.3745,14.4428 6.3745,13.2207C6.3745,11.9985 7.2504,11.0033 8.3517,11.0033C9.4616,11.0033 10.3462,12.0072 10.3288,13.2207C10.3288,14.4428 9.453,15.438 8.3517,15.438ZM15.6619,15.438C14.5779,15.438 13.6847,14.4428 13.6847,13.2207C13.6847,11.9985 14.5606,11.0033 15.6619,11.0033C16.7718,11.0033 17.6563,12.0072 17.639,13.2207C17.639,14.4428 16.7718,15.438 15.6619,15.438Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19.6239,5.39C18.2217,4.7467 16.7181,4.2726 15.1459,4.0011C15.1173,3.9959 15.0887,4.009 15.0739,4.0352C14.8805,4.3791 14.6663,4.8278 14.5163,5.1805C12.8254,4.9274 11.1431,4.9274 9.4868,5.1805C9.3368,4.82 9.1148,4.3791 8.9205,4.0352C8.9058,4.0099 8.8772,3.9968 8.8485,4.0011C7.2772,4.2718 5.7736,4.7458 4.3705,5.39C4.3584,5.3953 4.348,5.404 4.3411,5.4154C1.4889,9.6764 0.7076,13.8326 1.0909,17.9374C1.0927,17.9574 1.1039,17.9766 1.1195,17.9889C3.0013,19.3708 4.8241,20.2097 6.613,20.7658C6.6416,20.7745 6.672,20.764 6.6902,20.7405C7.1134,20.1626 7.4906,19.5532 7.814,18.9125C7.8331,18.8749 7.8149,18.8304 7.7759,18.8156C7.1775,18.5886 6.6078,18.3119 6.0598,17.9976C6.0164,17.9723 6.0129,17.9103 6.0528,17.8806C6.1681,17.7942 6.2835,17.7043 6.3936,17.6135C6.4135,17.5969 6.4413,17.5934 6.4647,17.6039C10.0652,19.2477 13.9631,19.2477 17.521,17.6039C17.5445,17.5925 17.5722,17.596 17.593,17.6126C17.7032,17.7034 17.8185,17.7942 17.9347,17.8806C17.9746,17.9103 17.972,17.9723 17.9286,17.9976C17.3806,18.318 16.8108,18.5886 16.2116,18.8147C16.1726,18.8295 16.1553,18.8749 16.1744,18.9125C16.5047,19.5523 16.882,20.1617 17.2973,20.7396C17.3147,20.764 17.3459,20.7745 17.3745,20.7658C19.1721,20.2097 20.9949,19.3708 22.8766,17.9889C22.8931,17.9766 22.9035,17.9583 22.9053,17.9382C23.364,13.1927 22.1369,9.0705 19.6525,5.4162C19.6465,5.404 19.6361,5.3953 19.6239,5.39ZM8.3517,15.438C7.2677,15.438 6.3745,14.4428 6.3745,13.2207C6.3745,11.9985 7.2504,11.0033 8.3517,11.0033C9.4616,11.0033 10.3462,12.0072 10.3288,13.2207C10.3288,14.4428 9.453,15.438 8.3517,15.438ZM15.6619,15.438C14.5779,15.438 13.6847,14.4428 13.6847,13.2207C13.6847,11.9985 14.5606,11.0033 15.6619,11.0033C16.7718,11.0033 17.6563,12.0072 17.639,13.2207C17.639,14.4428 16.7718,15.438 15.6619,15.438Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_dock.xml b/lawnchair/res/drawable/ic_dock.xml
index 410d47a2ad..ffae990f86 100644
--- a/lawnchair/res/drawable/ic_dock.xml
+++ b/lawnchair/res/drawable/ic_dock.xml
@@ -3,11 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0,0h24v24h-24z"/>
-    <path
-        android:pathData="M20.925,8.5467L15.2784,8.0567L13.0734,2.865C12.6767,1.92 11.3234,1.92 10.9267,2.865L8.7217,8.0683L3.0867,8.5467C2.06,8.6283 1.64,9.9117 2.4217,10.5883L6.7034,14.2983L5.42,19.805C5.1867,20.8083 6.2717,21.6017 7.1584,21.065L12,18.1483L16.8417,21.0767C17.7284,21.6133 18.8134,20.82 18.58,19.8167L17.2967,14.2983L21.5784,10.5883C22.36,9.9117 21.9517,8.6283 20.925,8.5467ZM12,15.9667L7.6134,18.615L8.78,13.6217L4.9067,10.2617L10.0167,9.8183L12,5.1167L13.995,9.83L19.105,10.2733L15.2317,13.6333L16.3984,18.6267L12,15.9667Z"
-        android:fillColor="#ffffff"/>
-  </group>
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M20.925,8.5467L15.2784,8.0567L13.0734,2.865C12.6767,1.92 11.3234,1.92 10.9267,2.865L8.7217,8.0683L3.0867,8.5467C2.06,8.6283 1.64,9.9117 2.4217,10.5883L6.7034,14.2983L5.42,19.805C5.1867,20.8083 6.2717,21.6017 7.1584,21.065L12,18.1483L16.8417,21.0767C17.7284,21.6133 18.8134,20.82 18.58,19.8167L17.2967,14.2983L21.5784,10.5883C22.36,9.9117 21.9517,8.6283 20.925,8.5467ZM12,15.9667L7.6134,18.615L8.78,13.6217L4.9067,10.2617L10.0167,9.8183L12,5.1167L13.995,9.83L19.105,10.2733L15.2317,13.6333L16.3984,18.6267L12,15.9667Z" />
+    </group>
 </vector>
diff --git a/lawnchair/res/drawable/ic_download.xml b/lawnchair/res/drawable/ic_download.xml
index 19eca78dfc..75d02c642d 100644
--- a/lawnchair/res/drawable/ic_download.xml
+++ b/lawnchair/res/drawable/ic_download.xml
@@ -1,5 +1,10 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="48" android:viewportWidth="48"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M24,31.75Q23.7,31.75 23.45,31.65Q23.2,31.55 22.95,31.3L15.4,23.75Q14.95,23.3 14.975,22.675Q15,22.05 15.45,21.6Q15.9,21.15 16.525,21.15Q17.15,21.15 17.6,21.6L22.5,26.55V9.5Q22.5,8.85 22.925,8.425Q23.35,8 24,8Q24.65,8 25.075,8.425Q25.5,8.85 25.5,9.5V26.55L30.45,21.6Q30.9,21.15 31.525,21.15Q32.15,21.15 32.6,21.6Q33.05,22.05 33.05,22.675Q33.05,23.3 32.6,23.75L25.05,31.3Q24.8,31.55 24.55,31.65Q24.3,31.75 24,31.75ZM11,40Q9.8,40 8.9,39.1Q8,38.2 8,37V31.35Q8,30.7 8.425,30.275Q8.85,29.85 9.5,29.85Q10.15,29.85 10.575,30.275Q11,30.7 11,31.35V37Q11,37 11,37Q11,37 11,37H37Q37,37 37,37Q37,37 37,37V31.35Q37,30.7 37.425,30.275Q37.85,29.85 38.5,29.85Q39.15,29.85 39.575,30.275Q40,30.7 40,31.35V37Q40,38.2 39.1,39.1Q38.2,40 37,40Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M24,31.75Q23.7,31.75 23.45,31.65Q23.2,31.55 22.95,31.3L15.4,23.75Q14.95,23.3 14.975,22.675Q15,22.05 15.45,21.6Q15.9,21.15 16.525,21.15Q17.15,21.15 17.6,21.6L22.5,26.55V9.5Q22.5,8.85 22.925,8.425Q23.35,8 24,8Q24.65,8 25.075,8.425Q25.5,8.85 25.5,9.5V26.55L30.45,21.6Q30.9,21.15 31.525,21.15Q32.15,21.15 32.6,21.6Q33.05,22.05 33.05,22.675Q33.05,23.3 32.6,23.75L25.05,31.3Q24.8,31.55 24.55,31.65Q24.3,31.75 24,31.75ZM11,40Q9.8,40 8.9,39.1Q8,38.2 8,37V31.35Q8,30.7 8.425,30.275Q8.85,29.85 9.5,29.85Q10.15,29.85 10.575,30.275Q11,30.7 11,31.35V37Q11,37 11,37Q11,37 11,37H37Q37,37 37,37Q37,37 37,37V31.35Q37,30.7 37.425,30.275Q37.85,29.85 38.5,29.85Q39.15,29.85 39.575,30.275Q40,30.7 40,31.35V37Q40,38.2 39.1,39.1Q38.2,40 37,40Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_duckduckgo.xml b/lawnchair/res/drawable/ic_duckduckgo.xml
index cfa6fc04ab..528c61fe2d 100644
--- a/lawnchair/res/drawable/ic_duckduckgo.xml
+++ b/lawnchair/res/drawable/ic_duckduckgo.xml
@@ -1,43 +1,43 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="24"
-  android:viewportHeight="24">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-      android:fillColor="#DE5833"
-      android:pathData="M12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z" />
+        android:fillColor="#DE5833"
+        android:pathData="M12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z" />
     <path
-      android:fillColor="#ffffff"
-      android:pathData="M22.16,7.7001C21.6,6.3801 20.8,5.2001 19.8,4.2001C18.78,3.1801 17.6,2.4001 16.3,1.8401C14.94,1.2601 13.5,0.9801 12,0.9801C10.5,0.9801 9.06,1.2801 7.7,1.8401C6.38,2.4001 5.2,3.2001 4.2,4.2001C3.18,5.2201 2.4,6.4001 1.84,7.7001C1.26,9.0601 0.98,10.5001 0.98,12.0001C0.98,13.4801 1.28,14.9401 1.84,16.3001C2.4,17.6201 3.2,18.8001 4.2,19.8001C5.22,20.8201 6.4,21.6001 7.7,22.1601C9.06,22.7401 10.5,23.0201 12,23.0201C13.5,23.0201 14.94,22.7201 16.3,22.1601C17.62,21.6001 18.8,20.8001 19.8,19.8001C20.82,18.7801 21.6,17.6001 22.16,16.3001C22.74,14.9401 23.02,13.5001 23.02,12.0001C23.02,10.5001 22.74,9.0601 22.16,7.7001ZM14.4,21.9001C13.76,20.8201 12.08,17.8001 12.08,15.5601C12.08,10.4001 15.54,14.8201 15.54,10.7001C15.54,9.7201 15.06,6.2801 12.06,5.5601C11.32,4.5801 9.58,3.6401 6.82,4.0201C6.82,4.0201 7.28,4.1601 7.8,4.4201C7.8,4.4201 6.8,4.5601 6.76,5.2401C6.76,5.2401 8.74,5.1401 9.86,5.5001C7.28,5.8401 5.94,7.1801 6.18,9.6601C6.52,13.1601 8,19.4001 8.52,21.5801C4.6,20.1601 1.78,16.4001 1.78,11.9801C1.78,6.3601 6.34,1.7801 11.98,1.7801C17.62,1.7801 22.18,6.3401 22.18,11.9801C22.18,16.8001 18.86,20.8201 14.4,21.9001Z" />
+        android:fillColor="#ffffff"
+        android:pathData="M22.16,7.7001C21.6,6.3801 20.8,5.2001 19.8,4.2001C18.78,3.1801 17.6,2.4001 16.3,1.8401C14.94,1.2601 13.5,0.9801 12,0.9801C10.5,0.9801 9.06,1.2801 7.7,1.8401C6.38,2.4001 5.2,3.2001 4.2,4.2001C3.18,5.2201 2.4,6.4001 1.84,7.7001C1.26,9.0601 0.98,10.5001 0.98,12.0001C0.98,13.4801 1.28,14.9401 1.84,16.3001C2.4,17.6201 3.2,18.8001 4.2,19.8001C5.22,20.8201 6.4,21.6001 7.7,22.1601C9.06,22.7401 10.5,23.0201 12,23.0201C13.5,23.0201 14.94,22.7201 16.3,22.1601C17.62,21.6001 18.8,20.8001 19.8,19.8001C20.82,18.7801 21.6,17.6001 22.16,16.3001C22.74,14.9401 23.02,13.5001 23.02,12.0001C23.02,10.5001 22.74,9.0601 22.16,7.7001ZM14.4,21.9001C13.76,20.8201 12.08,17.8001 12.08,15.5601C12.08,10.4001 15.54,14.8201 15.54,10.7001C15.54,9.7201 15.06,6.2801 12.06,5.5601C11.32,4.5801 9.58,3.6401 6.82,4.0201C6.82,4.0201 7.28,4.1601 7.8,4.4201C7.8,4.4201 6.8,4.5601 6.76,5.2401C6.76,5.2401 8.74,5.1401 9.86,5.5001C7.28,5.8401 5.94,7.1801 6.18,9.6601C6.52,13.1601 8,19.4001 8.52,21.5801C4.6,20.1601 1.78,16.4001 1.78,11.9801C1.78,6.3601 6.34,1.7801 11.98,1.7801C17.62,1.7801 22.18,6.3401 22.18,11.9801C22.18,16.8001 18.86,20.8201 14.4,21.9001Z" />
     <path
-      android:fillColor="#FED30A"
-      android:fillType="evenOdd"
-      android:pathData="M11.44,13.66C11.44,12.34 13.24,11.92 13.92,11.92C15.76,11.92 18.36,10.74 19,10.76C19.66,10.78 20.08,11.04 20.08,11.34C20.08,11.78 16.4,13.44 14.98,13.3C13.62,13.18 13.3,13.32 13.3,13.88C13.3,14.36 14.28,14.8 15.36,14.8C16.98,14.8 18.56,14.08 19.04,14.42C19.46,14.72 17.94,15.8 16.2,15.8C14.46,15.8 11.44,14.98 11.44,13.66Z" />
+        android:fillColor="#FED30A"
+        android:fillType="evenOdd"
+        android:pathData="M11.44,13.66C11.44,12.34 13.24,11.92 13.92,11.92C15.76,11.92 18.36,10.74 19,10.76C19.66,10.78 20.08,11.04 20.08,11.34C20.08,11.78 16.4,13.44 14.98,13.3C13.62,13.18 13.3,13.32 13.3,13.88C13.3,14.36 14.28,14.8 15.36,14.8C16.98,14.8 18.56,14.08 19.04,14.42C19.46,14.72 17.94,15.8 16.2,15.8C14.46,15.8 11.44,14.98 11.44,13.66Z" />
     <path
-      android:fillColor="#2D4F8D"
-      android:pathData="M14.64,8.0599C14.16,7.4399 13.3,7.4199 13,8.1399C13.46,7.7799 14.02,7.6999 14.64,8.0599Z" />
+        android:fillColor="#2D4F8D"
+        android:pathData="M14.64,8.0599C14.16,7.4399 13.3,7.4199 13,8.1399C13.46,7.7799 14.02,7.6999 14.64,8.0599Z" />
     <path
-      android:fillColor="#2D4F8D"
-      android:pathData="M9.28,8.08C8.62,7.68 7.52,7.64 7.58,8.9C7.92,8.12 8.36,7.98 9.28,8.08Z" />
+        android:fillColor="#2D4F8D"
+        android:pathData="M9.28,8.08C8.62,7.68 7.52,7.64 7.58,8.9C7.92,8.12 8.36,7.98 9.28,8.08Z" />
     <path
-      android:fillColor="#2D4F8D"
-      android:pathData="M14.24,9.2401C13.88,9.2401 13.58,9.5401 13.58,9.9001C13.58,10.2601 13.88,10.5601 14.24,10.5601C14.6,10.5601 14.9,10.2601 14.9,9.9001C14.9,9.5401 14.6,9.2401 14.24,9.2401ZM14.48,9.8401C14.38,9.8401 14.28,9.7601 14.28,9.6401C14.28,9.5401 14.36,9.4401 14.48,9.4401C14.6,9.4401 14.68,9.5201 14.68,9.6401C14.66,9.7601 14.58,9.8401 14.48,9.8401Z" />
+        android:fillColor="#2D4F8D"
+        android:pathData="M14.24,9.2401C13.88,9.2401 13.58,9.5401 13.58,9.9001C13.58,10.2601 13.88,10.5601 14.24,10.5601C14.6,10.5601 14.9,10.2601 14.9,9.9001C14.9,9.5401 14.6,9.2401 14.24,9.2401ZM14.48,9.8401C14.38,9.8401 14.28,9.7601 14.28,9.6401C14.28,9.5401 14.36,9.4401 14.48,9.4401C14.6,9.4401 14.68,9.5201 14.68,9.6401C14.66,9.7601 14.58,9.8401 14.48,9.8401Z" />
     <path
-      android:fillColor="#2D4F8D"
-      android:pathData="M9.12,9.5998C8.7,9.5998 8.36,9.9398 8.36,10.3599C8.36,10.7799 8.7,11.1199 9.12,11.1199C9.54,11.1199 9.88,10.7799 9.88,10.3599C9.88,9.9398 9.54,9.5998 9.12,9.5998ZM9.4,10.2999C9.28,10.2999 9.18,10.1999 9.18,10.0799C9.18,9.9599 9.28,9.8598 9.4,9.8598C9.52,9.8598 9.62,9.9599 9.62,10.0799C9.62,10.1999 9.52,10.2999 9.4,10.2999Z" />
+        android:fillColor="#2D4F8D"
+        android:pathData="M9.12,9.5998C8.7,9.5998 8.36,9.9398 8.36,10.3599C8.36,10.7799 8.7,11.1199 9.12,11.1199C9.54,11.1199 9.88,10.7799 9.88,10.3599C9.88,9.9398 9.54,9.5998 9.12,9.5998ZM9.4,10.2999C9.28,10.2999 9.18,10.1999 9.18,10.0799C9.18,9.9599 9.28,9.8598 9.4,9.8598C9.52,9.8598 9.62,9.9599 9.62,10.0799C9.62,10.1999 9.52,10.2999 9.4,10.2999Z" />
     <path
-      android:fillColor="#D5D7D8"
-      android:pathData="M7.46,6.36C6.5,7.06 6.06,8.14 6.2,9.66C6.54,13.16 8.02,19.42 8.54,21.6C8.72,21.66 8.9,21.72 9.08,21.78C8.76,20.46 7.22,14.02 6.54,9.08C6.36,7.76 6.86,6.98 7.46,6.36Z" />
+        android:fillColor="#D5D7D8"
+        android:pathData="M7.46,6.36C6.5,7.06 6.06,8.14 6.2,9.66C6.54,13.16 8.02,19.42 8.54,21.6C8.72,21.66 8.9,21.72 9.08,21.78C8.76,20.46 7.22,14.02 6.54,9.08C6.36,7.76 6.86,6.98 7.46,6.36Z" />
     <path
-      android:fillColor="#D5D7D8"
-      android:pathData="M9.84,5.5001C9.92,5.5001 9.98,5.4801 9.98,5.4801C8.94,4.9801 7.3,4.9601 6.86,4.9601C6.82,5.0401 6.78,5.1401 6.78,5.2401C6.76,5.2601 8.7,5.1401 9.84,5.5001Z" />
+        android:fillColor="#D5D7D8"
+        android:pathData="M9.84,5.5001C9.92,5.5001 9.98,5.4801 9.98,5.4801C8.94,4.9801 7.3,4.9601 6.86,4.9601C6.82,5.0401 6.78,5.1401 6.78,5.2401C6.76,5.2601 8.7,5.1401 9.84,5.5001Z" />
     <path
-      android:fillColor="#D5D7D8"
-      android:pathData="M7.96,4.42C7.64,4.2 7.38,4.06 7.22,3.98C7.08,4 6.96,4 6.82,4.02C6.82,4.02 7.28,4.16 7.8,4.42C7.8,4.42 7.78,4.42 7.76,4.42C7.88,4.42 7.96,4.42 7.96,4.42Z" />
+        android:fillColor="#D5D7D8"
+        android:pathData="M7.96,4.42C7.64,4.2 7.38,4.06 7.22,3.98C7.08,4 6.96,4 6.82,4.02C6.82,4.02 7.28,4.16 7.8,4.42C7.8,4.42 7.78,4.42 7.76,4.42C7.88,4.42 7.96,4.42 7.96,4.42Z" />
     <path
-      android:fillColor="#67BD47"
-      android:pathData="M16.02,17.72C15.68,17.64 14.36,18.58 13.86,18.94C13.84,18.84 13.82,18.76 13.8,18.72C13.74,18.52 12.46,18.64 12.16,18.96C11.36,18.58 9.76,17.84 9.74,18.3C9.68,18.9 9.74,21.4 10.06,21.58C10.3,21.72 11.66,20.98 12.34,20.6C12.34,20.6 12.34,20.6 12.36,20.6C12.78,20.7 13.56,20.6 13.84,20.42C13.88,20.4 13.9,20.36 13.92,20.32C14.54,20.56 15.88,21.04 16.16,20.94C16.52,20.84 16.44,17.82 16.02,17.72Z" />
+        android:fillColor="#67BD47"
+        android:pathData="M16.02,17.72C15.68,17.64 14.36,18.58 13.86,18.94C13.84,18.84 13.82,18.76 13.8,18.72C13.74,18.52 12.46,18.64 12.16,18.96C11.36,18.58 9.76,17.84 9.74,18.3C9.68,18.9 9.74,21.4 10.06,21.58C10.3,21.72 11.66,20.98 12.34,20.6C12.34,20.6 12.34,20.6 12.36,20.6C12.78,20.7 13.56,20.6 13.84,20.42C13.88,20.4 13.9,20.36 13.92,20.32C14.54,20.56 15.88,21.04 16.16,20.94C16.52,20.84 16.44,17.82 16.02,17.72Z" />
     <path
-      android:fillColor="#43A347"
-      android:pathData="M12.36,20.6001C11.94,20.5201 12.08,20.1001 12.08,19.1201C11.98,19.1801 11.9,19.2601 11.9,19.3401C11.9,20.3201 11.74,20.7601 12.18,20.8201C12.6,20.9201 13.38,20.8201 13.7,20.6401C13.76,20.6001 13.78,20.5401 13.8,20.4401C13.5,20.6201 12.76,20.7001 12.36,20.6001Z" />
+        android:fillColor="#43A347"
+        android:pathData="M12.36,20.6001C11.94,20.5201 12.08,20.1001 12.08,19.1201C11.98,19.1801 11.9,19.2601 11.9,19.3401C11.9,20.3201 11.74,20.7601 12.18,20.8201C12.6,20.9201 13.38,20.8201 13.7,20.6401C13.76,20.6001 13.78,20.5401 13.8,20.4401C13.5,20.6201 12.76,20.7001 12.36,20.6001Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_duckduckgo_tinted.xml b/lawnchair/res/drawable/ic_duckduckgo_tinted.xml
index 3429202f82..4909be7a13 100644
--- a/lawnchair/res/drawable/ic_duckduckgo_tinted.xml
+++ b/lawnchair/res/drawable/ic_duckduckgo_tinted.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM19.82,4.22C20.82,5.22 21.62,6.4 22.18,7.72C22.76,9.08 23.04,10.52 23.04,12.02C23.04,13.52 22.76,14.96 22.18,16.32C21.62,17.62 20.84,18.8 19.82,19.82C18.82,20.82 17.64,21.62 16.32,22.18C14.96,22.74 13.52,23.04 12.02,23.04C10.52,23.04 9.08,22.76 7.72,22.18C6.42,21.62 5.24,20.84 4.22,19.82C3.22,18.82 2.42,17.64 1.86,16.32C1.3,14.96 1,13.5 1,12.02C1,10.52 1.28,9.08 1.86,7.72C2.42,6.42 3.2,5.24 4.22,4.22C5.22,3.22 6.4,2.42 7.72,1.86C9.08,1.3 10.52,1 12.02,1C13.52,1 14.96,1.28 16.32,1.86C17.62,2.42 18.8,3.2 19.82,4.22ZM12.1,15.58C12.1,16.5433 12.4107,17.6509 12.8158,18.6864C13.2641,18.5951 13.7631,18.5969 13.8,18.72C13.82,18.76 13.84,18.84 13.86,18.94C14.36,18.58 15.68,17.64 16.02,17.72C16.44,17.82 16.52,20.84 16.16,20.94C15.88,21.04 14.54,20.56 13.92,20.32C13.9,20.36 13.88,20.4 13.84,20.42C13.7891,20.4528 13.7216,20.4829 13.6427,20.5096C13.9462,21.104 14.2293,21.5982 14.42,21.92C18.88,20.84 22.2,16.82 22.2,12C22.2,6.36 17.64,1.8 12,1.8C6.36,1.8 1.8,6.38 1.8,12C1.8,16.42 4.62,20.18 8.54,21.6C8.02,19.42 6.54,13.18 6.2,9.68C5.96,7.2 7.3,5.86 9.88,5.52C8.76,5.16 6.78,5.26 6.78,5.26C6.82,4.58 7.82,4.44 7.82,4.44C7.3,4.18 6.84,4.04 6.84,4.04C9.6,3.66 11.34,4.6 12.08,5.58C15.08,6.3 15.56,9.74 15.56,10.72C15.56,11.1344 15.525,11.4624 15.462,11.7224C16.1961,11.5604 16.937,11.3265 17.5599,11.1298C18.2249,10.9199 18.7555,10.7524 19,10.76C19.66,10.78 20.08,11.04 20.08,11.34C20.08,11.78 16.4,13.44 14.98,13.3C13.62,13.18 13.3,13.32 13.3,13.88C13.3,14.36 14.28,14.8 15.36,14.8C16.1179,14.8 16.867,14.6424 17.4988,14.5095C18.2176,14.3583 18.7846,14.2391 19.04,14.42C19.46,14.72 17.94,15.8 16.2,15.8C14.9825,15.8 13.1382,15.3985 12.1404,14.7051C12.1141,14.9609 12.1,15.251 12.1,15.58ZM14.64,8.0599C14.16,7.4399 13.3,7.4199 13,8.1399C13.46,7.7799 14.02,7.6999 14.64,8.0599ZM9.28,8.08C8.62,7.68 7.52,7.64 7.58,8.9C7.92,8.12 8.36,7.98 9.28,8.08ZM14.24,9.2401C13.88,9.2401 13.58,9.5401 13.58,9.9001C13.58,10.2601 13.88,10.5601 14.24,10.5601C14.6,10.5601 14.9,10.2601 14.9,9.9001C14.9,9.5401 14.6,9.2401 14.24,9.2401ZM14.48,9.8401C14.38,9.8401 14.28,9.7601 14.28,9.6401C14.28,9.5401 14.36,9.4401 14.48,9.4401C14.6,9.4401 14.68,9.5201 14.68,9.6401C14.66,9.7601 14.58,9.8401 14.48,9.8401ZM8.36,10.3599C8.36,9.9399 8.7,9.5999 9.12,9.5999C9.54,9.5999 9.88,9.9399 9.88,10.3599C9.88,10.7799 9.54,11.1199 9.12,11.1199C8.7,11.1199 8.36,10.7799 8.36,10.3599ZM9.18,10.0799C9.18,10.1999 9.28,10.2999 9.4,10.2999C9.52,10.2999 9.62,10.1999 9.62,10.0799C9.62,9.9599 9.52,9.8599 9.4,9.8599C9.28,9.8599 9.18,9.9599 9.18,10.0799Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12ZM19.82,4.22C20.82,5.22 21.62,6.4 22.18,7.72C22.76,9.08 23.04,10.52 23.04,12.02C23.04,13.52 22.76,14.96 22.18,16.32C21.62,17.62 20.84,18.8 19.82,19.82C18.82,20.82 17.64,21.62 16.32,22.18C14.96,22.74 13.52,23.04 12.02,23.04C10.52,23.04 9.08,22.76 7.72,22.18C6.42,21.62 5.24,20.84 4.22,19.82C3.22,18.82 2.42,17.64 1.86,16.32C1.3,14.96 1,13.5 1,12.02C1,10.52 1.28,9.08 1.86,7.72C2.42,6.42 3.2,5.24 4.22,4.22C5.22,3.22 6.4,2.42 7.72,1.86C9.08,1.3 10.52,1 12.02,1C13.52,1 14.96,1.28 16.32,1.86C17.62,2.42 18.8,3.2 19.82,4.22ZM12.1,15.58C12.1,16.5433 12.4107,17.6509 12.8158,18.6864C13.2641,18.5951 13.7631,18.5969 13.8,18.72C13.82,18.76 13.84,18.84 13.86,18.94C14.36,18.58 15.68,17.64 16.02,17.72C16.44,17.82 16.52,20.84 16.16,20.94C15.88,21.04 14.54,20.56 13.92,20.32C13.9,20.36 13.88,20.4 13.84,20.42C13.7891,20.4528 13.7216,20.4829 13.6427,20.5096C13.9462,21.104 14.2293,21.5982 14.42,21.92C18.88,20.84 22.2,16.82 22.2,12C22.2,6.36 17.64,1.8 12,1.8C6.36,1.8 1.8,6.38 1.8,12C1.8,16.42 4.62,20.18 8.54,21.6C8.02,19.42 6.54,13.18 6.2,9.68C5.96,7.2 7.3,5.86 9.88,5.52C8.76,5.16 6.78,5.26 6.78,5.26C6.82,4.58 7.82,4.44 7.82,4.44C7.3,4.18 6.84,4.04 6.84,4.04C9.6,3.66 11.34,4.6 12.08,5.58C15.08,6.3 15.56,9.74 15.56,10.72C15.56,11.1344 15.525,11.4624 15.462,11.7224C16.1961,11.5604 16.937,11.3265 17.5599,11.1298C18.2249,10.9199 18.7555,10.7524 19,10.76C19.66,10.78 20.08,11.04 20.08,11.34C20.08,11.78 16.4,13.44 14.98,13.3C13.62,13.18 13.3,13.32 13.3,13.88C13.3,14.36 14.28,14.8 15.36,14.8C16.1179,14.8 16.867,14.6424 17.4988,14.5095C18.2176,14.3583 18.7846,14.2391 19.04,14.42C19.46,14.72 17.94,15.8 16.2,15.8C14.9825,15.8 13.1382,15.3985 12.1404,14.7051C12.1141,14.9609 12.1,15.251 12.1,15.58ZM14.64,8.0599C14.16,7.4399 13.3,7.4199 13,8.1399C13.46,7.7799 14.02,7.6999 14.64,8.0599ZM9.28,8.08C8.62,7.68 7.52,7.64 7.58,8.9C7.92,8.12 8.36,7.98 9.28,8.08ZM14.24,9.2401C13.88,9.2401 13.58,9.5401 13.58,9.9001C13.58,10.2601 13.88,10.5601 14.24,10.5601C14.6,10.5601 14.9,10.2601 14.9,9.9001C14.9,9.5401 14.6,9.2401 14.24,9.2401ZM14.48,9.8401C14.38,9.8401 14.28,9.7601 14.28,9.6401C14.28,9.5401 14.36,9.4401 14.48,9.4401C14.6,9.4401 14.68,9.5201 14.68,9.6401C14.66,9.7601 14.58,9.8401 14.48,9.8401ZM8.36,10.3599C8.36,9.9399 8.7,9.5999 9.12,9.5999C9.54,9.5999 9.88,9.9399 9.88,10.3599C9.88,10.7799 9.54,11.1199 9.12,11.1199C8.7,11.1199 8.36,10.7799 8.36,10.3599ZM9.18,10.0799C9.18,10.1999 9.28,10.2999 9.4,10.2999C9.52,10.2999 9.62,10.1999 9.62,10.0799C9.62,9.9599 9.52,9.8599 9.4,9.8599C9.28,9.8599 9.18,9.9599 9.18,10.0799Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_edit.xml b/lawnchair/res/drawable/ic_edit.xml
index 1a6b9834d0..a8e0fd509e 100644
--- a/lawnchair/res/drawable/ic_edit.xml
+++ b/lawnchair/res/drawable/ic_edit.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#000"
-      android:fillType="evenOdd"
-      android:pathData="M3,21.0001V17.0001L15.5,4.5001C16.6046,3.3955 18.3954,3.3955 19.5,4.5001C20.6046,5.6046 20.6046,7.3955 19.5,8.5001L7,21.0001H3ZM6.1716,19.0001L18.0858,7.0858C18.4093,6.7623 18.4093,6.2378 18.0858,5.9143C17.7623,5.5908 17.2377,5.5908 16.9142,5.9143L5,17.8285V19.0001H6.1716Z" />
+    <path
+        android:fillColor="#000"
+        android:fillType="evenOdd"
+        android:pathData="M3,21.0001V17.0001L15.5,4.5001C16.6046,3.3955 18.3954,3.3955 19.5,4.5001C20.6046,5.6046 20.6046,7.3955 19.5,8.5001L7,21.0001H3ZM6.1716,19.0001L18.0858,7.0858C18.4093,6.7623 18.4093,6.2378 18.0858,5.9143C17.7623,5.5908 17.2377,5.5908 16.9142,5.9143L5,17.8285V19.0001H6.1716Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_fennec.xml b/lawnchair/res/drawable/ic_fennec.xml
index 836f4189d7..8db4d72a19 100644
--- a/lawnchair/res/drawable/ic_fennec.xml
+++ b/lawnchair/res/drawable/ic_fennec.xml
@@ -1,5 +1,14 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="37.571" android:viewportWidth="37.571" android:width="24dp">
-      
-    <path android:fillColor="#ffd87a" android:fillType="evenOdd" android:pathData="m21.647,25.09c0,1.185 0.961,2.146 2.146,2.146 1.185,0 2.146,-0.961 2.146,-2.146 0,-1.185 -0.961,-2.146 -2.146,-2.146 -1.185,0 -2.146,0.961 -2.146,2.146zM35.719,24.851V4.341c-0,-0.954 -0.954,-1.192 -1.669,-0.715L18.785,13.165 3.522,3.625C2.806,3.148 1.852,3.387 1.852,4.341V24.851L16.913,34.154c-1.012,-0.937 -1,-2.442 0.026,-3.366 1.026,-0.924 2.681,-0.92 3.702,0.009 1.021,0.929 1.069,2.423 0.052,3.355zM33.083,7.658V21.968l-7.632,-4.77 4.293,-7.632zM15.923,25.09c0,1.185 -0.961,2.146 -2.146,2.146 -1.185,0 -2.146,-0.961 -2.146,-2.146 0,-1.185 0.961,-2.146 2.146,-2.146 1.185,0 2.146,0.961 2.146,2.146zM4.476,7.68V21.989L12.107,17.22 7.815,9.588Z" android:strokeColor="#00000000" android:strokeWidth="0"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="37.571"
+    android:viewportHeight="37.571">
+
+    <path
+        android:fillColor="#ffd87a"
+        android:fillType="evenOdd"
+        android:pathData="m21.647,25.09c0,1.185 0.961,2.146 2.146,2.146 1.185,0 2.146,-0.961 2.146,-2.146 0,-1.185 -0.961,-2.146 -2.146,-2.146 -1.185,0 -2.146,0.961 -2.146,2.146zM35.719,24.851V4.341c-0,-0.954 -0.954,-1.192 -1.669,-0.715L18.785,13.165 3.522,3.625C2.806,3.148 1.852,3.387 1.852,4.341V24.851L16.913,34.154c-1.012,-0.937 -1,-2.442 0.026,-3.366 1.026,-0.924 2.681,-0.92 3.702,0.009 1.021,0.929 1.069,2.423 0.052,3.355zM33.083,7.658V21.968l-7.632,-4.77 4.293,-7.632zM15.923,25.09c0,1.185 -0.961,2.146 -2.146,2.146 -1.185,0 -2.146,-0.961 -2.146,-2.146 0,-1.185 0.961,-2.146 2.146,-2.146 1.185,0 2.146,0.961 2.146,2.146zM4.476,7.68V21.989L12.107,17.22 7.815,9.588Z"
+        android:strokeWidth="0"
+        android:strokeColor="#00000000" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_fennec_tinted.xml b/lawnchair/res/drawable/ic_fennec_tinted.xml
index daecdd2ce3..d2d5882434 100644
--- a/lawnchair/res/drawable/ic_fennec_tinted.xml
+++ b/lawnchair/res/drawable/ic_fennec_tinted.xml
@@ -1,5 +1,14 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="37.571" android:viewportWidth="37.571" android:width="24dp">
-      
-    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="m21.647,25.09c0,1.185 0.961,2.146 2.146,2.146 1.185,0 2.146,-0.961 2.146,-2.146 0,-1.185 -0.961,-2.146 -2.146,-2.146 -1.185,0 -2.146,0.961 -2.146,2.146zM35.719,24.851L35.719,4.341c0,-0.954 -0.954,-1.192 -1.669,-0.715L18.785,13.165 3.522,3.625C2.806,3.148 1.852,3.387 1.852,4.341L1.852,24.851L16.913,34.154c-1.012,-0.937 -1,-2.442 0.026,-3.366 1.026,-0.924 2.681,-0.92 3.702,0.01 1.021,0.929 1.069,2.423 0.052,3.355zM33.083,7.658L33.083,21.968l-7.632,-4.77 4.293,-7.632zM15.923,25.09c0,1.185 -0.961,2.146 -2.146,2.146 -1.185,0 -2.146,-0.961 -2.146,-2.146 0,-1.185 0.961,-2.146 2.146,-2.146 1.185,0 2.146,0.961 2.146,2.146zM4.476,7.68L4.476,21.989L12.107,17.22 7.815,9.588Z" android:strokeColor="#00000000" android:strokeWidth="0"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="37.571"
+    android:viewportHeight="37.571">
+
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="m21.647,25.09c0,1.185 0.961,2.146 2.146,2.146 1.185,0 2.146,-0.961 2.146,-2.146 0,-1.185 -0.961,-2.146 -2.146,-2.146 -1.185,0 -2.146,0.961 -2.146,2.146zM35.719,24.851L35.719,4.341c0,-0.954 -0.954,-1.192 -1.669,-0.715L18.785,13.165 3.522,3.625C2.806,3.148 1.852,3.387 1.852,4.341L1.852,24.851L16.913,34.154c-1.012,-0.937 -1,-2.442 0.026,-3.366 1.026,-0.924 2.681,-0.92 3.702,0.01 1.021,0.929 1.069,2.423 0.052,3.355zM33.083,7.658L33.083,21.968l-7.632,-4.77 4.293,-7.632zM15.923,25.09c0,1.185 -0.961,2.146 -2.146,2.146 -1.185,0 -2.146,-0.961 -2.146,-2.146 0,-1.185 0.961,-2.146 2.146,-2.146 1.185,0 2.146,0.961 2.146,2.146zM4.476,7.68L4.476,21.989L12.107,17.22 7.815,9.588Z"
+        android:strokeWidth="0"
+        android:strokeColor="#00000000" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_firefox.xml b/lawnchair/res/drawable/ic_firefox.xml
index 247d797bcf..e0bb9e9eeb 100644
--- a/lawnchair/res/drawable/ic_firefox.xml
+++ b/lawnchair/res/drawable/ic_firefox.xml
@@ -4,9 +4,9 @@
     android:height="24dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <path
-        android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z"
-        android:fillColor="#ff5a32"/>
-  </group>
+    <group>
+        <path
+            android:fillColor="#ff5a32"
+            android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z" />
+    </group>
 </vector>
diff --git a/lawnchair/res/drawable/ic_firefox_tinted.xml b/lawnchair/res/drawable/ic_firefox_tinted.xml
index 4beb0fdbda..04dc615443 100644
--- a/lawnchair/res/drawable/ic_firefox_tinted.xml
+++ b/lawnchair/res/drawable/ic_firefox_tinted.xml
@@ -4,9 +4,9 @@
     android:height="24dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <path
-        android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z"
-        android:fillColor="#000000"/>
-  </group>
+    <group>
+        <path
+            android:fillColor="#000000"
+            android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z" />
+    </group>
 </vector>
diff --git a/lawnchair/res/drawable/ic_folder.xml b/lawnchair/res/drawable/ic_folder.xml
index 320518caec..c6f5f72085 100644
--- a/lawnchair/res/drawable/ic_folder.xml
+++ b/lawnchair/res/drawable/ic_folder.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
     android:tint="?android:attr/textColorPrimary"
+    android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M22,17C22,18.6569 20.6569,20 19,20H5C3.3431,20 2,18.6569 2,17V7C2,5.3432 3.3431,4 5,4H10L12,6H19C20.6569,6 22,7.3432 22,9V17ZM4,7V17C4,17.5523 4.4477,18 5,18H19C19.5523,18 20,17.5523 20,17V9C20,8.4477 19.5523,8 19,8H11L9,6H5C4.4477,6 4,6.4477 4,7Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M22,17C22,18.6569 20.6569,20 19,20H5C3.3431,20 2,18.6569 2,17V7C2,5.3432 3.3431,4 5,4H10L12,6H19C20.6569,6 22,7.3432 22,9V17ZM4,7V17C4,17.5523 4.4477,18 5,18H19C19.5523,18 20,17.5523 20,17V9C20,8.4477 19.5523,8 19,8H11L9,6H5C4.4477,6 4,6.4477 4,7Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_general.xml b/lawnchair/res/drawable/ic_general.xml
index 2039b60f2f..402120b203 100644
--- a/lawnchair/res/drawable/ic_general.xml
+++ b/lawnchair/res/drawable/ic_general.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M3,18C3,18.55 3.45,19 4,19H9V17H4C3.45,17 3,17.45 3,18ZM3,6C3,6.55 3.45,7 4,7H13V5H4C3.45,5 3,5.45 3,6ZM13,20V19H20C20.55,19 21,18.55 21,18C21,17.45 20.55,17 20,17H13V16C13,15.45 12.55,15 12,15C11.45,15 11,15.45 11,16V20C11,20.55 11.45,21 12,21C12.55,21 13,20.55 13,20ZM7,10V11H4C3.45,11 3,11.45 3,12C3,12.55 3.45,13 4,13H7V14C7,14.55 7.45,15 8,15C8.55,15 9,14.55 9,14V10C9,9.45 8.55,9 8,9C7.45,9 7,9.45 7,10ZM21,12C21,11.45 20.55,11 20,11H11V13H20C20.55,13 21,12.55 21,12ZM16,9C16.55,9 17,8.55 17,8V7H20C20.55,7 21,6.55 21,6C21,5.45 20.55,5 20,5H17V4C17,3.45 16.55,3 16,3C15.45,3 15,3.45 15,4V8C15,8.55 15.45,9 16,9Z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M3,18C3,18.55 3.45,19 4,19H9V17H4C3.45,17 3,17.45 3,18ZM3,6C3,6.55 3.45,7 4,7H13V5H4C3.45,5 3,5.45 3,6ZM13,20V19H20C20.55,19 21,18.55 21,18C21,17.45 20.55,17 20,17H13V16C13,15.45 12.55,15 12,15C11.45,15 11,15.45 11,16V20C11,20.55 11.45,21 12,21C12.55,21 13,20.55 13,20ZM7,10V11H4C3.45,11 3,11.45 3,12C3,12.55 3.45,13 4,13H7V14C7,14.55 7.45,15 8,15C8.55,15 9,14.55 9,14V10C9,9.45 8.55,9 8,9C7.45,9 7,9.45 7,10ZM21,12C21,11.45 20.55,11 20,11H11V13H20C20.55,13 21,12.55 21,12ZM16,9C16.55,9 17,8.55 17,8V7H20C20.55,7 21,6.55 21,6C21,5.45 20.55,5 20,5H17V4C17,3.45 16.55,3 16,3C15.45,3 15,3.45 15,4V8C15,8.55 15.45,9 16,9Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_github.xml b/lawnchair/res/drawable/ic_github.xml
index db0bb74e32..78a820bfe3 100644
--- a/lawnchair/res/drawable/ic_github.xml
+++ b/lawnchair/res/drawable/ic_github.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M11.9991,2C6.4771,2 2,6.4771 2,12.0003C2,16.4185 4.865,20.1663 8.8388,21.4892C9.3391,21.5807 9.5214,21.2719 9.5214,21.0067C9.5214,20.7698 9.5128,20.1405 9.5079,19.3062C6.7264,19.9103 6.1395,17.9655 6.1395,17.9655C5.6846,16.8102 5.0289,16.5026 5.0289,16.5026C4.121,15.8826 5.0977,15.8948 5.0977,15.8948C6.1014,15.9654 6.6294,16.9256 6.6294,16.9256C7.5213,18.4535 8.9701,18.0122 9.5398,17.7562C9.6307,17.1103 9.8885,16.6696 10.1746,16.4197C7.9541,16.1674 5.6195,15.3092 5.6195,11.4773C5.6195,10.3858 6.0093,9.4932 6.649,8.7939C6.5459,8.541 6.2027,7.5244 6.7466,6.1474C6.7466,6.1474 7.5864,5.8786 9.4969,7.1726C10.2943,6.9504 11.1501,6.8399 12.0003,6.8362C12.8493,6.8399 13.7051,6.9504 14.5038,7.1726C16.413,5.8786 17.2509,6.1474 17.2509,6.1474C17.7967,7.5244 17.4535,8.541 17.3504,8.7939C17.9913,9.4932 18.3786,10.3858 18.3786,11.4773C18.3786,15.319 16.0403,16.1643 13.8125,16.4117C14.1716,16.7205 14.4915,17.3307 14.4915,18.2638C14.4915,19.6003 14.4792,20.6789 14.4792,21.0067C14.4792,21.2744 14.6591,21.5856 15.1668,21.488C19.1374,20.1626 22,16.4173 22,12.0003C22,6.4771 17.5223,2 11.9991,2Z"
-      android:fillColor="#000000"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M11.9991,2C6.4771,2 2,6.4771 2,12.0003C2,16.4185 4.865,20.1663 8.8388,21.4892C9.3391,21.5807 9.5214,21.2719 9.5214,21.0067C9.5214,20.7698 9.5128,20.1405 9.5079,19.3062C6.7264,19.9103 6.1395,17.9655 6.1395,17.9655C5.6846,16.8102 5.0289,16.5026 5.0289,16.5026C4.121,15.8826 5.0977,15.8948 5.0977,15.8948C6.1014,15.9654 6.6294,16.9256 6.6294,16.9256C7.5213,18.4535 8.9701,18.0122 9.5398,17.7562C9.6307,17.1103 9.8885,16.6696 10.1746,16.4197C7.9541,16.1674 5.6195,15.3092 5.6195,11.4773C5.6195,10.3858 6.0093,9.4932 6.649,8.7939C6.5459,8.541 6.2027,7.5244 6.7466,6.1474C6.7466,6.1474 7.5864,5.8786 9.4969,7.1726C10.2943,6.9504 11.1501,6.8399 12.0003,6.8362C12.8493,6.8399 13.7051,6.9504 14.5038,7.1726C16.413,5.8786 17.2509,6.1474 17.2509,6.1474C17.7967,7.5244 17.4535,8.541 17.3504,8.7939C17.9913,9.4932 18.3786,10.3858 18.3786,11.4773C18.3786,15.319 16.0403,16.1643 13.8125,16.4117C14.1716,16.7205 14.4915,17.3307 14.4915,18.2638C14.4915,19.6003 14.4792,20.6789 14.4792,21.0067C14.4792,21.2744 14.6591,21.5856 15.1668,21.488C19.1374,20.1626 22,16.4173 22,12.0003C22,6.4771 17.5223,2 11.9991,2Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_help.xml b/lawnchair/res/drawable/ic_help.xml
index 7af5fcf167..f15eb34fc8 100644
--- a/lawnchair/res/drawable/ic_help.xml
+++ b/lawnchair/res/drawable/ic_help.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20ZM12.61,6.04C10.55,5.74 8.73,7.01 8.18,8.83C8,9.41 8.44,10 9.05,10H9.25C9.66,10 9.99,9.71 10.13,9.33C10.45,8.44 11.4,7.83 12.43,8.05C13.38,8.25 14.08,9.18 14,10.15C13.9,11.49 12.38,11.78 11.55,13.03C11.55,13.04 11.54,13.04 11.54,13.05C11.53,13.07 11.52,13.08 11.51,13.1C11.42,13.25 11.33,13.42 11.26,13.6C11.25,13.63 11.23,13.65 11.22,13.68C11.21,13.7 11.21,13.72 11.2,13.75C11.08,14.09 11,14.5 11,15H13C13,14.58 13.11,14.23 13.28,13.93C13.3,13.9 13.31,13.87 13.33,13.84C13.41,13.7 13.51,13.57 13.61,13.45C13.62,13.44 13.63,13.42 13.64,13.41C13.74,13.29 13.85,13.18 13.97,13.07C14.93,12.16 16.23,11.42 15.96,9.51C15.72,7.77 14.35,6.3 12.61,6.04Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M12,17m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20ZM12.61,6.04C10.55,5.74 8.73,7.01 8.18,8.83C8,9.41 8.44,10 9.05,10H9.25C9.66,10 9.99,9.71 10.13,9.33C10.45,8.44 11.4,7.83 12.43,8.05C13.38,8.25 14.08,9.18 14,10.15C13.9,11.49 12.38,11.78 11.55,13.03C11.55,13.04 11.54,13.04 11.54,13.05C11.53,13.07 11.52,13.08 11.51,13.1C11.42,13.25 11.33,13.42 11.26,13.6C11.25,13.63 11.23,13.65 11.22,13.68C11.21,13.7 11.21,13.72 11.2,13.75C11.08,14.09 11,14.5 11,15H13C13,14.58 13.11,14.23 13.28,13.93C13.3,13.9 13.31,13.87 13.33,13.84C13.41,13.7 13.51,13.57 13.61,13.45C13.62,13.44 13.63,13.42 13.64,13.41C13.74,13.29 13.85,13.18 13.97,13.07C14.93,12.16 16.23,11.42 15.96,9.51C15.72,7.77 14.35,6.3 12.61,6.04Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,17m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_home_screen.xml b/lawnchair/res/drawable/ic_home_screen.xml
index a5e3cc8cd0..93b50ff94e 100644
--- a/lawnchair/res/drawable/ic_home_screen.xml
+++ b/lawnchair/res/drawable/ic_home_screen.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12,3L1.7923,10.795C1.3545,11.1293 1.2701,11.7549 1.6037,12.1932C1.9383,12.6329 2.5663,12.7173 3.0051,12.3815L4,11.62V18C4,19.6569 5.3432,21 7,21H17C18.6569,21 20,19.6569 20,18V11.62L20.9998,12.3796C21.4367,12.7116 22.0598,12.6277 22.3934,12.1921C22.7283,11.7548 22.6449,11.1288 22.2071,10.7945L12,3ZM14,19H17C17.5523,19 18,18.5523 18,18V10.1L12,5.52L6,10.1V18C6,18.5523 6.4477,19 7,19H10V15C10,13.8954 10.8954,13 12,13C13.1046,13 14,13.8954 14,15V19Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M12,3L1.7923,10.795C1.3545,11.1293 1.2701,11.7549 1.6037,12.1932C1.9383,12.6329 2.5663,12.7173 3.0051,12.3815L4,11.62V18C4,19.6569 5.3432,21 7,21H17C18.6569,21 20,19.6569 20,18V11.62L20.9998,12.3796C21.4367,12.7116 22.0598,12.6277 22.3934,12.1921C22.7283,11.7548 22.6449,11.1288 22.2071,10.7945L12,3ZM14,19H17C17.5523,19 18,18.5523 18,18V10.1L12,5.52L6,10.1V18C6,18.5523 6.4477,19 7,19H10V15C10,13.8954 10.8954,13 12,13C13.1046,13 14,13.8954 14,15V19Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_iceraven.xml b/lawnchair/res/drawable/ic_iceraven.xml
index 7308766f81..e0ea140734 100644
--- a/lawnchair/res/drawable/ic_iceraven.xml
+++ b/lawnchair/res/drawable/ic_iceraven.xml
@@ -3,12 +3,12 @@
     android:height="24dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
-      android:strokeLineJoin="miter"
-      android:fillColor="#055493"/>
-  <path
-      android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
-      android:strokeLineJoin="miter"
-      android:fillColor="#055493"/>
+    <path
+        android:fillColor="#055493"
+        android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#055493"
+        android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
+        android:strokeLineJoin="miter" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_iceraven_tinted.xml b/lawnchair/res/drawable/ic_iceraven_tinted.xml
index 72268352ec..110d53b502 100644
--- a/lawnchair/res/drawable/ic_iceraven_tinted.xml
+++ b/lawnchair/res/drawable/ic_iceraven_tinted.xml
@@ -3,12 +3,12 @@
     android:height="24dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
-      android:strokeLineJoin="miter"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
-      android:strokeLineJoin="miter"
-      android:fillColor="#000000"/>
-</vector>
\ No newline at end of file
+    <path
+        android:fillColor="#000000"
+        android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
+        android:strokeLineJoin="miter" />
+</vector>
diff --git a/lawnchair/res/drawable/ic_launcher_home_monochrome.xml b/lawnchair/res/drawable/ic_launcher_home_monochrome.xml
index 386a88e821..6185e97730 100644
--- a/lawnchair/res/drawable/ic_launcher_home_monochrome.xml
+++ b/lawnchair/res/drawable/ic_launcher_home_monochrome.xml
@@ -3,21 +3,21 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <path
-      android:pathData="M37.35,70.88C36.31,69.97 36.21,68.39 37.12,67.35L51.12,51.35C52.03,50.31 53.61,50.21 54.65,51.12C55.69,52.03 55.79,53.61 54.88,54.65L40.88,70.65C39.97,71.69 38.39,71.79 37.35,70.88Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M37.23,37.23C38.21,36.26 39.79,36.26 40.77,37.23L70.77,67.23C71.74,68.21 71.74,69.79 70.77,70.77C69.79,71.74 68.21,71.74 67.23,70.77L37.23,40.77C36.26,39.79 36.26,38.21 37.23,37.23Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M52.42,59.49L37.88,66.76C36.65,67.38 36.15,68.88 36.76,70.12C37.38,71.35 38.88,71.85 40.12,71.24L56.15,63.22L52.42,59.49Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M63.22,59.68L58.51,62.04L54.78,58.32L59.49,55.96L63.22,59.68Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M63.22,59.68L70.12,56.24C71.35,55.62 71.85,54.12 71.24,52.88C70.62,51.65 69.12,51.15 67.88,51.76L59.49,55.96L63.22,59.68Z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M37.35,70.88C36.31,69.97 36.21,68.39 37.12,67.35L51.12,51.35C52.03,50.31 53.61,50.21 54.65,51.12C55.69,52.03 55.79,53.61 54.88,54.65L40.88,70.65C39.97,71.69 38.39,71.79 37.35,70.88Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M37.23,37.23C38.21,36.26 39.79,36.26 40.77,37.23L70.77,67.23C71.74,68.21 71.74,69.79 70.77,70.77C69.79,71.74 68.21,71.74 67.23,70.77L37.23,40.77C36.26,39.79 36.26,38.21 37.23,37.23Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M52.42,59.49L37.88,66.76C36.65,67.38 36.15,68.88 36.76,70.12C37.38,71.35 38.88,71.85 40.12,71.24L56.15,63.22L52.42,59.49Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M63.22,59.68L58.51,62.04L54.78,58.32L59.49,55.96L63.22,59.68Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M63.22,59.68L70.12,56.24C71.35,55.62 71.85,54.12 71.24,52.88C70.62,51.65 69.12,51.15 67.88,51.76L59.49,55.96L63.22,59.68Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens.xml b/lawnchair/res/drawable/ic_lens.xml
index 35f3d8c2d7..39c41c62bd 100644
--- a/lawnchair/res/drawable/ic_lens.xml
+++ b/lawnchair/res/drawable/ic_lens.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M144.07,144m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0, M96.07,104m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0, M24,135.2c0,18.11 14.69,32.8 32.8,32.8H96v-16l-40.1,-0.1c-8.8,0 -15.9,-8.19 -15.9,-17.9v-18H24V135.2z, M168,72.8c0,-18.11 -14.69,-32.8 -32.8,-32.8H116l20,16c8.8,0 16,8.29 16,18v30h16V72.8z, M112,24l-32,0L68,40H56.8C38.69,40 24,54.69 24,72.8V92h16V74c0,-9.71 7.2,-18 16,-18h80L112,24z"
-        android:fillColor="#000"/>
+        android:fillColor="#000"
+        android:pathData="M144.07,144m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0, M96.07,104m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0, M24,135.2c0,18.11 14.69,32.8 32.8,32.8H96v-16l-40.1,-0.1c-8.8,0 -15.9,-8.19 -15.9,-17.9v-18H24V135.2z, M168,72.8c0,-18.11 -14.69,-32.8 -32.8,-32.8H116l20,16c8.8,0 16,8.29 16,18v30h16V72.8z, M112,24l-32,0L68,40H56.8C38.69,40 24,54.69 24,72.8V92h16V74c0,-9.71 7.2,-18 16,-18h80L112,24z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens_color.xml b/lawnchair/res/drawable/ic_lens_color.xml
index 9cfce00c61..3326e33340 100644
--- a/lawnchair/res/drawable/ic_lens_color.xml
+++ b/lawnchair/res/drawable/ic_lens_color.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@id/qsbIconTintPrimary" android:drawable="@drawable/ic_lens_color_1" />
-    <item android:id="@id/qsbIconTintSecondary" android:drawable="@drawable/ic_lens_color_2" />
-    <item android:id="@id/qsbIconTintTertiary" android:drawable="@drawable/ic_lens_color_3" />
-    <item android:id="@id/qsbIconTintPrimary" android:drawable="@drawable/ic_lens_color_4" />
-    <item android:id="@id/qsbIconTintQuaternary" android:drawable="@drawable/ic_lens_color_5" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@id/qsbIconTintPrimary"
+        android:drawable="@drawable/ic_lens_color_1" />
+    <item
+        android:id="@id/qsbIconTintSecondary"
+        android:drawable="@drawable/ic_lens_color_2" />
+    <item
+        android:id="@id/qsbIconTintTertiary"
+        android:drawable="@drawable/ic_lens_color_3" />
+    <item
+        android:id="@id/qsbIconTintPrimary"
+        android:drawable="@drawable/ic_lens_color_4" />
+    <item
+        android:id="@id/qsbIconTintQuaternary"
+        android:drawable="@drawable/ic_lens_color_5" />
 </layer-list>
 
diff --git a/lawnchair/res/drawable/ic_lens_color_1.xml b/lawnchair/res/drawable/ic_lens_color_1.xml
index 19500a4402..7258908504 100644
--- a/lawnchair/res/drawable/ic_lens_color_1.xml
+++ b/lawnchair/res/drawable/ic_lens_color_1.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M96.07,104m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
-        android:fillColor="#4285F4"/>
+        android:fillColor="#4285F4"
+        android:pathData="M96.07,104m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens_color_2.xml b/lawnchair/res/drawable/ic_lens_color_2.xml
index 61a294896b..79599ddeec 100644
--- a/lawnchair/res/drawable/ic_lens_color_2.xml
+++ b/lawnchair/res/drawable/ic_lens_color_2.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M144.07,144m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
-        android:fillColor="#34A853"/>
+        android:fillColor="#34A853"
+        android:pathData="M144.07,144m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens_color_3.xml b/lawnchair/res/drawable/ic_lens_color_3.xml
index 32de1fe71f..fc0158d4f4 100644
--- a/lawnchair/res/drawable/ic_lens_color_3.xml
+++ b/lawnchair/res/drawable/ic_lens_color_3.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M168,72.8c0,-18.11 -14.69,-32.8 -32.8,-32.8H116l20,16c8.8,0 16,8.29 16,18v30h16V72.8z"
-        android:fillColor="#FBBC05"/>
+        android:fillColor="#FBBC05"
+        android:pathData="M168,72.8c0,-18.11 -14.69,-32.8 -32.8,-32.8H116l20,16c8.8,0 16,8.29 16,18v30h16V72.8z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens_color_4.xml b/lawnchair/res/drawable/ic_lens_color_4.xml
index b86c8fdd16..ff7f6102c3 100644
--- a/lawnchair/res/drawable/ic_lens_color_4.xml
+++ b/lawnchair/res/drawable/ic_lens_color_4.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M112,24l-32,0L68,40H56.8C38.69,40 24,54.69 24,72.8V92h16V74c0,-9.71 7.2,-18 16,-18h80L112,24z"
-        android:fillColor="#4285F4"/>
+        android:fillColor="#4285F4"
+        android:pathData="M112,24l-32,0L68,40H56.8C38.69,40 24,54.69 24,72.8V92h16V74c0,-9.71 7.2,-18 16,-18h80L112,24z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lens_color_5.xml b/lawnchair/res/drawable/ic_lens_color_5.xml
index d22d3f7ba9..490374376a 100644
--- a/lawnchair/res/drawable/ic_lens_color_5.xml
+++ b/lawnchair/res/drawable/ic_lens_color_5.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="192"
     android:viewportHeight="192">
     <path
-        android:pathData="M24,135.2c0,18.11 14.69,32.8 32.8,32.8H96v-16l-40.1,-0.1c-8.8,0 -15.9,-8.19 -15.9,-17.9v-18H24V135.2z"
-        android:fillColor="#EA4335"/>
+        android:fillColor="#EA4335"
+        android:pathData="M24,135.2c0,18.11 14.69,32.8 32.8,32.8H96v-16l-40.1,-0.1c-8.8,0 -15.9,-8.19 -15.9,-17.9v-18H24V135.2z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lock.xml b/lawnchair/res/drawable/ic_lock.xml
index cd1042e1a0..38d84a66a5 100644
--- a/lawnchair/res/drawable/ic_lock.xml
+++ b/lawnchair/res/drawable/ic_lock.xml
@@ -3,7 +3,7 @@
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M24,1Q28.2,1 31.125,3.975Q34.05,6.95 34.05,11.2V14.9H36.55Q38.5,14.9 39.9,16.3Q41.3,17.7 41.3,19.65V40.45Q41.3,42.4 39.9,43.775Q38.5,45.15 36.55,45.15H11.45Q9.5,45.15 8.125,43.775Q6.75,42.4 6.75,40.45V19.65Q6.75,17.7 8.125,16.3Q9.5,14.9 11.45,14.9H13.95V11.2Q13.95,6.95 16.875,3.975Q19.8,1 24,1ZM24,5.75Q21.75,5.75 20.2,7.3Q18.65,8.85 18.65,11.2V14.9H29.35V11.2Q29.35,8.85 27.825,7.3Q26.3,5.75 24,5.75ZM11.45,40.45H36.55Q36.55,40.45 36.55,40.45Q36.55,40.45 36.55,40.45V19.65Q36.55,19.65 36.55,19.65Q36.55,19.65 36.55,19.65H11.45Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45ZM24,26.2Q22.4,26.2 21.275,27.425Q20.15,28.65 20.15,30.15Q20.15,31.7 21.275,32.8Q22.4,33.9 24,33.9Q25.6,33.9 26.725,32.8Q27.85,31.7 27.85,30.15Q27.85,28.65 26.725,27.425Q25.6,26.2 24,26.2ZM11.45,19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45V19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M24,1Q28.2,1 31.125,3.975Q34.05,6.95 34.05,11.2V14.9H36.55Q38.5,14.9 39.9,16.3Q41.3,17.7 41.3,19.65V40.45Q41.3,42.4 39.9,43.775Q38.5,45.15 36.55,45.15H11.45Q9.5,45.15 8.125,43.775Q6.75,42.4 6.75,40.45V19.65Q6.75,17.7 8.125,16.3Q9.5,14.9 11.45,14.9H13.95V11.2Q13.95,6.95 16.875,3.975Q19.8,1 24,1ZM24,5.75Q21.75,5.75 20.2,7.3Q18.65,8.85 18.65,11.2V14.9H29.35V11.2Q29.35,8.85 27.825,7.3Q26.3,5.75 24,5.75ZM11.45,40.45H36.55Q36.55,40.45 36.55,40.45Q36.55,40.45 36.55,40.45V19.65Q36.55,19.65 36.55,19.65Q36.55,19.65 36.55,19.65H11.45Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45ZM24,26.2Q22.4,26.2 21.275,27.425Q20.15,28.65 20.15,30.15Q20.15,31.7 21.275,32.8Q22.4,33.9 24,33.9Q25.6,33.9 26.725,32.8Q27.85,31.7 27.85,30.15Q27.85,28.65 26.725,27.425Q25.6,26.2 24,26.2ZM11.45,19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45V19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_lock_open.xml b/lawnchair/res/drawable/ic_lock_open.xml
index be031f848f..dcbd5e08dd 100644
--- a/lawnchair/res/drawable/ic_lock_open.xml
+++ b/lawnchair/res/drawable/ic_lock_open.xml
@@ -3,7 +3,7 @@
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M13.95,11.2Q13.95,6.8 16.875,3.9Q19.8,1 24,1Q28.2,1 31.125,3.925Q34.05,6.85 34.05,11.2V14.9H36.55Q38.55,14.9 39.925,16.275Q41.3,17.65 41.3,19.65V40.45Q41.3,42.4 39.925,43.775Q38.55,45.15 36.55,45.15H11.45Q9.45,45.15 8.1,43.775Q6.75,42.4 6.75,40.45V19.65Q6.75,17.65 8.1,16.275Q9.45,14.9 11.45,14.9H29.35V11.2Q29.35,8.8 27.8,7.275Q26.25,5.75 24,5.75Q21.75,5.75 20.2,7.275Q18.65,8.8 18.65,11.2ZM11.45,40.45H36.55Q36.55,40.45 36.55,40.45Q36.55,40.45 36.55,40.45V19.65Q36.55,19.65 36.55,19.65Q36.55,19.65 36.55,19.65H11.45Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45ZM24,26.2Q22.4,26.2 21.275,27.425Q20.15,28.65 20.15,30.15Q20.15,31.7 21.275,32.8Q22.4,33.9 24,33.9Q25.6,33.9 26.725,32.8Q27.85,31.7 27.85,30.15Q27.85,28.65 26.725,27.425Q25.6,26.2 24,26.2ZM11.45,19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45V19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.95,11.2Q13.95,6.8 16.875,3.9Q19.8,1 24,1Q28.2,1 31.125,3.925Q34.05,6.85 34.05,11.2V14.9H36.55Q38.55,14.9 39.925,16.275Q41.3,17.65 41.3,19.65V40.45Q41.3,42.4 39.925,43.775Q38.55,45.15 36.55,45.15H11.45Q9.45,45.15 8.1,43.775Q6.75,42.4 6.75,40.45V19.65Q6.75,17.65 8.1,16.275Q9.45,14.9 11.45,14.9H29.35V11.2Q29.35,8.8 27.8,7.275Q26.25,5.75 24,5.75Q21.75,5.75 20.2,7.275Q18.65,8.8 18.65,11.2ZM11.45,40.45H36.55Q36.55,40.45 36.55,40.45Q36.55,40.45 36.55,40.45V19.65Q36.55,19.65 36.55,19.65Q36.55,19.65 36.55,19.65H11.45Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45ZM24,26.2Q22.4,26.2 21.275,27.425Q20.15,28.65 20.15,30.15Q20.15,31.7 21.275,32.8Q22.4,33.9 24,33.9Q25.6,33.9 26.725,32.8Q27.85,31.7 27.85,30.15Q27.85,28.65 26.725,27.425Q25.6,26.2 24,26.2ZM11.45,19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65V40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45Q11.45,40.45 11.45,40.45V19.65Q11.45,19.65 11.45,19.65Q11.45,19.65 11.45,19.65Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_locked_recents.xml b/lawnchair/res/drawable/ic_locked_recents.xml
index 3d6806bfa7..82733640b4 100644
--- a/lawnchair/res/drawable/ic_locked_recents.xml
+++ b/lawnchair/res/drawable/ic_locked_recents.xml
@@ -22,5 +22,5 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_message.xml b/lawnchair/res/drawable/ic_message.xml
index c78ffba88b..74c355f175 100644
--- a/lawnchair/res/drawable/ic_message.xml
+++ b/lawnchair/res/drawable/ic_message.xml
@@ -1,9 +1,15 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
     android:tint="?android:attr/textColorPrimary"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
         android:pathData="M7,9H17M7,13H17M21,20L17.676,18.338C17.424,18.212 17.298,18.149 17.166,18.104C17.048,18.065 16.928,18.037 16.805,18.019C16.667,18 16.526,18 16.245,18H6.2C5.08,18 4.52,18 4.092,17.782C3.716,17.59 3.41,17.284 3.218,16.908C3,16.48 3,15.92 3,14.8V7.2C3,6.08 3,5.52 3.218,5.092C3.41,4.716 3.716,4.41 4.092,4.218C4.52,4 5.08,4 6.2,4H17.8C18.92,4 19.48,4 19.908,4.218C20.284,4.41 20.59,4.716 20.782,5.092C21,5.52 21,6.08 21,7.2V20Z"
-        android:strokeColor="#000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_mic_color.xml b/lawnchair/res/drawable/ic_mic_color.xml
index e322c36075..8addd7c493 100644
--- a/lawnchair/res/drawable/ic_mic_color.xml
+++ b/lawnchair/res/drawable/ic_mic_color.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@id/qsbIconTintPrimary" android:drawable="@drawable/ic_mic_color_1" />
-    <item android:id="@id/qsbIconTintSecondary" android:drawable="@drawable/ic_mic_color_2" />
-    <item android:id="@id/qsbIconTintTertiary" android:drawable="@drawable/ic_mic_color_3" />
-    <item android:id="@id/qsbIconTintQuaternary" android:drawable="@drawable/ic_mic_color_4" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@id/qsbIconTintPrimary"
+        android:drawable="@drawable/ic_mic_color_1" />
+    <item
+        android:id="@id/qsbIconTintSecondary"
+        android:drawable="@drawable/ic_mic_color_2" />
+    <item
+        android:id="@id/qsbIconTintTertiary"
+        android:drawable="@drawable/ic_mic_color_3" />
+    <item
+        android:id="@id/qsbIconTintQuaternary"
+        android:drawable="@drawable/ic_mic_color_4" />
 </layer-list>
diff --git a/lawnchair/res/drawable/ic_music_note.xml b/lawnchair/res/drawable/ic_music_note.xml
index 31ecdefe6f..61c65e49c3 100644
--- a/lawnchair/res/drawable/ic_music_note.xml
+++ b/lawnchair/res/drawable/ic_music_note.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M12,3V12.26C11.5,12.09 11,12 10.5,12C8,12 6,14 6,16.5C6,19 8,21 10.5,21C13,21 15,19 15,16.5V6H19V3H12Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M12,3V12.26C11.5,12.09 11,12 10.5,12C8,12 6,14 6,16.5C6,19 8,21 10.5,21C13,21 15,19 15,16.5V6H19V3H12Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_new_releases.xml b/lawnchair/res/drawable/ic_new_releases.xml
index daf56736b6..8440025870 100644
--- a/lawnchair/res/drawable/ic_new_releases.xml
+++ b/lawnchair/res/drawable/ic_new_releases.xml
@@ -3,10 +3,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M22.421,12.6597C22.7523,12.2823 22.7523,11.7178 22.421,11.3404L20.56,9.22L20.8193,6.413C20.8655,5.9134 20.5343,5.457 20.0451,5.3458L17.29,4.72L15.8482,2.2941C15.5917,1.8626 15.0552,1.6881 14.594,1.8862L12,3L9.406,1.8862C8.9448,1.6881 8.4083,1.8626 8.1518,2.2941L6.71,4.72L3.9577,5.3376C3.4672,5.4476 3.1346,5.9047 3.1809,6.4053L3.44,9.21L1.5768,11.3405C1.2466,11.718 1.2471,12.2816 1.5779,12.6585L3.44,14.78L3.1804,17.5973C3.1344,18.0968 3.4655,18.5531 3.9547,18.6642L6.71,19.29L8.1507,21.7141C8.4076,22.1464 8.9456,22.3206 9.4072,22.1211L12,21L14.594,22.1139C15.0552,22.312 15.5917,22.1374 15.8482,21.706L17.29,19.28L20.0451,18.6542C20.5343,18.5431 20.8655,18.0866 20.8193,17.5871L20.56,14.78L22.421,12.6597ZM18.49,14.11L18.75,16.9L16.01,17.52L14.58,19.93L12,18.82L9.42,19.93L7.99,17.52L5.25,16.9L5.51,14.1L3.66,12L5.51,9.88L5.25,7.1L7.99,6.49L9.42,4.08L12,5.18L14.58,4.07L16.01,6.48L18.75,7.1L18.49,9.89L20.34,12L18.49,14.11ZM11,8C11,7.4478 11.4477,7 12,7V7C12.5523,7 13,7.4478 13,8V12C13,12.5523 12.5523,13 12,13V13C11.4477,13 11,12.5523 11,12V8Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#000000"
+        android:pathData="M22.421,12.6597C22.7523,12.2823 22.7523,11.7178 22.421,11.3404L20.56,9.22L20.8193,6.413C20.8655,5.9134 20.5343,5.457 20.0451,5.3458L17.29,4.72L15.8482,2.2941C15.5917,1.8626 15.0552,1.6881 14.594,1.8862L12,3L9.406,1.8862C8.9448,1.6881 8.4083,1.8626 8.1518,2.2941L6.71,4.72L3.9577,5.3376C3.4672,5.4476 3.1346,5.9047 3.1809,6.4053L3.44,9.21L1.5768,11.3405C1.2466,11.718 1.2471,12.2816 1.5779,12.6585L3.44,14.78L3.1804,17.5973C3.1344,18.0968 3.4655,18.5531 3.9547,18.6642L6.71,19.29L8.1507,21.7141C8.4076,22.1464 8.9456,22.3206 9.4072,22.1211L12,21L14.594,22.1139C15.0552,22.312 15.5917,22.1374 15.8482,21.706L17.29,19.28L20.0451,18.6542C20.5343,18.5431 20.8655,18.0866 20.8193,17.5871L20.56,14.78L22.421,12.6597ZM18.49,14.11L18.75,16.9L16.01,17.52L14.58,19.93L12,18.82L9.42,19.93L7.99,17.52L5.25,16.9L5.51,14.1L3.66,12L5.51,9.88L5.25,7.1L7.99,6.49L9.42,4.08L12,5.18L14.58,4.07L16.01,6.48L18.75,7.1L18.49,9.89L20.34,12L18.49,14.11ZM11,8C11,7.4478 11.4477,7 12,7V7C12.5523,7 13,7.4478 13,8V12C13,12.5523 12.5523,13 12,13V13C11.4477,13 11,12.5523 11,12V8Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_phone.xml b/lawnchair/res/drawable/ic_phone.xml
index cf2264f3d2..19f9a9d9f1 100644
--- a/lawnchair/res/drawable/ic_phone.xml
+++ b/lawnchair/res/drawable/ic_phone.xml
@@ -1,9 +1,15 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
     android:tint="?android:attr/textColorPrimary"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
         android:pathData="M18.604,12.727L15.565,9.087C15.257,8.691 15.103,8.493 15.023,8.271C14.951,8.074 14.922,7.865 14.936,7.656C14.952,7.421 15.045,7.188 15.231,6.722L15.942,4.945C16.218,4.256 16.356,3.911 16.593,3.685C16.803,3.486 17.066,3.352 17.35,3.299C17.672,3.238 18.032,3.328 18.752,3.508L20.72,4C20.72,14 13.72,21 3.72,21L3.228,19.032C3.048,18.312 2.958,17.952 3.019,17.63C3.072,17.346 3.206,17.083 3.405,16.873C3.631,16.636 3.976,16.498 4.665,16.222L6.251,15.588C6.782,15.375 7.048,15.269 7.313,15.261C7.547,15.254 7.779,15.301 7.992,15.4C8.232,15.512 8.434,15.714 8.839,16.119L11.925,19.157"
-        android:strokeColor="#000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_pr_lock.xml b/lawnchair/res/drawable/ic_pr_lock.xml
index 055e6b43f0..6fa13819ff 100644
--- a/lawnchair/res/drawable/ic_pr_lock.xml
+++ b/lawnchair/res/drawable/ic_pr_lock.xml
@@ -20,5 +20,5 @@
     android:viewportHeight="960">
     <path
         android:fillColor="?attr/materialColorOnPrimaryFixed"
-        android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792L264,792Z"/>
+        android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792L264,792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_presearch.xml b/lawnchair/res/drawable/ic_presearch.xml
index 57b199a773..77ab6a1bf4 100644
--- a/lawnchair/res/drawable/ic_presearch.xml
+++ b/lawnchair/res/drawable/ic_presearch.xml
@@ -1,7 +1,18 @@
-<vector android:height="24dp" android:viewportHeight="31.5"
-    android:viewportWidth="31.5" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M2,1.88h27.5v27.5h-27.5z"/>
-    <path android:fillColor="#2d8eff" android:pathData="M11.32,19.39h2.94a5.68,5.68 0,0 0,2.43 -0.55,6.08 6.08,0 0,0 1.89,-1.45 6.71,6.71 0,0 0,1.2 -2.11,6.94 6.94,0 0,0 0.44,-2.44 6.06,6.06 0,0 0,-0.47 -2.36,7.31 7.31,0 0,0 -1.27,-2.07 6.33,6.33 0,0 0,-1.93 -1.49,5.22 5.22,0 0,0 -2.44,-0.58L6.37,6.34L6.37,25.13h5ZM11.32,10.88h2.5a1.34,1.34 0,0 1,0.91 0.44,2.2 2.2,0 0,1 0.47,1.59 2.12,2.12 0,0 1,-0.43 1.53,1.12 1.12,0 0,1 -0.84,0.44L11.32,14.88Z"/>
-    <path android:fillColor="#2d8eff" android:pathData="M0,1.81L0,29.69A1.81,1.81 0,0 0,1.81 31.5L29.69,31.5a1.81,1.81 0,0 0,1.81 -1.81L31.5,1.81A1.81,1.81 0,0 0,29.69 0L1.81,0A1.81,1.81 0,0 0,0 1.81ZM26,27.81L5.48,27.81A1.81,1.81 0,0 1,3.67 26L3.67,5.48A1.81,1.81 0,0 1,5.48 3.67L26,3.67a1.81,1.81 0,0 1,1.81 1.81L27.81,26A1.81,1.81 0,0 1,26 27.79Z"/>
-    <path android:fillColor="#2d8eff" android:pathData="M13.53,21.6h11.59v3.56h-11.59z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="31.5"
+    android:viewportHeight="31.5">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M2,1.88h27.5v27.5h-27.5z" />
+    <path
+        android:fillColor="#2d8eff"
+        android:pathData="M11.32,19.39h2.94a5.68,5.68 0,0 0,2.43 -0.55,6.08 6.08,0 0,0 1.89,-1.45 6.71,6.71 0,0 0,1.2 -2.11,6.94 6.94,0 0,0 0.44,-2.44 6.06,6.06 0,0 0,-0.47 -2.36,7.31 7.31,0 0,0 -1.27,-2.07 6.33,6.33 0,0 0,-1.93 -1.49,5.22 5.22,0 0,0 -2.44,-0.58L6.37,6.34L6.37,25.13h5ZM11.32,10.88h2.5a1.34,1.34 0,0 1,0.91 0.44,2.2 2.2,0 0,1 0.47,1.59 2.12,2.12 0,0 1,-0.43 1.53,1.12 1.12,0 0,1 -0.84,0.44L11.32,14.88Z" />
+    <path
+        android:fillColor="#2d8eff"
+        android:pathData="M0,1.81L0,29.69A1.81,1.81 0,0 0,1.81 31.5L29.69,31.5a1.81,1.81 0,0 0,1.81 -1.81L31.5,1.81A1.81,1.81 0,0 0,29.69 0L1.81,0A1.81,1.81 0,0 0,0 1.81ZM26,27.81L5.48,27.81A1.81,1.81 0,0 1,3.67 26L3.67,5.48A1.81,1.81 0,0 1,5.48 3.67L26,3.67a1.81,1.81 0,0 1,1.81 1.81L27.81,26A1.81,1.81 0,0 1,26 27.79Z" />
+    <path
+        android:fillColor="#2d8eff"
+        android:pathData="M13.53,21.6h11.59v3.56h-11.59z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_presearch_tinted.xml b/lawnchair/res/drawable/ic_presearch_tinted.xml
index a2c4e8c9f3..56817728f2 100644
--- a/lawnchair/res/drawable/ic_presearch_tinted.xml
+++ b/lawnchair/res/drawable/ic_presearch_tinted.xml
@@ -1,6 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="31.5"
-    android:viewportWidth="31.5" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M11.32,19.39h2.94a5.68,5.68 0,0 0,2.43 -0.55,6.08 6.08,0 0,0 1.89,-1.45 6.71,6.71 0,0 0,1.2 -2.11,6.94 6.94,0 0,0 0.44,-2.44 6.06,6.06 0,0 0,-0.47 -2.36,7.31 7.31,0 0,0 -1.27,-2.07 6.33,6.33 0,0 0,-1.93 -1.49,5.22 5.22,0 0,0 -2.44,-0.58L6.37,6.34L6.37,25.13h5ZM11.32,10.88h2.5a1.34,1.34 0,0 1,0.91 0.44,2.2 2.2,0 0,1 0.47,1.59 2.12,2.12 0,0 1,-0.43 1.53,1.12 1.12,0 0,1 -0.84,0.44L11.32,14.88Z"/>
-    <path android:fillColor="#000000" android:pathData="M0,1.81L0,29.69A1.81,1.81 0,0 0,1.81 31.5L29.69,31.5a1.81,1.81 0,0 0,1.81 -1.81L31.5,1.81A1.81,1.81 0,0 0,29.69 0L1.81,0A1.81,1.81 0,0 0,0 1.81ZM26,27.81L5.48,27.81A1.81,1.81 0,0 1,3.67 26L3.67,5.48A1.81,1.81 0,0 1,5.48 3.67L26,3.67a1.81,1.81 0,0 1,1.81 1.81L27.81,26A1.81,1.81 0,0 1,26 27.79Z"/>
-    <path android:fillColor="#000000" android:pathData="M13.53,21.6h11.59v3.56h-11.59z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="31.5"
+    android:viewportHeight="31.5">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11.32,19.39h2.94a5.68,5.68 0,0 0,2.43 -0.55,6.08 6.08,0 0,0 1.89,-1.45 6.71,6.71 0,0 0,1.2 -2.11,6.94 6.94,0 0,0 0.44,-2.44 6.06,6.06 0,0 0,-0.47 -2.36,7.31 7.31,0 0,0 -1.27,-2.07 6.33,6.33 0,0 0,-1.93 -1.49,5.22 5.22,0 0,0 -2.44,-0.58L6.37,6.34L6.37,25.13h5ZM11.32,10.88h2.5a1.34,1.34 0,0 1,0.91 0.44,2.2 2.2,0 0,1 0.47,1.59 2.12,2.12 0,0 1,-0.43 1.53,1.12 1.12,0 0,1 -0.84,0.44L11.32,14.88Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M0,1.81L0,29.69A1.81,1.81 0,0 0,1.81 31.5L29.69,31.5a1.81,1.81 0,0 0,1.81 -1.81L31.5,1.81A1.81,1.81 0,0 0,29.69 0L1.81,0A1.81,1.81 0,0 0,0 1.81ZM26,27.81L5.48,27.81A1.81,1.81 0,0 1,3.67 26L3.67,5.48A1.81,1.81 0,0 1,5.48 3.67L26,3.67a1.81,1.81 0,0 1,1.81 1.81L27.81,26A1.81,1.81 0,0 1,26 27.79Z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13.53,21.6h11.59v3.56h-11.59z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_qsb_search.xml b/lawnchair/res/drawable/ic_qsb_search.xml
index d836838238..30ecd64b33 100644
--- a/lawnchair/res/drawable/ic_qsb_search.xml
+++ b/lawnchair/res/drawable/ic_qsb_search.xml
@@ -16,9 +16,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="18.0"
+    android:autoMirrored="true"
     android:viewportWidth="18.0"
-    android:autoMirrored="true">
+    android:viewportHeight="18.0">
     <path
         android:fillColor="#ffffff"
         android:pathData="M12.5 11H11.71L11.43 10.73C12.63 9.33001 13.25 7.42002 12.91 5.39002C12.44 2.61002 10.12 0.390015 7.32001 0.0500152C3.09001 -0.469985 -0.469985 3.09001 0.0500152 7.32001C0.390015 10.12 2.61002 12.44 5.39002 12.91C7.42002 13.25 9.33001 12.63 10.73 11.43L11 11.71V12.5L15.25 16.75C15.66 17.16 16.33 17.16 16.74 16.75C17.15 16.34 17.15 15.67 16.74 15.26L12.5 11ZM6.50002 11C4.01002 11 2.00002 8.99002 2.00002 6.50002C2.00002 4.01002 4.01002 2.00002 6.50002 2.00002C8.99002 2.00002 11 4.01002 11 6.50002C11 8.99002 8.99002 11 6.50002 11Z" />
diff --git a/lawnchair/res/drawable/ic_quickstep.xml b/lawnchair/res/drawable/ic_quickstep.xml
index b9c707a26c..4dfe644416 100644
--- a/lawnchair/res/drawable/ic_quickstep.xml
+++ b/lawnchair/res/drawable/ic_quickstep.xml
@@ -3,14 +3,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M9,2C7.3432,2 6,3.3431 6,5V19C6,20.6569 7.3432,22 9,22H15C16.6569,22 18,20.6569 18,19V5C18,3.3431 16.6569,2 15,2H9ZM9,4C8.4477,4 8,4.4477 8,5V19C8,19.5523 8.4477,20 9,20H15C15.5523,20 16,19.5523 16,19V5C16,4.4477 15.5523,4 15,4H9Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M21,6L21,6A1,1 0,0 1,22 7L22,17A1,1 0,0 1,21 18L21,18A1,1 0,0 1,20 17L20,7A1,1 0,0 1,21 6z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M3,6L3,6A1,1 0,0 1,4 7L4,17A1,1 0,0 1,3 18L3,18A1,1 0,0 1,2 17L2,7A1,1 0,0 1,3 6z"
-      android:fillColor="#ffffff"/>
+    <path
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M9,2C7.3432,2 6,3.3431 6,5V19C6,20.6569 7.3432,22 9,22H15C16.6569,22 18,20.6569 18,19V5C18,3.3431 16.6569,2 15,2H9ZM9,4C8.4477,4 8,4.4477 8,5V19C8,19.5523 8.4477,20 9,20H15C15.5523,20 16,19.5523 16,19V5C16,4.4477 15.5523,4 15,4H9Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M21,6L21,6A1,1 0,0 1,22 7L22,17A1,1 0,0 1,21 18L21,18A1,1 0,0 1,20 17L20,7A1,1 0,0 1,21 6z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M3,6L3,6A1,1 0,0 1,4 7L4,17A1,1 0,0 1,3 18L3,18A1,1 0,0 1,2 17L2,7A1,1 0,0 1,3 6z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_recent.xml b/lawnchair/res/drawable/ic_recent.xml
index 441d117517..b413757d4c 100644
--- a/lawnchair/res/drawable/ic_recent.xml
+++ b/lawnchair/res/drawable/ic_recent.xml
@@ -1,8 +1,14 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
         android:pathData="M4,12C4,16.418 7.582,20 12,20C16.418,20 20,16.418 20,12C20,7.582 16.418,4 12,4C9.611,4 7.466,5.048 6,6.708C5.916,6.804 5.834,6.901 5.755,7M12,8V12L14.5,14.5M5.754,4.004V7.004H8.754"
-        android:strokeColor="#000000" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_screenshot.xml b/lawnchair/res/drawable/ic_screenshot.xml
index b2493c3f7d..b05fd5a3df 100644
--- a/lawnchair/res/drawable/ic_screenshot.xml
+++ b/lawnchair/res/drawable/ic_screenshot.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="20.0dip" android:width="20.0dip" android:viewportWidth="20.0" android:viewportHeight="20.0"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff000000" android:pathData="M5.8334,1.666H8.3334V3.3327H5.8334V6.666H4.1667V3.3327C4.1667,2.4122 4.9129,1.666 5.8334,1.666Z" />
-    <path android:fillColor="#ff000000" android:pathData="M4.1667,13.3327V16.666C4.1667,17.5865 4.9129,18.3327 5.8334,18.3327H8.3334V16.666H5.8334V13.3327H4.1667Z" />
-    <path android:fillColor="#ff000000" android:pathData="M14.1667,13.3327V16.666H11.6667V18.3327H14.1667C15.0872,18.3327 15.8334,17.5865 15.8334,16.666V13.3327H14.1667Z" />
-    <path android:fillColor="#ff000000" android:pathData="M15.8334,6.666V3.3327C15.8334,2.4122 15.0872,1.666 14.1667,1.666H11.6667V3.3327H14.1667V6.666H15.8334Z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20.0dip"
+    android:height="20.0dip"
+    android:viewportWidth="20.0"
+    android:viewportHeight="20.0">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M5.8334,1.666H8.3334V3.3327H5.8334V6.666H4.1667V3.3327C4.1667,2.4122 4.9129,1.666 5.8334,1.666Z" />
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M4.1667,13.3327V16.666C4.1667,17.5865 4.9129,18.3327 5.8334,18.3327H8.3334V16.666H5.8334V13.3327H4.1667Z" />
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M14.1667,13.3327V16.666H11.6667V18.3327H14.1667C15.0872,18.3327 15.8334,17.5865 15.8334,16.666V13.3327H14.1667Z" />
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M15.8334,6.666V3.3327C15.8334,2.4122 15.0872,1.666 14.1667,1.666H11.6667V3.3327H14.1667V6.666H15.8334Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_search.xml b/lawnchair/res/drawable/ic_search.xml
index 594dd5617d..b5f19cd697 100644
--- a/lawnchair/res/drawable/ic_search.xml
+++ b/lawnchair/res/drawable/ic_search.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
-    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
 
 </vector>
diff --git a/lawnchair/res/drawable/ic_smartspace_preferences.xml b/lawnchair/res/drawable/ic_smartspace_preferences.xml
index bcf14ef1d4..ce11e33362 100644
--- a/lawnchair/res/drawable/ic_smartspace_preferences.xml
+++ b/lawnchair/res/drawable/ic_smartspace_preferences.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
     <path android:pathData="M0 0h24v24H0z" />
     <path
@@ -13,4 +13,4 @@
             7l-1.4-2.5zm-7.63 5.29c-0.39-0.39-1.02-0.39-1.41 0L1.29 18.96c-0.39 0.39 -0.39 1.02 0
             1.41l2.34 2.34c0.39 0.39 1.02 0.39 1.41 0L16.7 11.05c0.39-0.39 0.39 -1.02
             0-1.41l-2.33-2.35zm-1.03 5.49l-2.12-2.12 2.44-2.44 2.12 2.12-2.44 2.44z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/lawnchair/res/drawable/ic_startpage.xml b/lawnchair/res/drawable/ic_startpage.xml
index d00a87ae9b..3f93f7c618 100644
--- a/lawnchair/res/drawable/ic_startpage.xml
+++ b/lawnchair/res/drawable/ic_startpage.xml
@@ -4,25 +4,27 @@
     android:height="24.0dip"
     android:viewportWidth="157"
     android:viewportHeight="157">
-  <group>
-    <clip-path
-        android:pathData="M8.04,0h141v157h-141z"/>
-    <path
-        android:pathData="m33.54,56.04c0.65,-16.96 14.83,-30.68 32.13,-30.68 16.65,0 30.31,12.55 32,28.73 8.58,0.13 17.04,0.26 25.62,0.65C121.73,24.33 96.49,0 65.67,0 33.93,0 8.04,25.76 8.04,57.34c0,0.39 0,0.78 0,1.16 8.45,-1.04 17.04,-1.81 25.49,-2.46z">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:startX="16.59"
-            android:startY="34.18"
-            android:endX="109.52"
-            android:endY="34.18"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF6677FB"/>
-          <item android:offset="1" android:color="#FF29DDCC"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-    <path
-        android:pathData="m110.41,93.32 l0.26,-0.39c6.63,-8.28 10.67,-17.86 12.1,-28.22 -8.72,0 -17.3,0 -26.01,0.26 -3.51,13.98 -16.13,24.2 -31.09,24.2 -13.4,0 -24.97,-8.28 -29.79,-19.93 -8.58,0.91 -17.17,2.07 -25.75,3.37 6.76,24.2 29.14,41.94 55.54,41.94 8.45,0 16.78,-1.81 24.45,-5.44l0.39,-0.13 0.26,0.26 35.64,43.23c2.47,2.98 5.98,4.66 9.89,4.66 2.99,0 5.85,-1.04 8.06,-2.85 2.6,-2.2 4.29,-5.18 4.55,-8.54 0.26,-3.37 -0.65,-6.6 -2.86,-9.32z"
-        android:fillColor="#202c46"/>
-  </group>
+    <group>
+        <clip-path android:pathData="M8.04,0h141v157h-141z" />
+        <path android:pathData="m33.54,56.04c0.65,-16.96 14.83,-30.68 32.13,-30.68 16.65,0 30.31,12.55 32,28.73 8.58,0.13 17.04,0.26 25.62,0.65C121.73,24.33 96.49,0 65.67,0 33.93,0 8.04,25.76 8.04,57.34c0,0.39 0,0.78 0,1.16 8.45,-1.04 17.04,-1.81 25.49,-2.46z">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="109.52"
+                    android:endY="34.18"
+                    android:startX="16.59"
+                    android:startY="34.18"
+                    android:type="linear">
+                    <item
+                        android:color="#FF6677FB"
+                        android:offset="0" />
+                    <item
+                        android:color="#FF29DDCC"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:fillColor="#202c46"
+            android:pathData="m110.41,93.32 l0.26,-0.39c6.63,-8.28 10.67,-17.86 12.1,-28.22 -8.72,0 -17.3,0 -26.01,0.26 -3.51,13.98 -16.13,24.2 -31.09,24.2 -13.4,0 -24.97,-8.28 -29.79,-19.93 -8.58,0.91 -17.17,2.07 -25.75,3.37 6.76,24.2 29.14,41.94 55.54,41.94 8.45,0 16.78,-1.81 24.45,-5.44l0.39,-0.13 0.26,0.26 35.64,43.23c2.47,2.98 5.98,4.66 9.89,4.66 2.99,0 5.85,-1.04 8.06,-2.85 2.6,-2.2 4.29,-5.18 4.55,-8.54 0.26,-3.37 -0.65,-6.6 -2.86,-9.32z" />
+    </group>
 </vector>
diff --git a/lawnchair/res/drawable/ic_super_g_color.xml b/lawnchair/res/drawable/ic_super_g_color.xml
index 1385a9a117..84c7500e3f 100644
--- a/lawnchair/res/drawable/ic_super_g_color.xml
+++ b/lawnchair/res/drawable/ic_super_g_color.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@id/qsbIconTintPrimary" android:drawable="@drawable/ic_super_g_color_1" />
-  <item android:id="@id/qsbIconTintSecondary" android:drawable="@drawable/ic_super_g_color_2" />
-  <item android:id="@id/qsbIconTintTertiary" android:drawable="@drawable/ic_super_g_color_3" />
-  <item android:id="@id/qsbIconTintQuaternary" android:drawable="@drawable/ic_super_g_color_4" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@id/qsbIconTintPrimary"
+        android:drawable="@drawable/ic_super_g_color_1" />
+    <item
+        android:id="@id/qsbIconTintSecondary"
+        android:drawable="@drawable/ic_super_g_color_2" />
+    <item
+        android:id="@id/qsbIconTintTertiary"
+        android:drawable="@drawable/ic_super_g_color_3" />
+    <item
+        android:id="@id/qsbIconTintQuaternary"
+        android:drawable="@drawable/ic_super_g_color_4" />
 </layer-list>
diff --git a/lawnchair/res/drawable/ic_super_g_color_1.xml b/lawnchair/res/drawable/ic_super_g_color_1.xml
index 2bbf94728a..c414f757a5 100644
--- a/lawnchair/res/drawable/ic_super_g_color_1.xml
+++ b/lawnchair/res/drawable/ic_super_g_color_1.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M23.49,12.27C23.49,11.48 23.42,10.73 23.3,10H12V14.51H18.47C18.18,15.99 17.33,17.24 16.07,18.09V21.09H19.93C22.19,19 23.49,15.92 23.49,12.27Z"
-        android:fillColor="#4285F4"/>
+        android:fillColor="#4285F4"
+        android:pathData="M23.49,12.27C23.49,11.48 23.42,10.73 23.3,10H12V14.51H18.47C18.18,15.99 17.33,17.24 16.07,18.09V21.09H19.93C22.19,19 23.49,15.92 23.49,12.27Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_super_g_color_2.xml b/lawnchair/res/drawable/ic_super_g_color_2.xml
index b14587d2f3..6421e14d4c 100644
--- a/lawnchair/res/drawable/ic_super_g_color_2.xml
+++ b/lawnchair/res/drawable/ic_super_g_color_2.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M12,24C15.24,24 17.95,22.92 19.93,21.09L16.07,18.09C14.99,18.81 13.62,19.25 12,19.25C8.87,19.25 6.22,17.14 5.27,14.29H1.29V17.38C3.26,21.3 7.31,24 12,24Z"
-        android:fillColor="#34A853"/>
+        android:fillColor="#34A853"
+        android:pathData="M12,24C15.24,24 17.95,22.92 19.93,21.09L16.07,18.09C14.99,18.81 13.62,19.25 12,19.25C8.87,19.25 6.22,17.14 5.27,14.29H1.29V17.38C3.26,21.3 7.31,24 12,24Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_super_g_color_4.xml b/lawnchair/res/drawable/ic_super_g_color_4.xml
index 2dca6c8df9..f960cac65c 100644
--- a/lawnchair/res/drawable/ic_super_g_color_4.xml
+++ b/lawnchair/res/drawable/ic_super_g_color_4.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M12,4.75C13.77,4.75 15.35,5.36 16.6,6.55L20.02,3.13C17.95,1.19 15.24,0 12,0C7.31,0 3.26,2.7 1.29,6.62L5.27,9.71C6.22,6.86 8.87,4.75 12,4.75Z"
-        android:fillColor="#EA4335"/>
+        android:fillColor="#EA4335"
+        android:pathData="M12,4.75C13.77,4.75 15.35,5.36 16.6,6.55L20.02,3.13C17.95,1.19 15.24,0 12,0C7.31,0 3.26,2.7 1.29,6.62L5.27,9.71C6.22,6.86 8.87,4.75 12,4.75Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_tick.xml b/lawnchair/res/drawable/ic_tick.xml
index 6a50cf0d11..325e4fb6c4 100644
--- a/lawnchair/res/drawable/ic_tick.xml
+++ b/lawnchair/res/drawable/ic_tick.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M9,16.2l-3.5,-3.5c-0.39,-0.39 -1.01,-0.39 -1.4,0 -0.39,0.39 -0.39,1.01 0,1.4l4.19,4.19c0.39,0.39 1.02,0.39 1.41,0L20.3,7.7c0.39,-0.39 0.39,-1.01 0,-1.4 -0.39,-0.39 -1.01,-0.39 -1.4,0L9,16.2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.2l-3.5,-3.5c-0.39,-0.39 -1.01,-0.39 -1.4,0 -0.39,0.39 -0.39,1.01 0,1.4l4.19,4.19c0.39,0.39 1.02,0.39 1.41,0L20.3,7.7c0.39,-0.39 0.39,-1.01 0,-1.4 -0.39,-0.39 -1.01,-0.39 -1.4,0L9,16.2z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_transient_taskbar_all_apps_button.xml b/lawnchair/res/drawable/ic_transient_taskbar_all_apps_button.xml
index 6e740aed4f..a9fe81ca76 100644
--- a/lawnchair/res/drawable/ic_transient_taskbar_all_apps_button.xml
+++ b/lawnchair/res/drawable/ic_transient_taskbar_all_apps_button.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2023 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.
@@ -18,31 +17,31 @@
     android:height="48dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
-  <path
-      android:pathData="M13.5,17C12.538,17 11.715,16.65 11.033,15.967C10.35,15.285 10,14.462 10,13.5C10,12.538 10.35,11.715 11.033,11.033C11.715,10.35 12.538,10 13.5,10C14.462,10 15.285,10.35 15.967,11.033C16.65,11.715 17,12.538 17,13.5C17,14.462 16.65,15.285 15.967,15.967C15.285,16.65 14.462,17 13.5,17Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M24,17C23.038,17 22.215,16.65 21.532,15.967C20.85,15.285 20.5,14.462 20.5,13.5C20.5,12.538 20.85,11.715 21.532,11.033C22.215,10.35 23.038,10 24,10C24.962,10 25.785,10.35 26.468,11.033C27.15,11.715 27.5,12.538 27.5,13.5C27.5,14.462 27.15,15.285 26.468,15.967C25.785,16.65 24.962,17 24,17Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M34.5,17C33.537,17 32.715,16.65 32.033,15.967C31.35,15.285 31,14.462 31,13.5C31,12.538 31.35,11.715 32.033,11.033C32.715,10.35 33.537,10 34.5,10C35.463,10 36.285,10.35 36.967,11.033C37.65,11.715 38,12.538 38,13.5C38,14.462 37.65,15.285 36.967,15.967C36.285,16.65 35.463,17 34.5,17Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M13.5,27.5C12.538,27.5 11.715,27.15 11.033,26.468C10.35,25.785 10,24.962 10,24C10,23.038 10.35,22.215 11.033,21.532C11.715,20.85 12.538,20.5 13.5,20.5C14.462,20.5 15.285,20.85 15.967,21.532C16.65,22.215 17,23.038 17,24C17,24.962 16.65,25.785 15.967,26.468C15.285,27.15 14.462,27.5 13.5,27.5Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M24,27.5C23.038,27.5 22.215,27.15 21.532,26.468C20.85,25.785 20.5,24.962 20.5,24C20.5,23.038 20.85,22.215 21.532,21.532C22.215,20.85 23.038,20.5 24,20.5C24.962,20.5 25.785,20.85 26.468,21.532C27.15,22.215 27.5,23.038 27.5,24C27.5,24.962 27.15,25.785 26.468,26.468C25.785,27.15 24.962,27.5 24,27.5Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M34.5,27.5C33.537,27.5 32.715,27.15 32.033,26.468C31.35,25.785 31,24.962 31,24C31,23.038 31.35,22.215 32.033,21.532C32.715,20.85 33.537,20.5 34.5,20.5C35.463,20.5 36.285,20.85 36.967,21.532C37.65,22.215 38,23.038 38,24C38,24.962 37.65,25.785 36.967,26.468C36.285,27.15 35.463,27.5 34.5,27.5Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M13.5,38C12.538,38 11.715,37.65 11.033,36.967C10.35,36.285 10,35.463 10,34.5C10,33.537 10.35,32.715 11.033,32.033C11.715,31.35 12.538,31 13.5,31C14.462,31 15.285,31.35 15.967,32.033C16.65,32.715 17,33.537 17,34.5C17,35.463 16.65,36.285 15.967,36.967C15.285,37.65 14.462,38 13.5,38Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M24,38C23.038,38 22.215,37.65 21.532,36.967C20.85,36.285 20.5,35.463 20.5,34.5C20.5,33.537 20.85,32.715 21.532,32.033C22.215,31.35 23.038,31 24,31C24.962,31 25.785,31.35 26.468,32.033C27.15,32.715 27.5,33.537 27.5,34.5C27.5,35.463 27.15,36.285 26.468,36.967C25.785,37.65 24.962,38 24,38Z"
-      android:fillColor="#40484B"/>
-  <path
-      android:pathData="M34.5,38C33.537,38 32.715,37.65 32.033,36.967C31.35,36.285 31,35.463 31,34.5C31,33.537 31.35,32.715 32.033,32.033C32.715,31.35 33.537,31 34.5,31C35.463,31 36.285,31.35 36.967,32.033C37.65,32.715 38,33.537 38,34.5C38,35.463 37.65,36.285 36.967,36.967C36.285,37.65 35.463,38 34.5,38Z"
-      android:fillColor="#40484B"/>
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M13.5,17C12.538,17 11.715,16.65 11.033,15.967C10.35,15.285 10,14.462 10,13.5C10,12.538 10.35,11.715 11.033,11.033C11.715,10.35 12.538,10 13.5,10C14.462,10 15.285,10.35 15.967,11.033C16.65,11.715 17,12.538 17,13.5C17,14.462 16.65,15.285 15.967,15.967C15.285,16.65 14.462,17 13.5,17Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M24,17C23.038,17 22.215,16.65 21.532,15.967C20.85,15.285 20.5,14.462 20.5,13.5C20.5,12.538 20.85,11.715 21.532,11.033C22.215,10.35 23.038,10 24,10C24.962,10 25.785,10.35 26.468,11.033C27.15,11.715 27.5,12.538 27.5,13.5C27.5,14.462 27.15,15.285 26.468,15.967C25.785,16.65 24.962,17 24,17Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M34.5,17C33.537,17 32.715,16.65 32.033,15.967C31.35,15.285 31,14.462 31,13.5C31,12.538 31.35,11.715 32.033,11.033C32.715,10.35 33.537,10 34.5,10C35.463,10 36.285,10.35 36.967,11.033C37.65,11.715 38,12.538 38,13.5C38,14.462 37.65,15.285 36.967,15.967C36.285,16.65 35.463,17 34.5,17Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M13.5,27.5C12.538,27.5 11.715,27.15 11.033,26.468C10.35,25.785 10,24.962 10,24C10,23.038 10.35,22.215 11.033,21.532C11.715,20.85 12.538,20.5 13.5,20.5C14.462,20.5 15.285,20.85 15.967,21.532C16.65,22.215 17,23.038 17,24C17,24.962 16.65,25.785 15.967,26.468C15.285,27.15 14.462,27.5 13.5,27.5Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M24,27.5C23.038,27.5 22.215,27.15 21.532,26.468C20.85,25.785 20.5,24.962 20.5,24C20.5,23.038 20.85,22.215 21.532,21.532C22.215,20.85 23.038,20.5 24,20.5C24.962,20.5 25.785,20.85 26.468,21.532C27.15,22.215 27.5,23.038 27.5,24C27.5,24.962 27.15,25.785 26.468,26.468C25.785,27.15 24.962,27.5 24,27.5Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M34.5,27.5C33.537,27.5 32.715,27.15 32.033,26.468C31.35,25.785 31,24.962 31,24C31,23.038 31.35,22.215 32.033,21.532C32.715,20.85 33.537,20.5 34.5,20.5C35.463,20.5 36.285,20.85 36.967,21.532C37.65,22.215 38,23.038 38,24C38,24.962 37.65,25.785 36.967,26.468C36.285,27.15 35.463,27.5 34.5,27.5Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M13.5,38C12.538,38 11.715,37.65 11.033,36.967C10.35,36.285 10,35.463 10,34.5C10,33.537 10.35,32.715 11.033,32.033C11.715,31.35 12.538,31 13.5,31C14.462,31 15.285,31.35 15.967,32.033C16.65,32.715 17,33.537 17,34.5C17,35.463 16.65,36.285 15.967,36.967C15.285,37.65 14.462,38 13.5,38Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M24,38C23.038,38 22.215,37.65 21.532,36.967C20.85,36.285 20.5,35.463 20.5,34.5C20.5,33.537 20.85,32.715 21.532,32.033C22.215,31.35 23.038,31 24,31C24.962,31 25.785,31.35 26.468,32.033C27.15,32.715 27.5,33.537 27.5,34.5C27.5,35.463 27.15,36.285 26.468,36.967C25.785,37.65 24.962,38 24,38Z" />
+    <path
+        android:fillColor="#40484B"
+        android:pathData="M34.5,38C33.537,38 32.715,37.65 32.033,36.967C31.35,36.285 31,35.463 31,34.5C31,33.537 31.35,32.715 32.033,32.033C32.715,31.35 33.537,31 34.5,31C35.463,31 36.285,31.35 36.967,32.033C37.65,32.715 38,33.537 38,34.5C38,35.463 37.65,36.285 36.967,36.967C36.285,37.65 35.463,38 34.5,38Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_unlocked_recents.xml b/lawnchair/res/drawable/ic_unlocked_recents.xml
index 86cf5491df..03780541e8 100644
--- a/lawnchair/res/drawable/ic_unlocked_recents.xml
+++ b/lawnchair/res/drawable/ic_unlocked_recents.xml
@@ -22,5 +22,5 @@
 
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
-</vector>
\ No newline at end of file
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
+</vector>
diff --git a/lawnchair/res/drawable/ic_upload.xml b/lawnchair/res/drawable/ic_upload.xml
index fd1cf428f2..595e58199a 100644
--- a/lawnchair/res/drawable/ic_upload.xml
+++ b/lawnchair/res/drawable/ic_upload.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~     This file is part of Lawnchair Launcher.
   ~
   ~     Lawnchair Launcher is free software: you can redistribute it and/or modify
@@ -17,9 +16,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="?android:textColorSecondary" android:pathData="M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z" />
+    <path
+        android:fillColor="?android:textColorSecondary"
+        android:pathData="M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_wallpaper.xml b/lawnchair/res/drawable/ic_wallpaper.xml
index d9f61bbe91..d962868e2d 100644
--- a/lawnchair/res/drawable/ic_wallpaper.xml
+++ b/lawnchair/res/drawable/ic_wallpaper.xml
@@ -1,5 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M4,4h7L11,2L4,2c-1.1,0 -2,0.9 -2,2v7h2L4,4zM10,13l-4,5h12l-3,-4 -2.03,2.71L10,13zM17,8.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S14,7.67 14,8.5s0.67,1.5 1.5,1.5S17,9.33 17,8.5zM20,2h-7v2h7v7h2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20h-7v2h7c1.1,0 2,-0.9 2,-2v-7h-2v7zM4,13L2,13v7c0,1.1 0.9,2 2,2h7v-2L4,20v-7z"/>
-    
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4,4h7L11,2L4,2c-1.1,0 -2,0.9 -2,2v7h2L4,4zM10,13l-4,5h12l-3,-4 -2.03,2.71L10,13zM17,8.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S14,7.67 14,8.5s0.67,1.5 1.5,1.5S17,9.33 17,8.5zM20,2h-7v2h7v7h2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20h-7v2h7c1.1,0 2,-0.9 2,-2v-7h-2v7zM4,13L2,13v7c0,1.1 0.9,2 2,2h7v-2L4,20v-7z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_warning.xml b/lawnchair/res/drawable/ic_warning.xml
index 1390c966e4..174d855ae4 100644
--- a/lawnchair/res/drawable/ic_warning.xml
+++ b/lawnchair/res/drawable/ic_warning.xml
@@ -3,16 +3,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M3.6035,17.499L11.1346,4.4907C11.5197,3.8254 12.4803,3.8254 12.8654,4.4907L20.3965,17.499C20.7825,18.1656 20.3014,19 19.5311,19H4.4689C3.6986,19 3.2175,18.1656 3.6035,17.499Z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M12,9L12,9A1,1 0,0 1,13 10L13,12A1,1 0,0 1,12 13L12,13A1,1 0,0 1,11 12L11,10A1,1 0,0 1,12 9z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.6035,17.499L11.1346,4.4907C11.5197,3.8254 12.4803,3.8254 12.8654,4.4907L20.3965,17.499C20.7825,18.1656 20.3014,19 19.5311,19H4.4689C3.6986,19 3.2175,18.1656 3.6035,17.499Z"
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,16m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,9L12,9A1,1 0,0 1,13 10L13,12A1,1 0,0 1,12 13L12,13A1,1 0,0 1,11 12L11,10A1,1 0,0 1,12 9z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_website.xml b/lawnchair/res/drawable/ic_website.xml
index 930bfd8a67..2957c81c7e 100644
--- a/lawnchair/res/drawable/ic_website.xml
+++ b/lawnchair/res/drawable/ic_website.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2s-0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2s-0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_wikipedia.xml b/lawnchair/res/drawable/ic_wikipedia.xml
index 2f94f95ad6..b582dc7903 100644
--- a/lawnchair/res/drawable/ic_wikipedia.xml
+++ b/lawnchair/res/drawable/ic_wikipedia.xml
@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff" android:pathData="m14.97,18.95l-2.56,-6.03c-1.02,1.99 -2.14,4.08 -3.1,6.03c-0.01,0.01 -0.47,0 -0.47,0C7.37,15.5 5.85,12.1 4.37,8.68C4.03,7.84 2.83,6.5 2,6.5v-0.45h5.06v0.45c-0.6,0 -1.62,0.4 -1.36,1.05c0.72,1.54 3.24,7.51 3.93,9.03c0.47,-0.94 1.8,-3.42 2.37,-4.47c-0.45,-0.88 -1.87,-4.18 -2.29,-5c-0.32,-0.54 -1.13,-0.61 -1.75,-0.61c0,-0.15 0.01,-0.25 0,-0.44l4.46,0.01v0.4c-0.61,0.03 -1.18,0.24 -0.92,0.82c0.6,1.24 0.95,2.13 1.5,3.28c0.17,-0.34 1.07,-2.19 1.5,-3.16c0.26,-0.65 -0.13,-0.91 -1.21,-0.91c0.01,-0.12 0.01,-0.33 0.01,-0.43c1.39,-0.01 3.48,-0.01 3.85,-0.02v0.42c-0.71,0.03 -1.44,0.41 -1.82,0.99L13.5,11.3c0.18,0.51 1.96,4.46 2.15,4.9l3.85,-8.83c-0.3,-0.72 -1.16,-0.87 -1.5,-0.87v-0.45l4,0.03v0.42c-0.88,0 -1.43,0.5 -1.75,1.25c-0.8,1.79 -3.25,7.49 -4.85,11.2h-0.43Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m14.97,18.95l-2.56,-6.03c-1.02,1.99 -2.14,4.08 -3.1,6.03c-0.01,0.01 -0.47,0 -0.47,0C7.37,15.5 5.85,12.1 4.37,8.68C4.03,7.84 2.83,6.5 2,6.5v-0.45h5.06v0.45c-0.6,0 -1.62,0.4 -1.36,1.05c0.72,1.54 3.24,7.51 3.93,9.03c0.47,-0.94 1.8,-3.42 2.37,-4.47c-0.45,-0.88 -1.87,-4.18 -2.29,-5c-0.32,-0.54 -1.13,-0.61 -1.75,-0.61c0,-0.15 0.01,-0.25 0,-0.44l4.46,0.01v0.4c-0.61,0.03 -1.18,0.24 -0.92,0.82c0.6,1.24 0.95,2.13 1.5,3.28c0.17,-0.34 1.07,-2.19 1.5,-3.16c0.26,-0.65 -0.13,-0.91 -1.21,-0.91c0.01,-0.12 0.01,-0.33 0.01,-0.43c1.39,-0.01 3.48,-0.01 3.85,-0.02v0.42c-0.71,0.03 -1.44,0.41 -1.82,0.99L13.5,11.3c0.18,0.51 1.96,4.46 2.15,4.9l3.85,-8.83c-0.3,-0.72 -1.16,-0.87 -1.5,-0.87v-0.45l4,0.03v0.42c-0.88,0 -1.43,0.5 -1.75,1.25c-0.8,1.79 -3.25,7.49 -4.85,11.2h-0.43Z" />
 </vector>
diff --git a/lawnchair/res/drawable/ic_work_app_badge.xml b/lawnchair/res/drawable/ic_work_app_badge.xml
index 1599489c8f..e79c621ab1 100644
--- a/lawnchair/res/drawable/ic_work_app_badge.xml
+++ b/lawnchair/res/drawable/ic_work_app_badge.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2021 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.
@@ -31,7 +30,11 @@
         A11,11 0 1,1 23,12
         A11,11 0 1,1 1,12" />
 
-    <group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX=".6"
+        android:scaleY=".6">
         <path
             android:fillColor="#1A73E8"
             android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2z" />
diff --git a/lawnchair/res/drawable/ic_x_twitter.xml b/lawnchair/res/drawable/ic_x_twitter.xml
index d2dde199a8..753b647906 100644
--- a/lawnchair/res/drawable/ic_x_twitter.xml
+++ b/lawnchair/res/drawable/ic_x_twitter.xml
@@ -1,9 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:viewportWidth="512" 
-    android:viewportHeight="512"
-    android:width="24dp" 
-    android:height="24dp">
-    <path 
-        android:fillColor="#FF000000" 
-        android:pathData="M389.2,48h70.6L305.6,224.2 487,464H345L233.7,318.6 106.5,464H35.8L200.7,275.5 26.8,48H172.4L272.9,180.9 389.2,48zM364.4,421.8h39.1L151.1,88h-42L364.4,421.8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M389.2,48h70.6L305.6,224.2 487,464H345L233.7,318.6 106.5,464H35.8L200.7,275.5 26.8,48H172.4L272.9,180.9 389.2,48zM364.4,421.8h39.1L151.1,88h-42L364.4,421.8z" />
 </vector>
diff --git a/lawnchair/res/drawable/page_indicator_dot.xml b/lawnchair/res/drawable/page_indicator_dot.xml
index ece3fb67a1..dedde4da3b 100644
--- a/lawnchair/res/drawable/page_indicator_dot.xml
+++ b/lawnchair/res/drawable/page_indicator_dot.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <size android:height="@dimen/page_indicator_dot_size" android:width="@dimen/page_indicator_dot_size"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="@dimen/page_indicator_dot_size"
+        android:height="@dimen/page_indicator_dot_size" />
 </shape>
diff --git a/lawnchair/res/drawable/pill_ripple.xml b/lawnchair/res/drawable/pill_ripple.xml
index 50afe2fbae..bcc4649d78 100644
--- a/lawnchair/res/drawable/pill_ripple.xml
+++ b/lawnchair/res/drawable/pill_ripple.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <solid android:color="#000"/>
+            <solid android:color="#000" />
             <corners android:radius="1000dp" />
         </shape>
     </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/lawnchair/res/drawable/search_input_fg.xml b/lawnchair/res/drawable/search_input_fg.xml
index 826dd1e8a8..a865951fa0 100644
--- a/lawnchair/res/drawable/search_input_fg.xml
+++ b/lawnchair/res/drawable/search_input_fg.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?searchboxHighlight" />
             <corners android:radius="32dp" />
-            <padding android:left="@dimen/search_result_padding" android:right="@dimen/search_result_padding" />
+            <padding
+                android:left="@dimen/search_result_padding"
+                android:right="@dimen/search_result_padding" />
         </shape>
     </item>
 </layer-list>
diff --git a/lawnchair/res/drawable/search_input_ripple.xml b/lawnchair/res/drawable/search_input_ripple.xml
index 29cdcb5537..76e6683fb6 100644
--- a/lawnchair/res/drawable/search_input_ripple.xml
+++ b/lawnchair/res/drawable/search_input_ripple.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple android:color="?allAppsScrimColor"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/mask" android:bottom="2dp">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?allAppsScrimColor">
+    <item
+        android:id="@android:id/mask"
+        android:bottom="2dp">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white" />
             <corners android:radius="32dp" />
-            <padding android:left="@dimen/search_result_padding" android:right="@dimen/search_result_padding" />
+            <padding
+                android:left="@dimen/search_result_padding"
+                android:right="@dimen/search_result_padding" />
         </shape>
     </item>
     <item android:bottom="2dp">
         <shape android:shape="rectangle">
             <solid android:color="?searchboxHighlight" />
             <corners android:radius="32dp" />
-            <padding android:left="@dimen/search_result_padding" android:right="@dimen/search_result_padding" />
+            <padding
+                android:left="@dimen/search_result_padding"
+                android:right="@dimen/search_result_padding" />
         </shape>
     </item>
 </ripple>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_1.xml b/lawnchair/res/drawable/themed_icon_calendar_1.xml
index 3d854b1b9d..a2d86767f9 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_1.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_1.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M85.718,120C82.55,120 80.966,118.464 80.966,115.392C80.966,112.368 82.55,110.856 85.718,110.856H92.99V81.624L87.734,84.792C86.342,85.608 85.094,85.824 83.99,85.44C82.886,85.056 82.046,84.336 81.47,83.28C80.894,82.224 80.726,81.096 80.966,79.896C81.206,78.648 81.998,77.592 83.342,76.728L93.35,70.68C94.358,70.056 95.366,69.552 96.374,69.168C97.43,68.784 98.462,68.592 99.47,68.592C100.91,68.592 102.038,68.976 102.854,69.744C103.718,70.512 104.15,71.64 104.15,73.128V110.856H110.702C113.822,110.856 115.382,112.368 115.382,115.392C115.382,118.464 113.822,120 110.702,120H85.718Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M85.718,120C82.55,120 80.966,118.464 80.966,115.392C80.966,112.368 82.55,110.856 85.718,110.856H92.99V81.624L87.734,84.792C86.342,85.608 85.094,85.824 83.99,85.44C82.886,85.056 82.046,84.336 81.47,83.28C80.894,82.224 80.726,81.096 80.966,79.896C81.206,78.648 81.998,77.592 83.342,76.728L93.35,70.68C94.358,70.056 95.366,69.552 96.374,69.168C97.43,68.784 98.462,68.592 99.47,68.592C100.91,68.592 102.038,68.976 102.854,69.744C103.718,70.512 104.15,71.64 104.15,73.128V110.856H110.702C113.822,110.856 115.382,112.368 115.382,115.392C115.382,118.464 113.822,120 110.702,120H85.718Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_10.xml b/lawnchair/res/drawable/themed_icon_calendar_10.xml
index b1701f6f84..44bdb24567 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_10.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_10.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_11.xml b/lawnchair/res/drawable/themed_icon_calendar_11.xml
index ad5ef23979..9b8fd52b6b 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_11.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_11.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_12.xml b/lawnchair/res/drawable/themed_icon_calendar_12.xml
index a8e067452e..96b13618c4 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_12.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_12.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM105.216,120C103.392,120 102.072,119.592 101.256,118.776C100.44,117.912 100.032,116.664 100.032,115.032C100.032,113.976 100.296,112.992 100.824,112.08C101.352,111.168 102.072,110.232 102.984,109.272L116.52,95.016C118.536,92.856 119.976,90.936 120.84,89.256C121.752,87.576 122.208,85.896 122.208,84.216C122.208,79.896 119.544,77.736 114.216,77.736C112.824,77.736 111.384,77.928 109.896,78.312C108.456,78.696 106.944,79.368 105.36,80.328C104.064,81.096 102.864,81.264 101.76,80.832C100.704,80.4 99.912,79.656 99.384,78.6C98.904,77.544 98.784,76.44 99.024,75.288C99.312,74.088 100.104,73.104 101.4,72.336C103.512,71.04 105.816,70.08 108.312,69.456C110.808,68.784 113.28,68.448 115.728,68.448C121.392,68.448 125.712,69.72 128.688,72.264C131.712,74.76 133.224,78.336 133.224,82.992C133.224,86.064 132.504,89.016 131.064,91.848C129.672,94.632 127.368,97.656 124.152,100.92L114.36,110.856H131.064C134.184,110.856 135.744,112.368 135.744,115.392C135.744,118.464 134.184,120 131.064,120H105.216Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM105.216,120C103.392,120 102.072,119.592 101.256,118.776C100.44,117.912 100.032,116.664 100.032,115.032C100.032,113.976 100.296,112.992 100.824,112.08C101.352,111.168 102.072,110.232 102.984,109.272L116.52,95.016C118.536,92.856 119.976,90.936 120.84,89.256C121.752,87.576 122.208,85.896 122.208,84.216C122.208,79.896 119.544,77.736 114.216,77.736C112.824,77.736 111.384,77.928 109.896,78.312C108.456,78.696 106.944,79.368 105.36,80.328C104.064,81.096 102.864,81.264 101.76,80.832C100.704,80.4 99.912,79.656 99.384,78.6C98.904,77.544 98.784,76.44 99.024,75.288C99.312,74.088 100.104,73.104 101.4,72.336C103.512,71.04 105.816,70.08 108.312,69.456C110.808,68.784 113.28,68.448 115.728,68.448C121.392,68.448 125.712,69.72 128.688,72.264C131.712,74.76 133.224,78.336 133.224,82.992C133.224,86.064 132.504,89.016 131.064,91.848C129.672,94.632 127.368,97.656 124.152,100.92L114.36,110.856H131.064C134.184,110.856 135.744,112.368 135.744,115.392C135.744,118.464 134.184,120 131.064,120H105.216Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_13.xml b/lawnchair/res/drawable/themed_icon_calendar_13.xml
index 2d1c8ca55f..797321d888 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_13.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_13.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM115.656,120.792C113.112,120.792 110.52,120.504 107.88,119.928C105.288,119.352 103.032,118.488 101.112,117.336C99.576,116.52 98.616,115.512 98.232,114.312C97.848,113.064 97.896,111.912 98.376,110.856C98.904,109.8 99.744,109.056 100.896,108.624C102.048,108.144 103.368,108.264 104.856,108.984C106.728,109.896 108.504,110.544 110.184,110.928C111.864,111.312 113.544,111.504 115.224,111.504C121.08,111.504 124.008,109.32 124.008,104.952C124.008,100.92 121.272,98.904 115.8,98.904H111.552C109.968,98.904 108.744,98.52 107.88,97.752C107.064,96.936 106.656,95.832 106.656,94.44C106.656,93 107.064,91.896 107.88,91.128C108.744,90.312 109.968,89.904 111.552,89.904H114.72C117.12,89.904 119.016,89.352 120.408,88.248C121.8,87.144 122.496,85.608 122.496,83.64C122.496,79.704 119.928,77.736 114.792,77.736C113.208,77.736 111.672,77.928 110.184,78.312C108.744,78.648 107.16,79.272 105.432,80.184C104.088,80.856 102.888,80.976 101.832,80.544C100.776,80.112 99.984,79.368 99.456,78.312C98.976,77.256 98.88,76.152 99.168,75C99.456,73.848 100.296,72.888 101.688,72.12C105.864,69.672 110.568,68.448 115.8,68.448C121.272,68.448 125.544,69.672 128.616,72.12C131.688,74.568 133.224,77.928 133.224,82.2C133.224,84.84 132.552,87.168 131.208,89.184C129.864,91.2 127.992,92.664 125.592,93.576C128.472,94.392 130.704,95.904 132.288,98.112C133.92,100.272 134.736,102.888 134.736,105.96C134.736,110.568 133.032,114.192 129.624,116.832C126.216,119.472 121.56,120.792 115.656,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM115.656,120.792C113.112,120.792 110.52,120.504 107.88,119.928C105.288,119.352 103.032,118.488 101.112,117.336C99.576,116.52 98.616,115.512 98.232,114.312C97.848,113.064 97.896,111.912 98.376,110.856C98.904,109.8 99.744,109.056 100.896,108.624C102.048,108.144 103.368,108.264 104.856,108.984C106.728,109.896 108.504,110.544 110.184,110.928C111.864,111.312 113.544,111.504 115.224,111.504C121.08,111.504 124.008,109.32 124.008,104.952C124.008,100.92 121.272,98.904 115.8,98.904H111.552C109.968,98.904 108.744,98.52 107.88,97.752C107.064,96.936 106.656,95.832 106.656,94.44C106.656,93 107.064,91.896 107.88,91.128C108.744,90.312 109.968,89.904 111.552,89.904H114.72C117.12,89.904 119.016,89.352 120.408,88.248C121.8,87.144 122.496,85.608 122.496,83.64C122.496,79.704 119.928,77.736 114.792,77.736C113.208,77.736 111.672,77.928 110.184,78.312C108.744,78.648 107.16,79.272 105.432,80.184C104.088,80.856 102.888,80.976 101.832,80.544C100.776,80.112 99.984,79.368 99.456,78.312C98.976,77.256 98.88,76.152 99.168,75C99.456,73.848 100.296,72.888 101.688,72.12C105.864,69.672 110.568,68.448 115.8,68.448C121.272,68.448 125.544,69.672 128.616,72.12C131.688,74.568 133.224,77.928 133.224,82.2C133.224,84.84 132.552,87.168 131.208,89.184C129.864,91.2 127.992,92.664 125.592,93.576C128.472,94.392 130.704,95.904 132.288,98.112C133.92,100.272 134.736,102.888 134.736,105.96C134.736,110.568 133.032,114.192 129.624,116.832C126.216,119.472 121.56,120.792 115.656,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_14.xml b/lawnchair/res/drawable/themed_icon_calendar_14.xml
index 9633f8a076..540ae94ff4 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_14.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_14.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM124.8,120.648C123.024,120.648 121.656,120.168 120.696,119.208C119.736,118.248 119.256,116.856 119.256,115.032V110.928H103.128C101.352,110.928 99.936,110.544 98.88,109.776C97.824,108.96 97.296,107.736 97.296,106.104C97.296,105.144 97.512,104.184 97.944,103.224C98.376,102.216 99.144,100.944 100.248,99.408L118.896,72.264C119.712,71.016 120.6,70.104 121.56,69.528C122.568,68.904 123.744,68.592 125.088,68.592C126.672,68.592 127.92,69.072 128.832,70.032C129.744,70.944 130.2,72.336 130.2,74.208V102.144H132.864C136.08,102.144 137.688,103.608 137.688,106.536C137.688,109.464 136.08,110.928 132.864,110.928H130.2V115.032C130.2,116.856 129.72,118.248 128.76,119.208C127.848,120.168 126.528,120.648 124.8,120.648ZM119.256,102.144V85.368L107.88,102.144H119.256Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM124.8,120.648C123.024,120.648 121.656,120.168 120.696,119.208C119.736,118.248 119.256,116.856 119.256,115.032V110.928H103.128C101.352,110.928 99.936,110.544 98.88,109.776C97.824,108.96 97.296,107.736 97.296,106.104C97.296,105.144 97.512,104.184 97.944,103.224C98.376,102.216 99.144,100.944 100.248,99.408L118.896,72.264C119.712,71.016 120.6,70.104 121.56,69.528C122.568,68.904 123.744,68.592 125.088,68.592C126.672,68.592 127.92,69.072 128.832,70.032C129.744,70.944 130.2,72.336 130.2,74.208V102.144H132.864C136.08,102.144 137.688,103.608 137.688,106.536C137.688,109.464 136.08,110.928 132.864,110.928H130.2V115.032C130.2,116.856 129.72,118.248 128.76,119.208C127.848,120.168 126.528,120.648 124.8,120.648ZM119.256,102.144V85.368L107.88,102.144H119.256Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_15.xml b/lawnchair/res/drawable/themed_icon_calendar_15.xml
index c9ae2392ed..fd47bfe191 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_15.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_15.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.952,120.792C114.504,120.792 111.984,120.504 109.392,119.928C106.8,119.304 104.424,118.344 102.264,117.048C100.872,116.28 100.008,115.296 99.672,114.096C99.384,112.848 99.48,111.696 99.96,110.64C100.488,109.536 101.304,108.768 102.408,108.336C103.56,107.856 104.832,108 106.224,108.768C109.584,110.592 113.088,111.504 116.736,111.504C119.472,111.504 121.584,110.832 123.072,109.488C124.608,108.144 125.376,106.344 125.376,104.088C125.376,101.784 124.632,99.936 123.144,98.544C121.704,97.152 119.736,96.456 117.24,96.456C115.992,96.456 114.72,96.672 113.424,97.104C112.128,97.488 110.832,98.184 109.536,99.192C109.056,99.576 108.408,99.936 107.592,100.272C106.824,100.608 106.032,100.776 105.216,100.776C102.288,100.776 100.824,99.408 100.824,96.672V74.064C100.824,70.848 102.432,69.24 105.648,69.24H128.76C131.976,69.24 133.584,70.776 133.584,73.848C133.584,76.872 131.976,78.384 128.76,78.384H111.552V89.76C113.904,88.224 116.736,87.456 120.048,87.456C123.264,87.456 126.072,88.152 128.472,89.544C130.872,90.888 132.744,92.784 134.088,95.232C135.432,97.68 136.104,100.512 136.104,103.728C136.104,107.136 135.336,110.112 133.8,112.656C132.264,115.2 130.056,117.192 127.176,118.632C124.296,120.072 120.888,120.792 116.952,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.952,120.792C114.504,120.792 111.984,120.504 109.392,119.928C106.8,119.304 104.424,118.344 102.264,117.048C100.872,116.28 100.008,115.296 99.672,114.096C99.384,112.848 99.48,111.696 99.96,110.64C100.488,109.536 101.304,108.768 102.408,108.336C103.56,107.856 104.832,108 106.224,108.768C109.584,110.592 113.088,111.504 116.736,111.504C119.472,111.504 121.584,110.832 123.072,109.488C124.608,108.144 125.376,106.344 125.376,104.088C125.376,101.784 124.632,99.936 123.144,98.544C121.704,97.152 119.736,96.456 117.24,96.456C115.992,96.456 114.72,96.672 113.424,97.104C112.128,97.488 110.832,98.184 109.536,99.192C109.056,99.576 108.408,99.936 107.592,100.272C106.824,100.608 106.032,100.776 105.216,100.776C102.288,100.776 100.824,99.408 100.824,96.672V74.064C100.824,70.848 102.432,69.24 105.648,69.24H128.76C131.976,69.24 133.584,70.776 133.584,73.848C133.584,76.872 131.976,78.384 128.76,78.384H111.552V89.76C113.904,88.224 116.736,87.456 120.048,87.456C123.264,87.456 126.072,88.152 128.472,89.544C130.872,90.888 132.744,92.784 134.088,95.232C135.432,97.68 136.104,100.512 136.104,103.728C136.104,107.136 135.336,110.112 133.8,112.656C132.264,115.2 130.056,117.192 127.176,118.632C124.296,120.072 120.888,120.792 116.952,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_16.xml b/lawnchair/res/drawable/themed_icon_calendar_16.xml
index 51bab8806e..614cf185e9 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_16.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_16.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM118.824,120.792C112.344,120.792 107.328,118.584 103.776,114.168C100.272,109.704 98.52,103.416 98.52,95.304C98.52,86.808 100.512,80.208 104.496,75.504C108.48,70.8 114,68.448 121.056,68.448C123.12,68.448 125.208,68.736 127.32,69.312C129.432,69.888 131.4,70.752 133.224,71.904C134.424,72.576 135.144,73.488 135.384,74.64C135.672,75.792 135.576,76.896 135.096,77.952C134.664,79.008 133.92,79.776 132.864,80.256C131.856,80.736 130.632,80.64 129.192,79.968C127.704,79.152 126.264,78.576 124.872,78.24C123.528,77.904 122.208,77.736 120.912,77.736C113.04,77.736 109.104,82.896 109.104,93.216V94.584C110.112,92.184 111.672,90.336 113.784,89.04C115.896,87.696 118.32,87.024 121.056,87.024C123.936,87.024 126.48,87.744 128.688,89.184C130.944,90.576 132.72,92.52 134.016,95.016C135.312,97.464 135.96,100.272 135.96,103.44C135.96,106.8 135.216,109.8 133.728,112.44C132.288,115.032 130.272,117.072 127.68,118.56C125.136,120.048 122.184,120.792 118.824,120.792ZM118.248,112.08C120.456,112.08 122.232,111.336 123.576,109.848C124.968,108.312 125.664,106.32 125.664,103.872C125.664,101.472 124.968,99.504 123.576,97.968C122.232,96.432 120.456,95.664 118.248,95.664C115.992,95.664 114.168,96.432 112.776,97.968C111.432,99.504 110.76,101.472 110.76,103.872C110.76,106.32 111.432,108.312 112.776,109.848C114.168,111.336 115.992,112.08 118.248,112.08Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM118.824,120.792C112.344,120.792 107.328,118.584 103.776,114.168C100.272,109.704 98.52,103.416 98.52,95.304C98.52,86.808 100.512,80.208 104.496,75.504C108.48,70.8 114,68.448 121.056,68.448C123.12,68.448 125.208,68.736 127.32,69.312C129.432,69.888 131.4,70.752 133.224,71.904C134.424,72.576 135.144,73.488 135.384,74.64C135.672,75.792 135.576,76.896 135.096,77.952C134.664,79.008 133.92,79.776 132.864,80.256C131.856,80.736 130.632,80.64 129.192,79.968C127.704,79.152 126.264,78.576 124.872,78.24C123.528,77.904 122.208,77.736 120.912,77.736C113.04,77.736 109.104,82.896 109.104,93.216V94.584C110.112,92.184 111.672,90.336 113.784,89.04C115.896,87.696 118.32,87.024 121.056,87.024C123.936,87.024 126.48,87.744 128.688,89.184C130.944,90.576 132.72,92.52 134.016,95.016C135.312,97.464 135.96,100.272 135.96,103.44C135.96,106.8 135.216,109.8 133.728,112.44C132.288,115.032 130.272,117.072 127.68,118.56C125.136,120.048 122.184,120.792 118.824,120.792ZM118.248,112.08C120.456,112.08 122.232,111.336 123.576,109.848C124.968,108.312 125.664,106.32 125.664,103.872C125.664,101.472 124.968,99.504 123.576,97.968C122.232,96.432 120.456,95.664 118.248,95.664C115.992,95.664 114.168,96.432 112.776,97.968C111.432,99.504 110.76,101.472 110.76,103.872C110.76,106.32 111.432,108.312 112.776,109.848C114.168,111.336 115.992,112.08 118.248,112.08Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_17.xml b/lawnchair/res/drawable/themed_icon_calendar_17.xml
index fb26dfb6a5..9fb1c1467a 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_17.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_17.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM107.88,120.648C105.768,120.648 104.304,119.952 103.488,118.56C102.672,117.168 102.792,115.512 103.848,113.592L122.784,78.456H102.912C99.696,78.456 98.088,76.92 98.088,73.848C98.088,70.776 99.696,69.24 102.912,69.24H130.344C131.88,69.24 133.128,69.648 134.088,70.464C135.096,71.28 135.6,72.432 135.6,73.92C135.6,75.216 135.408,76.344 135.024,77.304C134.688,78.264 134.232,79.296 133.656,80.4L114.216,117.048C112.92,119.448 110.808,120.648 107.88,120.648Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM107.88,120.648C105.768,120.648 104.304,119.952 103.488,118.56C102.672,117.168 102.792,115.512 103.848,113.592L122.784,78.456H102.912C99.696,78.456 98.088,76.92 98.088,73.848C98.088,70.776 99.696,69.24 102.912,69.24H130.344C131.88,69.24 133.128,69.648 134.088,70.464C135.096,71.28 135.6,72.432 135.6,73.92C135.6,75.216 135.408,76.344 135.024,77.304C134.688,78.264 134.232,79.296 133.656,80.4L114.216,117.048C112.92,119.448 110.808,120.648 107.88,120.648Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_18.xml b/lawnchair/res/drawable/themed_icon_calendar_18.xml
index 6e75ab376b..3985fc2a84 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_18.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_18.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.88,120.792C110.832,120.792 106.104,119.52 102.696,116.976C99.288,114.384 97.584,110.784 97.584,106.176C97.584,103.2 98.328,100.632 99.816,98.472C101.352,96.312 103.368,94.776 105.864,93.864C103.752,92.808 102.048,91.272 100.752,89.256C99.504,87.192 98.88,84.864 98.88,82.272C98.88,77.952 100.488,74.568 103.704,72.12C106.968,69.672 111.36,68.448 116.88,68.448C122.4,68.448 126.792,69.672 130.056,72.12C133.32,74.568 134.952,77.952 134.952,82.272C134.952,84.912 134.304,87.264 133.008,89.328C131.76,91.392 130.08,92.904 127.968,93.864C130.464,94.824 132.456,96.384 133.944,98.544C135.432,100.704 136.176,103.248 136.176,106.176C136.176,110.784 134.472,114.384 131.064,116.976C127.656,119.52 122.928,120.792 116.88,120.792ZM116.88,90.048C119.328,90.048 121.224,89.472 122.568,88.32C123.96,87.12 124.656,85.512 124.656,83.496C124.656,81.48 123.96,79.896 122.568,78.744C121.224,77.592 119.328,77.016 116.88,77.016C114.432,77.016 112.536,77.592 111.192,78.744C109.848,79.896 109.176,81.48 109.176,83.496C109.176,85.512 109.848,87.12 111.192,88.32C112.536,89.472 114.432,90.048 116.88,90.048ZM116.88,112.224C122.928,112.224 125.952,109.944 125.952,105.384C125.952,100.872 122.928,98.616 116.88,98.616C113.952,98.616 111.696,99.192 110.112,100.344C108.576,101.448 107.808,103.128 107.808,105.384C107.808,107.64 108.576,109.344 110.112,110.496C111.696,111.648 113.952,112.224 116.88,112.224Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM116.88,120.792C110.832,120.792 106.104,119.52 102.696,116.976C99.288,114.384 97.584,110.784 97.584,106.176C97.584,103.2 98.328,100.632 99.816,98.472C101.352,96.312 103.368,94.776 105.864,93.864C103.752,92.808 102.048,91.272 100.752,89.256C99.504,87.192 98.88,84.864 98.88,82.272C98.88,77.952 100.488,74.568 103.704,72.12C106.968,69.672 111.36,68.448 116.88,68.448C122.4,68.448 126.792,69.672 130.056,72.12C133.32,74.568 134.952,77.952 134.952,82.272C134.952,84.912 134.304,87.264 133.008,89.328C131.76,91.392 130.08,92.904 127.968,93.864C130.464,94.824 132.456,96.384 133.944,98.544C135.432,100.704 136.176,103.248 136.176,106.176C136.176,110.784 134.472,114.384 131.064,116.976C127.656,119.52 122.928,120.792 116.88,120.792ZM116.88,90.048C119.328,90.048 121.224,89.472 122.568,88.32C123.96,87.12 124.656,85.512 124.656,83.496C124.656,81.48 123.96,79.896 122.568,78.744C121.224,77.592 119.328,77.016 116.88,77.016C114.432,77.016 112.536,77.592 111.192,78.744C109.848,79.896 109.176,81.48 109.176,83.496C109.176,85.512 109.848,87.12 111.192,88.32C112.536,89.472 114.432,90.048 116.88,90.048ZM116.88,112.224C122.928,112.224 125.952,109.944 125.952,105.384C125.952,100.872 122.928,98.616 116.88,98.616C113.952,98.616 111.696,99.192 110.112,100.344C108.576,101.448 107.808,103.128 107.808,105.384C107.808,107.64 108.576,109.344 110.112,110.496C111.696,111.648 113.952,112.224 116.88,112.224Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_19.xml b/lawnchair/res/drawable/themed_icon_calendar_19.xml
index baf0daa51b..cc9cce9f45 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_19.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_19.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM112.704,120.792C110.64,120.792 108.552,120.504 106.44,119.928C104.328,119.352 102.36,118.488 100.536,117.336C99.336,116.664 98.592,115.752 98.304,114.6C98.064,113.448 98.16,112.344 98.592,111.288C99.072,110.232 99.816,109.464 100.824,108.984C101.88,108.504 103.128,108.6 104.568,109.272C106.056,110.088 107.472,110.664 108.816,111C110.208,111.336 111.552,111.504 112.848,111.504C120.72,111.504 124.656,106.344 124.656,96.024V94.656C123.648,97.056 122.088,98.928 119.976,100.272C117.864,101.568 115.44,102.216 112.704,102.216C109.824,102.216 107.256,101.52 105,100.128C102.792,98.688 101.04,96.744 99.744,94.296C98.448,91.8 97.8,88.968 97.8,85.8C97.8,82.44 98.52,79.464 99.96,76.872C101.448,74.232 103.464,72.168 106.008,70.68C108.6,69.192 111.576,68.448 114.936,68.448C121.416,68.448 126.408,70.68 129.912,75.144C133.464,79.56 135.24,85.824 135.24,93.936C135.24,102.432 133.248,109.032 129.264,113.736C125.28,118.44 119.76,120.792 112.704,120.792ZM115.584,93.504C117.792,93.504 119.592,92.76 120.984,91.272C122.376,89.736 123.072,87.744 123.072,85.296C123.072,82.848 122.376,80.88 120.984,79.392C119.592,77.856 117.792,77.088 115.584,77.088C113.376,77.088 111.576,77.856 110.184,79.392C108.792,80.88 108.096,82.848 108.096,85.296C108.096,87.744 108.792,89.736 110.184,91.272C111.576,92.76 113.376,93.504 115.584,93.504Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M64.852,120C61.684,120 60.1,118.464 60.1,115.392C60.1,112.368 61.684,110.856 64.852,110.856H72.124V81.624L66.868,84.792C65.476,85.608 64.228,85.824 63.124,85.44C62.02,85.056 61.18,84.336 60.604,83.28C60.028,82.224 59.86,81.096 60.1,79.896C60.34,78.648 61.132,77.592 62.476,76.728L72.484,70.68C73.492,70.056 74.5,69.552 75.508,69.168C76.564,68.784 77.596,68.592 78.604,68.592C80.044,68.592 81.172,68.976 81.988,69.744C82.852,70.512 83.284,71.64 83.284,73.128V110.856H89.836C92.956,110.856 94.516,112.368 94.516,115.392C94.516,118.464 92.956,120 89.836,120H64.852ZM112.704,120.792C110.64,120.792 108.552,120.504 106.44,119.928C104.328,119.352 102.36,118.488 100.536,117.336C99.336,116.664 98.592,115.752 98.304,114.6C98.064,113.448 98.16,112.344 98.592,111.288C99.072,110.232 99.816,109.464 100.824,108.984C101.88,108.504 103.128,108.6 104.568,109.272C106.056,110.088 107.472,110.664 108.816,111C110.208,111.336 111.552,111.504 112.848,111.504C120.72,111.504 124.656,106.344 124.656,96.024V94.656C123.648,97.056 122.088,98.928 119.976,100.272C117.864,101.568 115.44,102.216 112.704,102.216C109.824,102.216 107.256,101.52 105,100.128C102.792,98.688 101.04,96.744 99.744,94.296C98.448,91.8 97.8,88.968 97.8,85.8C97.8,82.44 98.52,79.464 99.96,76.872C101.448,74.232 103.464,72.168 106.008,70.68C108.6,69.192 111.576,68.448 114.936,68.448C121.416,68.448 126.408,70.68 129.912,75.144C133.464,79.56 135.24,85.824 135.24,93.936C135.24,102.432 133.248,109.032 129.264,113.736C125.28,118.44 119.76,120.792 112.704,120.792ZM115.584,93.504C117.792,93.504 119.592,92.76 120.984,91.272C122.376,89.736 123.072,87.744 123.072,85.296C123.072,82.848 122.376,80.88 120.984,79.392C119.592,77.856 117.792,77.088 115.584,77.088C113.376,77.088 111.576,77.856 110.184,79.392C108.792,80.88 108.096,82.848 108.096,85.296C108.096,87.744 108.792,89.736 110.184,91.272C111.576,92.76 113.376,93.504 115.584,93.504Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_2.xml b/lawnchair/res/drawable/themed_icon_calendar_2.xml
index d635dbef4f..5b4c9ea03c 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_2.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_2.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M84.35,120C82.526,120 81.206,119.592 80.39,118.776C79.574,117.912 79.166,116.664 79.166,115.032C79.166,113.976 79.43,112.992 79.958,112.08C80.486,111.168 81.206,110.232 82.118,109.272L95.654,95.016C97.67,92.856 99.11,90.936 99.974,89.256C100.886,87.576 101.342,85.896 101.342,84.216C101.342,79.896 98.678,77.736 93.35,77.736C91.958,77.736 90.518,77.928 89.03,78.312C87.59,78.696 86.078,79.368 84.494,80.328C83.198,81.096 81.998,81.264 80.894,80.832C79.838,80.4 79.046,79.656 78.518,78.6C78.038,77.544 77.918,76.44 78.158,75.288C78.446,74.088 79.238,73.104 80.534,72.336C82.646,71.04 84.95,70.08 87.446,69.456C89.942,68.784 92.414,68.448 94.862,68.448C100.526,68.448 104.846,69.72 107.822,72.264C110.846,74.76 112.358,78.336 112.358,82.992C112.358,86.064 111.638,89.016 110.198,91.848C108.806,94.632 106.502,97.656 103.286,100.92L93.494,110.856H110.198C113.318,110.856 114.878,112.368 114.878,115.392C114.878,118.464 113.318,120 110.198,120H84.35Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M84.35,120C82.526,120 81.206,119.592 80.39,118.776C79.574,117.912 79.166,116.664 79.166,115.032C79.166,113.976 79.43,112.992 79.958,112.08C80.486,111.168 81.206,110.232 82.118,109.272L95.654,95.016C97.67,92.856 99.11,90.936 99.974,89.256C100.886,87.576 101.342,85.896 101.342,84.216C101.342,79.896 98.678,77.736 93.35,77.736C91.958,77.736 90.518,77.928 89.03,78.312C87.59,78.696 86.078,79.368 84.494,80.328C83.198,81.096 81.998,81.264 80.894,80.832C79.838,80.4 79.046,79.656 78.518,78.6C78.038,77.544 77.918,76.44 78.158,75.288C78.446,74.088 79.238,73.104 80.534,72.336C82.646,71.04 84.95,70.08 87.446,69.456C89.942,68.784 92.414,68.448 94.862,68.448C100.526,68.448 104.846,69.72 107.822,72.264C110.846,74.76 112.358,78.336 112.358,82.992C112.358,86.064 111.638,89.016 110.198,91.848C108.806,94.632 106.502,97.656 103.286,100.92L93.494,110.856H110.198C113.318,110.856 114.878,112.368 114.878,115.392C114.878,118.464 113.318,120 110.198,120H84.35Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_20.xml b/lawnchair/res/drawable/themed_icon_calendar_20.xml
index af8e9c6527..f4ddc1cf45 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_20.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_20.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_21.xml b/lawnchair/res/drawable/themed_icon_calendar_21.xml
index 20c4ed3a72..85957430d2 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_21.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_21.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_22.xml b/lawnchair/res/drawable/themed_icon_calendar_22.xml
index 7f84e6eaa8..c5f3539fa4 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_22.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_22.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM105.216,120C103.392,120 102.072,119.592 101.256,118.776C100.44,117.912 100.032,116.664 100.032,115.032C100.032,113.976 100.296,112.992 100.824,112.08C101.352,111.168 102.072,110.232 102.984,109.272L116.52,95.016C118.536,92.856 119.976,90.936 120.84,89.256C121.752,87.576 122.208,85.896 122.208,84.216C122.208,79.896 119.544,77.736 114.216,77.736C112.824,77.736 111.384,77.928 109.896,78.312C108.456,78.696 106.944,79.368 105.36,80.328C104.064,81.096 102.864,81.264 101.76,80.832C100.704,80.4 99.912,79.656 99.384,78.6C98.904,77.544 98.784,76.44 99.024,75.288C99.312,74.088 100.104,73.104 101.4,72.336C103.512,71.04 105.816,70.08 108.312,69.456C110.808,68.784 113.28,68.448 115.728,68.448C121.392,68.448 125.712,69.72 128.688,72.264C131.712,74.76 133.224,78.336 133.224,82.992C133.224,86.064 132.504,89.016 131.064,91.848C129.672,94.632 127.368,97.656 124.152,100.92L114.36,110.856H131.064C134.184,110.856 135.744,112.368 135.744,115.392C135.744,118.464 134.184,120 131.064,120H105.216Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM105.216,120C103.392,120 102.072,119.592 101.256,118.776C100.44,117.912 100.032,116.664 100.032,115.032C100.032,113.976 100.296,112.992 100.824,112.08C101.352,111.168 102.072,110.232 102.984,109.272L116.52,95.016C118.536,92.856 119.976,90.936 120.84,89.256C121.752,87.576 122.208,85.896 122.208,84.216C122.208,79.896 119.544,77.736 114.216,77.736C112.824,77.736 111.384,77.928 109.896,78.312C108.456,78.696 106.944,79.368 105.36,80.328C104.064,81.096 102.864,81.264 101.76,80.832C100.704,80.4 99.912,79.656 99.384,78.6C98.904,77.544 98.784,76.44 99.024,75.288C99.312,74.088 100.104,73.104 101.4,72.336C103.512,71.04 105.816,70.08 108.312,69.456C110.808,68.784 113.28,68.448 115.728,68.448C121.392,68.448 125.712,69.72 128.688,72.264C131.712,74.76 133.224,78.336 133.224,82.992C133.224,86.064 132.504,89.016 131.064,91.848C129.672,94.632 127.368,97.656 124.152,100.92L114.36,110.856H131.064C134.184,110.856 135.744,112.368 135.744,115.392C135.744,118.464 134.184,120 131.064,120H105.216Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_23.xml b/lawnchair/res/drawable/themed_icon_calendar_23.xml
index 9d6c0ec64a..01be178f4e 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_23.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_23.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM115.656,120.792C113.112,120.792 110.52,120.504 107.88,119.928C105.288,119.352 103.032,118.488 101.112,117.336C99.576,116.52 98.616,115.512 98.232,114.312C97.848,113.064 97.896,111.912 98.376,110.856C98.904,109.8 99.744,109.056 100.896,108.624C102.048,108.144 103.368,108.264 104.856,108.984C106.728,109.896 108.504,110.544 110.184,110.928C111.864,111.312 113.544,111.504 115.224,111.504C121.08,111.504 124.008,109.32 124.008,104.952C124.008,100.92 121.272,98.904 115.8,98.904H111.552C109.968,98.904 108.744,98.52 107.88,97.752C107.064,96.936 106.656,95.832 106.656,94.44C106.656,93 107.064,91.896 107.88,91.128C108.744,90.312 109.968,89.904 111.552,89.904H114.72C117.12,89.904 119.016,89.352 120.408,88.248C121.8,87.144 122.496,85.608 122.496,83.64C122.496,79.704 119.928,77.736 114.792,77.736C113.208,77.736 111.672,77.928 110.184,78.312C108.744,78.648 107.16,79.272 105.432,80.184C104.088,80.856 102.888,80.976 101.832,80.544C100.776,80.112 99.984,79.368 99.456,78.312C98.976,77.256 98.88,76.152 99.168,75C99.456,73.848 100.296,72.888 101.688,72.12C105.864,69.672 110.568,68.448 115.8,68.448C121.272,68.448 125.544,69.672 128.616,72.12C131.688,74.568 133.224,77.928 133.224,82.2C133.224,84.84 132.552,87.168 131.208,89.184C129.864,91.2 127.992,92.664 125.592,93.576C128.472,94.392 130.704,95.904 132.288,98.112C133.92,100.272 134.736,102.888 134.736,105.96C134.736,110.568 133.032,114.192 129.624,116.832C126.216,119.472 121.56,120.792 115.656,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM115.656,120.792C113.112,120.792 110.52,120.504 107.88,119.928C105.288,119.352 103.032,118.488 101.112,117.336C99.576,116.52 98.616,115.512 98.232,114.312C97.848,113.064 97.896,111.912 98.376,110.856C98.904,109.8 99.744,109.056 100.896,108.624C102.048,108.144 103.368,108.264 104.856,108.984C106.728,109.896 108.504,110.544 110.184,110.928C111.864,111.312 113.544,111.504 115.224,111.504C121.08,111.504 124.008,109.32 124.008,104.952C124.008,100.92 121.272,98.904 115.8,98.904H111.552C109.968,98.904 108.744,98.52 107.88,97.752C107.064,96.936 106.656,95.832 106.656,94.44C106.656,93 107.064,91.896 107.88,91.128C108.744,90.312 109.968,89.904 111.552,89.904H114.72C117.12,89.904 119.016,89.352 120.408,88.248C121.8,87.144 122.496,85.608 122.496,83.64C122.496,79.704 119.928,77.736 114.792,77.736C113.208,77.736 111.672,77.928 110.184,78.312C108.744,78.648 107.16,79.272 105.432,80.184C104.088,80.856 102.888,80.976 101.832,80.544C100.776,80.112 99.984,79.368 99.456,78.312C98.976,77.256 98.88,76.152 99.168,75C99.456,73.848 100.296,72.888 101.688,72.12C105.864,69.672 110.568,68.448 115.8,68.448C121.272,68.448 125.544,69.672 128.616,72.12C131.688,74.568 133.224,77.928 133.224,82.2C133.224,84.84 132.552,87.168 131.208,89.184C129.864,91.2 127.992,92.664 125.592,93.576C128.472,94.392 130.704,95.904 132.288,98.112C133.92,100.272 134.736,102.888 134.736,105.96C134.736,110.568 133.032,114.192 129.624,116.832C126.216,119.472 121.56,120.792 115.656,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_24.xml b/lawnchair/res/drawable/themed_icon_calendar_24.xml
index 90f665d4c0..1cb9a0f267 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_24.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_24.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM124.8,120.648C123.024,120.648 121.656,120.168 120.696,119.208C119.736,118.248 119.256,116.856 119.256,115.032V110.928H103.128C101.352,110.928 99.936,110.544 98.88,109.776C97.824,108.96 97.296,107.736 97.296,106.104C97.296,105.144 97.512,104.184 97.944,103.224C98.376,102.216 99.144,100.944 100.248,99.408L118.896,72.264C119.712,71.016 120.6,70.104 121.56,69.528C122.568,68.904 123.744,68.592 125.088,68.592C126.672,68.592 127.92,69.072 128.832,70.032C129.744,70.944 130.2,72.336 130.2,74.208V102.144H132.864C136.08,102.144 137.688,103.608 137.688,106.536C137.688,109.464 136.08,110.928 132.864,110.928H130.2V115.032C130.2,116.856 129.72,118.248 128.76,119.208C127.848,120.168 126.528,120.648 124.8,120.648ZM119.256,102.144V85.368L107.88,102.144H119.256Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM124.8,120.648C123.024,120.648 121.656,120.168 120.696,119.208C119.736,118.248 119.256,116.856 119.256,115.032V110.928H103.128C101.352,110.928 99.936,110.544 98.88,109.776C97.824,108.96 97.296,107.736 97.296,106.104C97.296,105.144 97.512,104.184 97.944,103.224C98.376,102.216 99.144,100.944 100.248,99.408L118.896,72.264C119.712,71.016 120.6,70.104 121.56,69.528C122.568,68.904 123.744,68.592 125.088,68.592C126.672,68.592 127.92,69.072 128.832,70.032C129.744,70.944 130.2,72.336 130.2,74.208V102.144H132.864C136.08,102.144 137.688,103.608 137.688,106.536C137.688,109.464 136.08,110.928 132.864,110.928H130.2V115.032C130.2,116.856 129.72,118.248 128.76,119.208C127.848,120.168 126.528,120.648 124.8,120.648ZM119.256,102.144V85.368L107.88,102.144H119.256Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_25.xml b/lawnchair/res/drawable/themed_icon_calendar_25.xml
index 563bd47ff9..3a87e2e4d9 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_25.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_25.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.952,120.792C114.504,120.792 111.984,120.504 109.392,119.928C106.8,119.304 104.424,118.344 102.264,117.048C100.872,116.28 100.008,115.296 99.672,114.096C99.384,112.848 99.48,111.696 99.96,110.64C100.488,109.536 101.304,108.768 102.408,108.336C103.56,107.856 104.832,108 106.224,108.768C109.584,110.592 113.088,111.504 116.736,111.504C119.472,111.504 121.584,110.832 123.072,109.488C124.608,108.144 125.376,106.344 125.376,104.088C125.376,101.784 124.632,99.936 123.144,98.544C121.704,97.152 119.736,96.456 117.24,96.456C115.992,96.456 114.72,96.672 113.424,97.104C112.128,97.488 110.832,98.184 109.536,99.192C109.056,99.576 108.408,99.936 107.592,100.272C106.824,100.608 106.032,100.776 105.216,100.776C102.288,100.776 100.824,99.408 100.824,96.672V74.064C100.824,70.848 102.432,69.24 105.648,69.24H128.76C131.976,69.24 133.584,70.776 133.584,73.848C133.584,76.872 131.976,78.384 128.76,78.384H111.552V89.76C113.904,88.224 116.736,87.456 120.048,87.456C123.264,87.456 126.072,88.152 128.472,89.544C130.872,90.888 132.744,92.784 134.088,95.232C135.432,97.68 136.104,100.512 136.104,103.728C136.104,107.136 135.336,110.112 133.8,112.656C132.264,115.2 130.056,117.192 127.176,118.632C124.296,120.072 120.888,120.792 116.952,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.952,120.792C114.504,120.792 111.984,120.504 109.392,119.928C106.8,119.304 104.424,118.344 102.264,117.048C100.872,116.28 100.008,115.296 99.672,114.096C99.384,112.848 99.48,111.696 99.96,110.64C100.488,109.536 101.304,108.768 102.408,108.336C103.56,107.856 104.832,108 106.224,108.768C109.584,110.592 113.088,111.504 116.736,111.504C119.472,111.504 121.584,110.832 123.072,109.488C124.608,108.144 125.376,106.344 125.376,104.088C125.376,101.784 124.632,99.936 123.144,98.544C121.704,97.152 119.736,96.456 117.24,96.456C115.992,96.456 114.72,96.672 113.424,97.104C112.128,97.488 110.832,98.184 109.536,99.192C109.056,99.576 108.408,99.936 107.592,100.272C106.824,100.608 106.032,100.776 105.216,100.776C102.288,100.776 100.824,99.408 100.824,96.672V74.064C100.824,70.848 102.432,69.24 105.648,69.24H128.76C131.976,69.24 133.584,70.776 133.584,73.848C133.584,76.872 131.976,78.384 128.76,78.384H111.552V89.76C113.904,88.224 116.736,87.456 120.048,87.456C123.264,87.456 126.072,88.152 128.472,89.544C130.872,90.888 132.744,92.784 134.088,95.232C135.432,97.68 136.104,100.512 136.104,103.728C136.104,107.136 135.336,110.112 133.8,112.656C132.264,115.2 130.056,117.192 127.176,118.632C124.296,120.072 120.888,120.792 116.952,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_26.xml b/lawnchair/res/drawable/themed_icon_calendar_26.xml
index 742df2f239..510306feaa 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_26.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_26.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM118.824,120.792C112.344,120.792 107.328,118.584 103.776,114.168C100.272,109.704 98.52,103.416 98.52,95.304C98.52,86.808 100.512,80.208 104.496,75.504C108.48,70.8 114,68.448 121.056,68.448C123.12,68.448 125.208,68.736 127.32,69.312C129.432,69.888 131.4,70.752 133.224,71.904C134.424,72.576 135.144,73.488 135.384,74.64C135.672,75.792 135.576,76.896 135.096,77.952C134.664,79.008 133.92,79.776 132.864,80.256C131.856,80.736 130.632,80.64 129.192,79.968C127.704,79.152 126.264,78.576 124.872,78.24C123.528,77.904 122.208,77.736 120.912,77.736C113.04,77.736 109.104,82.896 109.104,93.216V94.584C110.112,92.184 111.672,90.336 113.784,89.04C115.896,87.696 118.32,87.024 121.056,87.024C123.936,87.024 126.48,87.744 128.688,89.184C130.944,90.576 132.72,92.52 134.016,95.016C135.312,97.464 135.96,100.272 135.96,103.44C135.96,106.8 135.216,109.8 133.728,112.44C132.288,115.032 130.272,117.072 127.68,118.56C125.136,120.048 122.184,120.792 118.824,120.792ZM118.248,112.08C120.456,112.08 122.232,111.336 123.576,109.848C124.968,108.312 125.664,106.32 125.664,103.872C125.664,101.472 124.968,99.504 123.576,97.968C122.232,96.432 120.456,95.664 118.248,95.664C115.992,95.664 114.168,96.432 112.776,97.968C111.432,99.504 110.76,101.472 110.76,103.872C110.76,106.32 111.432,108.312 112.776,109.848C114.168,111.336 115.992,112.08 118.248,112.08Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM118.824,120.792C112.344,120.792 107.328,118.584 103.776,114.168C100.272,109.704 98.52,103.416 98.52,95.304C98.52,86.808 100.512,80.208 104.496,75.504C108.48,70.8 114,68.448 121.056,68.448C123.12,68.448 125.208,68.736 127.32,69.312C129.432,69.888 131.4,70.752 133.224,71.904C134.424,72.576 135.144,73.488 135.384,74.64C135.672,75.792 135.576,76.896 135.096,77.952C134.664,79.008 133.92,79.776 132.864,80.256C131.856,80.736 130.632,80.64 129.192,79.968C127.704,79.152 126.264,78.576 124.872,78.24C123.528,77.904 122.208,77.736 120.912,77.736C113.04,77.736 109.104,82.896 109.104,93.216V94.584C110.112,92.184 111.672,90.336 113.784,89.04C115.896,87.696 118.32,87.024 121.056,87.024C123.936,87.024 126.48,87.744 128.688,89.184C130.944,90.576 132.72,92.52 134.016,95.016C135.312,97.464 135.96,100.272 135.96,103.44C135.96,106.8 135.216,109.8 133.728,112.44C132.288,115.032 130.272,117.072 127.68,118.56C125.136,120.048 122.184,120.792 118.824,120.792ZM118.248,112.08C120.456,112.08 122.232,111.336 123.576,109.848C124.968,108.312 125.664,106.32 125.664,103.872C125.664,101.472 124.968,99.504 123.576,97.968C122.232,96.432 120.456,95.664 118.248,95.664C115.992,95.664 114.168,96.432 112.776,97.968C111.432,99.504 110.76,101.472 110.76,103.872C110.76,106.32 111.432,108.312 112.776,109.848C114.168,111.336 115.992,112.08 118.248,112.08Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_27.xml b/lawnchair/res/drawable/themed_icon_calendar_27.xml
index 2b7705f09d..0233a3ad36 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_27.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_27.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM107.88,120.648C105.768,120.648 104.304,119.952 103.488,118.56C102.672,117.168 102.792,115.512 103.848,113.592L122.784,78.456H102.912C99.696,78.456 98.088,76.92 98.088,73.848C98.088,70.776 99.696,69.24 102.912,69.24H130.344C131.88,69.24 133.128,69.648 134.088,70.464C135.096,71.28 135.6,72.432 135.6,73.92C135.6,75.216 135.408,76.344 135.024,77.304C134.688,78.264 134.232,79.296 133.656,80.4L114.216,117.048C112.92,119.448 110.808,120.648 107.88,120.648Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM107.88,120.648C105.768,120.648 104.304,119.952 103.488,118.56C102.672,117.168 102.792,115.512 103.848,113.592L122.784,78.456H102.912C99.696,78.456 98.088,76.92 98.088,73.848C98.088,70.776 99.696,69.24 102.912,69.24H130.344C131.88,69.24 133.128,69.648 134.088,70.464C135.096,71.28 135.6,72.432 135.6,73.92C135.6,75.216 135.408,76.344 135.024,77.304C134.688,78.264 134.232,79.296 133.656,80.4L114.216,117.048C112.92,119.448 110.808,120.648 107.88,120.648Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_28.xml b/lawnchair/res/drawable/themed_icon_calendar_28.xml
index 122b172478..f7ec0ac54b 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_28.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_28.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.88,120.792C110.832,120.792 106.104,119.52 102.696,116.976C99.288,114.384 97.584,110.784 97.584,106.176C97.584,103.2 98.328,100.632 99.816,98.472C101.352,96.312 103.368,94.776 105.864,93.864C103.752,92.808 102.048,91.272 100.752,89.256C99.504,87.192 98.88,84.864 98.88,82.272C98.88,77.952 100.488,74.568 103.704,72.12C106.968,69.672 111.36,68.448 116.88,68.448C122.4,68.448 126.792,69.672 130.056,72.12C133.32,74.568 134.952,77.952 134.952,82.272C134.952,84.912 134.304,87.264 133.008,89.328C131.76,91.392 130.08,92.904 127.968,93.864C130.464,94.824 132.456,96.384 133.944,98.544C135.432,100.704 136.176,103.248 136.176,106.176C136.176,110.784 134.472,114.384 131.064,116.976C127.656,119.52 122.928,120.792 116.88,120.792ZM116.88,90.048C119.328,90.048 121.224,89.472 122.568,88.32C123.96,87.12 124.656,85.512 124.656,83.496C124.656,81.48 123.96,79.896 122.568,78.744C121.224,77.592 119.328,77.016 116.88,77.016C114.432,77.016 112.536,77.592 111.192,78.744C109.848,79.896 109.176,81.48 109.176,83.496C109.176,85.512 109.848,87.12 111.192,88.32C112.536,89.472 114.432,90.048 116.88,90.048ZM116.88,112.224C122.928,112.224 125.952,109.944 125.952,105.384C125.952,100.872 122.928,98.616 116.88,98.616C113.952,98.616 111.696,99.192 110.112,100.344C108.576,101.448 107.808,103.128 107.808,105.384C107.808,107.64 108.576,109.344 110.112,110.496C111.696,111.648 113.952,112.224 116.88,112.224Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM116.88,120.792C110.832,120.792 106.104,119.52 102.696,116.976C99.288,114.384 97.584,110.784 97.584,106.176C97.584,103.2 98.328,100.632 99.816,98.472C101.352,96.312 103.368,94.776 105.864,93.864C103.752,92.808 102.048,91.272 100.752,89.256C99.504,87.192 98.88,84.864 98.88,82.272C98.88,77.952 100.488,74.568 103.704,72.12C106.968,69.672 111.36,68.448 116.88,68.448C122.4,68.448 126.792,69.672 130.056,72.12C133.32,74.568 134.952,77.952 134.952,82.272C134.952,84.912 134.304,87.264 133.008,89.328C131.76,91.392 130.08,92.904 127.968,93.864C130.464,94.824 132.456,96.384 133.944,98.544C135.432,100.704 136.176,103.248 136.176,106.176C136.176,110.784 134.472,114.384 131.064,116.976C127.656,119.52 122.928,120.792 116.88,120.792ZM116.88,90.048C119.328,90.048 121.224,89.472 122.568,88.32C123.96,87.12 124.656,85.512 124.656,83.496C124.656,81.48 123.96,79.896 122.568,78.744C121.224,77.592 119.328,77.016 116.88,77.016C114.432,77.016 112.536,77.592 111.192,78.744C109.848,79.896 109.176,81.48 109.176,83.496C109.176,85.512 109.848,87.12 111.192,88.32C112.536,89.472 114.432,90.048 116.88,90.048ZM116.88,112.224C122.928,112.224 125.952,109.944 125.952,105.384C125.952,100.872 122.928,98.616 116.88,98.616C113.952,98.616 111.696,99.192 110.112,100.344C108.576,101.448 107.808,103.128 107.808,105.384C107.808,107.64 108.576,109.344 110.112,110.496C111.696,111.648 113.952,112.224 116.88,112.224Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_29.xml b/lawnchair/res/drawable/themed_icon_calendar_29.xml
index 50a88e0080..d690c67e78 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_29.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_29.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM112.704,120.792C110.64,120.792 108.552,120.504 106.44,119.928C104.328,119.352 102.36,118.488 100.536,117.336C99.336,116.664 98.592,115.752 98.304,114.6C98.064,113.448 98.16,112.344 98.592,111.288C99.072,110.232 99.816,109.464 100.824,108.984C101.88,108.504 103.128,108.6 104.568,109.272C106.056,110.088 107.472,110.664 108.816,111C110.208,111.336 111.552,111.504 112.848,111.504C120.72,111.504 124.656,106.344 124.656,96.024V94.656C123.648,97.056 122.088,98.928 119.976,100.272C117.864,101.568 115.44,102.216 112.704,102.216C109.824,102.216 107.256,101.52 105,100.128C102.792,98.688 101.04,96.744 99.744,94.296C98.448,91.8 97.8,88.968 97.8,85.8C97.8,82.44 98.52,79.464 99.96,76.872C101.448,74.232 103.464,72.168 106.008,70.68C108.6,69.192 111.576,68.448 114.936,68.448C121.416,68.448 126.408,70.68 129.912,75.144C133.464,79.56 135.24,85.824 135.24,93.936C135.24,102.432 133.248,109.032 129.264,113.736C125.28,118.44 119.76,120.792 112.704,120.792ZM115.584,93.504C117.792,93.504 119.592,92.76 120.984,91.272C122.376,89.736 123.072,87.744 123.072,85.296C123.072,82.848 122.376,80.88 120.984,79.392C119.592,77.856 117.792,77.088 115.584,77.088C113.376,77.088 111.576,77.856 110.184,79.392C108.792,80.88 108.096,82.848 108.096,85.296C108.096,87.744 108.792,89.736 110.184,91.272C111.576,92.76 113.376,93.504 115.584,93.504Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M63.484,120C61.66,120 60.34,119.592 59.524,118.776C58.708,117.912 58.3,116.664 58.3,115.032C58.3,113.976 58.564,112.992 59.092,112.08C59.62,111.168 60.34,110.232 61.252,109.272L74.788,95.016C76.804,92.856 78.244,90.936 79.108,89.256C80.02,87.576 80.476,85.896 80.476,84.216C80.476,79.896 77.812,77.736 72.484,77.736C71.092,77.736 69.652,77.928 68.164,78.312C66.724,78.696 65.212,79.368 63.628,80.328C62.332,81.096 61.132,81.264 60.028,80.832C58.972,80.4 58.18,79.656 57.652,78.6C57.172,77.544 57.052,76.44 57.292,75.288C57.58,74.088 58.372,73.104 59.668,72.336C61.78,71.04 64.084,70.08 66.58,69.456C69.076,68.784 71.548,68.448 73.996,68.448C79.66,68.448 83.98,69.72 86.956,72.264C89.98,74.76 91.492,78.336 91.492,82.992C91.492,86.064 90.772,89.016 89.332,91.848C87.94,94.632 85.636,97.656 82.42,100.92L72.628,110.856H89.332C92.452,110.856 94.012,112.368 94.012,115.392C94.012,118.464 92.452,120 89.332,120H63.484ZM112.704,120.792C110.64,120.792 108.552,120.504 106.44,119.928C104.328,119.352 102.36,118.488 100.536,117.336C99.336,116.664 98.592,115.752 98.304,114.6C98.064,113.448 98.16,112.344 98.592,111.288C99.072,110.232 99.816,109.464 100.824,108.984C101.88,108.504 103.128,108.6 104.568,109.272C106.056,110.088 107.472,110.664 108.816,111C110.208,111.336 111.552,111.504 112.848,111.504C120.72,111.504 124.656,106.344 124.656,96.024V94.656C123.648,97.056 122.088,98.928 119.976,100.272C117.864,101.568 115.44,102.216 112.704,102.216C109.824,102.216 107.256,101.52 105,100.128C102.792,98.688 101.04,96.744 99.744,94.296C98.448,91.8 97.8,88.968 97.8,85.8C97.8,82.44 98.52,79.464 99.96,76.872C101.448,74.232 103.464,72.168 106.008,70.68C108.6,69.192 111.576,68.448 114.936,68.448C121.416,68.448 126.408,70.68 129.912,75.144C133.464,79.56 135.24,85.824 135.24,93.936C135.24,102.432 133.248,109.032 129.264,113.736C125.28,118.44 119.76,120.792 112.704,120.792ZM115.584,93.504C117.792,93.504 119.592,92.76 120.984,91.272C122.376,89.736 123.072,87.744 123.072,85.296C123.072,82.848 122.376,80.88 120.984,79.392C119.592,77.856 117.792,77.088 115.584,77.088C113.376,77.088 111.576,77.856 110.184,79.392C108.792,80.88 108.096,82.848 108.096,85.296C108.096,87.744 108.792,89.736 110.184,91.272C111.576,92.76 113.376,93.504 115.584,93.504Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_3.xml b/lawnchair/res/drawable/themed_icon_calendar_3.xml
index 696a2e98ff..a2ee445f96 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_3.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_3.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M94.79,120.792C92.246,120.792 89.654,120.504 87.014,119.928C84.422,119.352 82.166,118.488 80.246,117.336C78.71,116.52 77.75,115.512 77.366,114.312C76.982,113.064 77.03,111.912 77.51,110.856C78.038,109.8 78.878,109.056 80.03,108.624C81.182,108.144 82.502,108.264 83.99,108.984C85.862,109.896 87.638,110.544 89.318,110.928C90.998,111.312 92.678,111.504 94.358,111.504C100.214,111.504 103.142,109.32 103.142,104.952C103.142,100.92 100.406,98.904 94.934,98.904H90.686C89.102,98.904 87.878,98.52 87.014,97.752C86.198,96.936 85.79,95.832 85.79,94.44C85.79,93 86.198,91.896 87.014,91.128C87.878,90.312 89.102,89.904 90.686,89.904H93.854C96.254,89.904 98.15,89.352 99.542,88.248C100.934,87.144 101.63,85.608 101.63,83.64C101.63,79.704 99.062,77.736 93.926,77.736C92.342,77.736 90.806,77.928 89.318,78.312C87.878,78.648 86.294,79.272 84.566,80.184C83.222,80.856 82.022,80.976 80.966,80.544C79.91,80.112 79.118,79.368 78.59,78.312C78.11,77.256 78.014,76.152 78.302,75C78.59,73.848 79.43,72.888 80.822,72.12C84.998,69.672 89.702,68.448 94.934,68.448C100.406,68.448 104.678,69.672 107.75,72.12C110.822,74.568 112.358,77.928 112.358,82.2C112.358,84.84 111.686,87.168 110.342,89.184C108.998,91.2 107.126,92.664 104.726,93.576C107.606,94.392 109.838,95.904 111.422,98.112C113.054,100.272 113.87,102.888 113.87,105.96C113.87,110.568 112.166,114.192 108.758,116.832C105.35,119.472 100.694,120.792 94.79,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M94.79,120.792C92.246,120.792 89.654,120.504 87.014,119.928C84.422,119.352 82.166,118.488 80.246,117.336C78.71,116.52 77.75,115.512 77.366,114.312C76.982,113.064 77.03,111.912 77.51,110.856C78.038,109.8 78.878,109.056 80.03,108.624C81.182,108.144 82.502,108.264 83.99,108.984C85.862,109.896 87.638,110.544 89.318,110.928C90.998,111.312 92.678,111.504 94.358,111.504C100.214,111.504 103.142,109.32 103.142,104.952C103.142,100.92 100.406,98.904 94.934,98.904H90.686C89.102,98.904 87.878,98.52 87.014,97.752C86.198,96.936 85.79,95.832 85.79,94.44C85.79,93 86.198,91.896 87.014,91.128C87.878,90.312 89.102,89.904 90.686,89.904H93.854C96.254,89.904 98.15,89.352 99.542,88.248C100.934,87.144 101.63,85.608 101.63,83.64C101.63,79.704 99.062,77.736 93.926,77.736C92.342,77.736 90.806,77.928 89.318,78.312C87.878,78.648 86.294,79.272 84.566,80.184C83.222,80.856 82.022,80.976 80.966,80.544C79.91,80.112 79.118,79.368 78.59,78.312C78.11,77.256 78.014,76.152 78.302,75C78.59,73.848 79.43,72.888 80.822,72.12C84.998,69.672 89.702,68.448 94.934,68.448C100.406,68.448 104.678,69.672 107.75,72.12C110.822,74.568 112.358,77.928 112.358,82.2C112.358,84.84 111.686,87.168 110.342,89.184C108.998,91.2 107.126,92.664 104.726,93.576C107.606,94.392 109.838,95.904 111.422,98.112C113.054,100.272 113.87,102.888 113.87,105.96C113.87,110.568 112.166,114.192 108.758,116.832C105.35,119.472 100.694,120.792 94.79,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_30.xml b/lawnchair/res/drawable/themed_icon_calendar_30.xml
index 3df0bcb05e..3671cd3ff1 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_30.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_30.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M73.924,120.792C71.38,120.792 68.788,120.504 66.148,119.928C63.556,119.352 61.3,118.488 59.38,117.336C57.844,116.52 56.884,115.512 56.5,114.312C56.116,113.064 56.164,111.912 56.644,110.856C57.172,109.8 58.012,109.056 59.164,108.624C60.316,108.144 61.636,108.264 63.124,108.984C64.996,109.896 66.772,110.544 68.452,110.928C70.132,111.312 71.812,111.504 73.492,111.504C79.348,111.504 82.276,109.32 82.276,104.952C82.276,100.92 79.54,98.904 74.068,98.904H69.82C68.236,98.904 67.012,98.52 66.148,97.752C65.332,96.936 64.924,95.832 64.924,94.44C64.924,93 65.332,91.896 66.148,91.128C67.012,90.312 68.236,89.904 69.82,89.904H72.988C75.388,89.904 77.284,89.352 78.676,88.248C80.068,87.144 80.764,85.608 80.764,83.64C80.764,79.704 78.196,77.736 73.06,77.736C71.476,77.736 69.94,77.928 68.452,78.312C67.012,78.648 65.428,79.272 63.7,80.184C62.356,80.856 61.156,80.976 60.1,80.544C59.044,80.112 58.252,79.368 57.724,78.312C57.244,77.256 57.148,76.152 57.436,75C57.724,73.848 58.564,72.888 59.956,72.12C64.132,69.672 68.836,68.448 74.068,68.448C79.54,68.448 83.812,69.672 86.884,72.12C89.956,74.568 91.492,77.928 91.492,82.2C91.492,84.84 90.82,87.168 89.476,89.184C88.132,91.2 86.26,92.664 83.86,93.576C86.74,94.392 88.972,95.904 90.556,98.112C92.188,100.272 93.004,102.888 93.004,105.96C93.004,110.568 91.3,114.192 87.892,116.832C84.484,119.472 79.828,120.792 73.924,120.792ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M73.924,120.792C71.38,120.792 68.788,120.504 66.148,119.928C63.556,119.352 61.3,118.488 59.38,117.336C57.844,116.52 56.884,115.512 56.5,114.312C56.116,113.064 56.164,111.912 56.644,110.856C57.172,109.8 58.012,109.056 59.164,108.624C60.316,108.144 61.636,108.264 63.124,108.984C64.996,109.896 66.772,110.544 68.452,110.928C70.132,111.312 71.812,111.504 73.492,111.504C79.348,111.504 82.276,109.32 82.276,104.952C82.276,100.92 79.54,98.904 74.068,98.904H69.82C68.236,98.904 67.012,98.52 66.148,97.752C65.332,96.936 64.924,95.832 64.924,94.44C64.924,93 65.332,91.896 66.148,91.128C67.012,90.312 68.236,89.904 69.82,89.904H72.988C75.388,89.904 77.284,89.352 78.676,88.248C80.068,87.144 80.764,85.608 80.764,83.64C80.764,79.704 78.196,77.736 73.06,77.736C71.476,77.736 69.94,77.928 68.452,78.312C67.012,78.648 65.428,79.272 63.7,80.184C62.356,80.856 61.156,80.976 60.1,80.544C59.044,80.112 58.252,79.368 57.724,78.312C57.244,77.256 57.148,76.152 57.436,75C57.724,73.848 58.564,72.888 59.956,72.12C64.132,69.672 68.836,68.448 74.068,68.448C79.54,68.448 83.812,69.672 86.884,72.12C89.956,74.568 91.492,77.928 91.492,82.2C91.492,84.84 90.82,87.168 89.476,89.184C88.132,91.2 86.26,92.664 83.86,93.576C86.74,94.392 88.972,95.904 90.556,98.112C92.188,100.272 93.004,102.888 93.004,105.96C93.004,110.568 91.3,114.192 87.892,116.832C84.484,119.472 79.828,120.792 73.924,120.792ZM116.88,120.792C110.736,120.792 106.032,118.512 102.768,113.952C99.552,109.392 97.944,102.888 97.944,94.44C97.944,85.992 99.552,79.56 102.768,75.144C106.032,70.68 110.736,68.448 116.88,68.448C123.024,68.448 127.704,70.68 130.92,75.144C134.184,79.56 135.816,85.992 135.816,94.44C135.816,102.888 134.184,109.392 130.92,113.952C127.704,118.512 123.024,120.792 116.88,120.792ZM116.88,111.72C119.664,111.72 121.728,110.352 123.072,107.616C124.416,104.832 125.088,100.44 125.088,94.44C125.088,88.44 124.416,84.12 123.072,81.48C121.728,78.84 119.664,77.52 116.88,77.52C114.096,77.52 112.032,78.84 110.688,81.48C109.344,84.12 108.672,88.44 108.672,94.44C108.672,100.44 109.344,104.832 110.688,107.616C112.032,110.352 114.096,111.72 116.88,111.72Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_31.xml b/lawnchair/res/drawable/themed_icon_calendar_31.xml
index b8e6e5d802..29f32d18bd 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_31.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_31.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M73.924,120.792C71.38,120.792 68.788,120.504 66.148,119.928C63.556,119.352 61.3,118.488 59.38,117.336C57.844,116.52 56.884,115.512 56.5,114.312C56.116,113.064 56.164,111.912 56.644,110.856C57.172,109.8 58.012,109.056 59.164,108.624C60.316,108.144 61.636,108.264 63.124,108.984C64.996,109.896 66.772,110.544 68.452,110.928C70.132,111.312 71.812,111.504 73.492,111.504C79.348,111.504 82.276,109.32 82.276,104.952C82.276,100.92 79.54,98.904 74.068,98.904H69.82C68.236,98.904 67.012,98.52 66.148,97.752C65.332,96.936 64.924,95.832 64.924,94.44C64.924,93 65.332,91.896 66.148,91.128C67.012,90.312 68.236,89.904 69.82,89.904H72.988C75.388,89.904 77.284,89.352 78.676,88.248C80.068,87.144 80.764,85.608 80.764,83.64C80.764,79.704 78.196,77.736 73.06,77.736C71.476,77.736 69.94,77.928 68.452,78.312C67.012,78.648 65.428,79.272 63.7,80.184C62.356,80.856 61.156,80.976 60.1,80.544C59.044,80.112 58.252,79.368 57.724,78.312C57.244,77.256 57.148,76.152 57.436,75C57.724,73.848 58.564,72.888 59.956,72.12C64.132,69.672 68.836,68.448 74.068,68.448C79.54,68.448 83.812,69.672 86.884,72.12C89.956,74.568 91.492,77.928 91.492,82.2C91.492,84.84 90.82,87.168 89.476,89.184C88.132,91.2 86.26,92.664 83.86,93.576C86.74,94.392 88.972,95.904 90.556,98.112C92.188,100.272 93.004,102.888 93.004,105.96C93.004,110.568 91.3,114.192 87.892,116.832C84.484,119.472 79.828,120.792 73.924,120.792ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M73.924,120.792C71.38,120.792 68.788,120.504 66.148,119.928C63.556,119.352 61.3,118.488 59.38,117.336C57.844,116.52 56.884,115.512 56.5,114.312C56.116,113.064 56.164,111.912 56.644,110.856C57.172,109.8 58.012,109.056 59.164,108.624C60.316,108.144 61.636,108.264 63.124,108.984C64.996,109.896 66.772,110.544 68.452,110.928C70.132,111.312 71.812,111.504 73.492,111.504C79.348,111.504 82.276,109.32 82.276,104.952C82.276,100.92 79.54,98.904 74.068,98.904H69.82C68.236,98.904 67.012,98.52 66.148,97.752C65.332,96.936 64.924,95.832 64.924,94.44C64.924,93 65.332,91.896 66.148,91.128C67.012,90.312 68.236,89.904 69.82,89.904H72.988C75.388,89.904 77.284,89.352 78.676,88.248C80.068,87.144 80.764,85.608 80.764,83.64C80.764,79.704 78.196,77.736 73.06,77.736C71.476,77.736 69.94,77.928 68.452,78.312C67.012,78.648 65.428,79.272 63.7,80.184C62.356,80.856 61.156,80.976 60.1,80.544C59.044,80.112 58.252,79.368 57.724,78.312C57.244,77.256 57.148,76.152 57.436,75C57.724,73.848 58.564,72.888 59.956,72.12C64.132,69.672 68.836,68.448 74.068,68.448C79.54,68.448 83.812,69.672 86.884,72.12C89.956,74.568 91.492,77.928 91.492,82.2C91.492,84.84 90.82,87.168 89.476,89.184C88.132,91.2 86.26,92.664 83.86,93.576C86.74,94.392 88.972,95.904 90.556,98.112C92.188,100.272 93.004,102.888 93.004,105.96C93.004,110.568 91.3,114.192 87.892,116.832C84.484,119.472 79.828,120.792 73.924,120.792ZM106.584,120C103.416,120 101.832,118.464 101.832,115.392C101.832,112.368 103.416,110.856 106.584,110.856H113.856V81.624L108.6,84.792C107.208,85.608 105.96,85.824 104.856,85.44C103.752,85.056 102.912,84.336 102.336,83.28C101.76,82.224 101.592,81.096 101.832,79.896C102.072,78.648 102.864,77.592 104.208,76.728L114.216,70.68C115.224,70.056 116.232,69.552 117.24,69.168C118.296,68.784 119.328,68.592 120.336,68.592C121.776,68.592 122.904,68.976 123.72,69.744C124.584,70.512 125.016,71.64 125.016,73.128V110.856H131.568C134.688,110.856 136.248,112.368 136.248,115.392C136.248,118.464 134.688,120 131.568,120H106.584Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_4.xml b/lawnchair/res/drawable/themed_icon_calendar_4.xml
index a77118a6b3..44f9146e38 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_4.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_4.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M103.934,120.648C102.158,120.648 100.79,120.168 99.83,119.208C98.87,118.248 98.39,116.856 98.39,115.032V110.928H82.262C80.486,110.928 79.07,110.544 78.014,109.776C76.958,108.96 76.43,107.736 76.43,106.104C76.43,105.144 76.646,104.184 77.078,103.224C77.51,102.216 78.278,100.944 79.382,99.408L98.03,72.264C98.846,71.016 99.734,70.104 100.694,69.528C101.702,68.904 102.878,68.592 104.222,68.592C105.806,68.592 107.054,69.072 107.966,70.032C108.878,70.944 109.334,72.336 109.334,74.208V102.144H111.998C115.214,102.144 116.822,103.608 116.822,106.536C116.822,109.464 115.214,110.928 111.998,110.928H109.334V115.032C109.334,116.856 108.854,118.248 107.894,119.208C106.982,120.168 105.662,120.648 103.934,120.648ZM98.39,102.144V85.368L87.014,102.144H98.39Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M103.934,120.648C102.158,120.648 100.79,120.168 99.83,119.208C98.87,118.248 98.39,116.856 98.39,115.032V110.928H82.262C80.486,110.928 79.07,110.544 78.014,109.776C76.958,108.96 76.43,107.736 76.43,106.104C76.43,105.144 76.646,104.184 77.078,103.224C77.51,102.216 78.278,100.944 79.382,99.408L98.03,72.264C98.846,71.016 99.734,70.104 100.694,69.528C101.702,68.904 102.878,68.592 104.222,68.592C105.806,68.592 107.054,69.072 107.966,70.032C108.878,70.944 109.334,72.336 109.334,74.208V102.144H111.998C115.214,102.144 116.822,103.608 116.822,106.536C116.822,109.464 115.214,110.928 111.998,110.928H109.334V115.032C109.334,116.856 108.854,118.248 107.894,119.208C106.982,120.168 105.662,120.648 103.934,120.648ZM98.39,102.144V85.368L87.014,102.144H98.39Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_5.xml b/lawnchair/res/drawable/themed_icon_calendar_5.xml
index 631aa86c9d..357f829a61 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_5.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_5.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M96.086,120.792C93.638,120.792 91.118,120.504 88.526,119.928C85.934,119.304 83.558,118.344 81.398,117.048C80.006,116.28 79.142,115.296 78.806,114.096C78.518,112.848 78.614,111.696 79.094,110.64C79.622,109.536 80.438,108.768 81.542,108.336C82.694,107.856 83.966,108 85.358,108.768C88.718,110.592 92.222,111.504 95.87,111.504C98.606,111.504 100.718,110.832 102.206,109.488C103.742,108.144 104.51,106.344 104.51,104.088C104.51,101.784 103.766,99.936 102.278,98.544C100.838,97.152 98.87,96.456 96.374,96.456C95.126,96.456 93.854,96.672 92.558,97.104C91.262,97.488 89.966,98.184 88.67,99.192C88.19,99.576 87.542,99.936 86.726,100.272C85.958,100.608 85.166,100.776 84.35,100.776C81.422,100.776 79.958,99.408 79.958,96.672V74.064C79.958,70.848 81.566,69.24 84.782,69.24H107.894C111.11,69.24 112.718,70.776 112.718,73.848C112.718,76.872 111.11,78.384 107.894,78.384H90.686V89.76C93.038,88.224 95.87,87.456 99.182,87.456C102.398,87.456 105.206,88.152 107.606,89.544C110.006,90.888 111.878,92.784 113.222,95.232C114.566,97.68 115.238,100.512 115.238,103.728C115.238,107.136 114.47,110.112 112.934,112.656C111.398,115.2 109.19,117.192 106.31,118.632C103.43,120.072 100.022,120.792 96.086,120.792Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M96.086,120.792C93.638,120.792 91.118,120.504 88.526,119.928C85.934,119.304 83.558,118.344 81.398,117.048C80.006,116.28 79.142,115.296 78.806,114.096C78.518,112.848 78.614,111.696 79.094,110.64C79.622,109.536 80.438,108.768 81.542,108.336C82.694,107.856 83.966,108 85.358,108.768C88.718,110.592 92.222,111.504 95.87,111.504C98.606,111.504 100.718,110.832 102.206,109.488C103.742,108.144 104.51,106.344 104.51,104.088C104.51,101.784 103.766,99.936 102.278,98.544C100.838,97.152 98.87,96.456 96.374,96.456C95.126,96.456 93.854,96.672 92.558,97.104C91.262,97.488 89.966,98.184 88.67,99.192C88.19,99.576 87.542,99.936 86.726,100.272C85.958,100.608 85.166,100.776 84.35,100.776C81.422,100.776 79.958,99.408 79.958,96.672V74.064C79.958,70.848 81.566,69.24 84.782,69.24H107.894C111.11,69.24 112.718,70.776 112.718,73.848C112.718,76.872 111.11,78.384 107.894,78.384H90.686V89.76C93.038,88.224 95.87,87.456 99.182,87.456C102.398,87.456 105.206,88.152 107.606,89.544C110.006,90.888 111.878,92.784 113.222,95.232C114.566,97.68 115.238,100.512 115.238,103.728C115.238,107.136 114.47,110.112 112.934,112.656C111.398,115.2 109.19,117.192 106.31,118.632C103.43,120.072 100.022,120.792 96.086,120.792Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_6.xml b/lawnchair/res/drawable/themed_icon_calendar_6.xml
index d9eb96a979..308ad99a1c 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_6.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_6.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M97.958,120.792C91.478,120.792 86.462,118.584 82.91,114.168C79.406,109.704 77.654,103.416 77.654,95.304C77.654,86.808 79.646,80.208 83.63,75.504C87.614,70.8 93.134,68.448 100.19,68.448C102.254,68.448 104.342,68.736 106.454,69.312C108.566,69.888 110.534,70.752 112.358,71.904C113.558,72.576 114.278,73.488 114.518,74.64C114.806,75.792 114.71,76.896 114.23,77.952C113.798,79.008 113.054,79.776 111.998,80.256C110.99,80.736 109.766,80.64 108.326,79.968C106.838,79.152 105.398,78.576 104.006,78.24C102.662,77.904 101.342,77.736 100.046,77.736C92.174,77.736 88.238,82.896 88.238,93.216V94.584C89.246,92.184 90.806,90.336 92.918,89.04C95.03,87.696 97.454,87.024 100.19,87.024C103.07,87.024 105.614,87.744 107.822,89.184C110.078,90.576 111.854,92.52 113.15,95.016C114.446,97.464 115.094,100.272 115.094,103.44C115.094,106.8 114.35,109.8 112.862,112.44C111.422,115.032 109.406,117.072 106.814,118.56C104.27,120.048 101.318,120.792 97.958,120.792ZM97.382,112.08C99.59,112.08 101.366,111.336 102.71,109.848C104.102,108.312 104.798,106.32 104.798,103.872C104.798,101.472 104.102,99.504 102.71,97.968C101.366,96.432 99.59,95.664 97.382,95.664C95.126,95.664 93.302,96.432 91.91,97.968C90.566,99.504 89.894,101.472 89.894,103.872C89.894,106.32 90.566,108.312 91.91,109.848C93.302,111.336 95.126,112.08 97.382,112.08Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M97.958,120.792C91.478,120.792 86.462,118.584 82.91,114.168C79.406,109.704 77.654,103.416 77.654,95.304C77.654,86.808 79.646,80.208 83.63,75.504C87.614,70.8 93.134,68.448 100.19,68.448C102.254,68.448 104.342,68.736 106.454,69.312C108.566,69.888 110.534,70.752 112.358,71.904C113.558,72.576 114.278,73.488 114.518,74.64C114.806,75.792 114.71,76.896 114.23,77.952C113.798,79.008 113.054,79.776 111.998,80.256C110.99,80.736 109.766,80.64 108.326,79.968C106.838,79.152 105.398,78.576 104.006,78.24C102.662,77.904 101.342,77.736 100.046,77.736C92.174,77.736 88.238,82.896 88.238,93.216V94.584C89.246,92.184 90.806,90.336 92.918,89.04C95.03,87.696 97.454,87.024 100.19,87.024C103.07,87.024 105.614,87.744 107.822,89.184C110.078,90.576 111.854,92.52 113.15,95.016C114.446,97.464 115.094,100.272 115.094,103.44C115.094,106.8 114.35,109.8 112.862,112.44C111.422,115.032 109.406,117.072 106.814,118.56C104.27,120.048 101.318,120.792 97.958,120.792ZM97.382,112.08C99.59,112.08 101.366,111.336 102.71,109.848C104.102,108.312 104.798,106.32 104.798,103.872C104.798,101.472 104.102,99.504 102.71,97.968C101.366,96.432 99.59,95.664 97.382,95.664C95.126,95.664 93.302,96.432 91.91,97.968C90.566,99.504 89.894,101.472 89.894,103.872C89.894,106.32 90.566,108.312 91.91,109.848C93.302,111.336 95.126,112.08 97.382,112.08Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_7.xml b/lawnchair/res/drawable/themed_icon_calendar_7.xml
index d03026ceb3..26dd71f017 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_7.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_7.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M87.014,120.648C84.902,120.648 83.438,119.952 82.622,118.56C81.806,117.168 81.926,115.512 82.982,113.592L101.918,78.456H82.046C78.83,78.456 77.222,76.92 77.222,73.848C77.222,70.776 78.83,69.24 82.046,69.24H109.478C111.014,69.24 112.262,69.648 113.222,70.464C114.23,71.28 114.734,72.432 114.734,73.92C114.734,75.216 114.542,76.344 114.158,77.304C113.822,78.264 113.366,79.296 112.79,80.4L93.35,117.048C92.054,119.448 89.942,120.648 87.014,120.648Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M87.014,120.648C84.902,120.648 83.438,119.952 82.622,118.56C81.806,117.168 81.926,115.512 82.982,113.592L101.918,78.456H82.046C78.83,78.456 77.222,76.92 77.222,73.848C77.222,70.776 78.83,69.24 82.046,69.24H109.478C111.014,69.24 112.262,69.648 113.222,70.464C114.23,71.28 114.734,72.432 114.734,73.92C114.734,75.216 114.542,76.344 114.158,77.304C113.822,78.264 113.366,79.296 112.79,80.4L93.35,117.048C92.054,119.448 89.942,120.648 87.014,120.648Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_8.xml b/lawnchair/res/drawable/themed_icon_calendar_8.xml
index 49579eafe4..8ca07f8e6b 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_8.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_8.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M96.014,120.792C89.966,120.792 85.238,119.52 81.83,116.976C78.422,114.384 76.718,110.784 76.718,106.176C76.718,103.2 77.462,100.632 78.95,98.472C80.486,96.312 82.502,94.776 84.998,93.864C82.886,92.808 81.182,91.272 79.886,89.256C78.638,87.192 78.014,84.864 78.014,82.272C78.014,77.952 79.622,74.568 82.838,72.12C86.102,69.672 90.494,68.448 96.014,68.448C101.534,68.448 105.926,69.672 109.19,72.12C112.454,74.568 114.086,77.952 114.086,82.272C114.086,84.912 113.438,87.264 112.142,89.328C110.894,91.392 109.214,92.904 107.102,93.864C109.598,94.824 111.59,96.384 113.078,98.544C114.566,100.704 115.31,103.248 115.31,106.176C115.31,110.784 113.606,114.384 110.198,116.976C106.79,119.52 102.062,120.792 96.014,120.792ZM96.014,90.048C98.462,90.048 100.358,89.472 101.702,88.32C103.094,87.12 103.79,85.512 103.79,83.496C103.79,81.48 103.094,79.896 101.702,78.744C100.358,77.592 98.462,77.016 96.014,77.016C93.566,77.016 91.67,77.592 90.326,78.744C88.982,79.896 88.31,81.48 88.31,83.496C88.31,85.512 88.982,87.12 90.326,88.32C91.67,89.472 93.566,90.048 96.014,90.048ZM96.014,112.224C102.062,112.224 105.086,109.944 105.086,105.384C105.086,100.872 102.062,98.616 96.014,98.616C93.086,98.616 90.83,99.192 89.246,100.344C87.71,101.448 86.942,103.128 86.942,105.384C86.942,107.64 87.71,109.344 89.246,110.496C90.83,111.648 93.086,112.224 96.014,112.224Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M96.014,120.792C89.966,120.792 85.238,119.52 81.83,116.976C78.422,114.384 76.718,110.784 76.718,106.176C76.718,103.2 77.462,100.632 78.95,98.472C80.486,96.312 82.502,94.776 84.998,93.864C82.886,92.808 81.182,91.272 79.886,89.256C78.638,87.192 78.014,84.864 78.014,82.272C78.014,77.952 79.622,74.568 82.838,72.12C86.102,69.672 90.494,68.448 96.014,68.448C101.534,68.448 105.926,69.672 109.19,72.12C112.454,74.568 114.086,77.952 114.086,82.272C114.086,84.912 113.438,87.264 112.142,89.328C110.894,91.392 109.214,92.904 107.102,93.864C109.598,94.824 111.59,96.384 113.078,98.544C114.566,100.704 115.31,103.248 115.31,106.176C115.31,110.784 113.606,114.384 110.198,116.976C106.79,119.52 102.062,120.792 96.014,120.792ZM96.014,90.048C98.462,90.048 100.358,89.472 101.702,88.32C103.094,87.12 103.79,85.512 103.79,83.496C103.79,81.48 103.094,79.896 101.702,78.744C100.358,77.592 98.462,77.016 96.014,77.016C93.566,77.016 91.67,77.592 90.326,78.744C88.982,79.896 88.31,81.48 88.31,83.496C88.31,85.512 88.982,87.12 90.326,88.32C91.67,89.472 93.566,90.048 96.014,90.048ZM96.014,112.224C102.062,112.224 105.086,109.944 105.086,105.384C105.086,100.872 102.062,98.616 96.014,98.616C93.086,98.616 90.83,99.192 89.246,100.344C87.71,101.448 86.942,103.128 86.942,105.384C86.942,107.64 87.71,109.344 89.246,110.496C90.83,111.648 93.086,112.224 96.014,112.224Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_calendar_9.xml b/lawnchair/res/drawable/themed_icon_calendar_9.xml
index e343d43778..e65272fc37 100644
--- a/lawnchair/res/drawable/themed_icon_calendar_9.xml
+++ b/lawnchair/res/drawable/themed_icon_calendar_9.xml
@@ -3,12 +3,12 @@
     android:height="192dp"
     android:viewportWidth="192"
     android:viewportHeight="192">
-  <path
-      android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
-      android:strokeWidth="12"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000"/>
-  <path
-      android:pathData="M91.838,120.792C89.774,120.792 87.686,120.504 85.574,119.928C83.462,119.352 81.494,118.488 79.67,117.336C78.47,116.664 77.726,115.752 77.438,114.6C77.198,113.448 77.294,112.344 77.726,111.288C78.206,110.232 78.95,109.464 79.958,108.984C81.014,108.504 82.262,108.6 83.702,109.272C85.19,110.088 86.606,110.664 87.95,111C89.342,111.336 90.686,111.504 91.982,111.504C99.854,111.504 103.79,106.344 103.79,96.024V94.656C102.782,97.056 101.222,98.928 99.11,100.272C96.998,101.568 94.574,102.216 91.838,102.216C88.958,102.216 86.39,101.52 84.134,100.128C81.926,98.688 80.174,96.744 78.878,94.296C77.582,91.8 76.934,88.968 76.934,85.8C76.934,82.44 77.654,79.464 79.094,76.872C80.582,74.232 82.598,72.168 85.142,70.68C87.734,69.192 90.71,68.448 94.07,68.448C100.55,68.448 105.542,70.68 109.046,75.144C112.598,79.56 114.374,85.824 114.374,93.936C114.374,102.432 112.382,109.032 108.398,113.736C104.414,118.44 98.894,120.792 91.838,120.792ZM94.718,93.504C96.926,93.504 98.726,92.76 100.118,91.272C101.51,89.736 102.206,87.744 102.206,85.296C102.206,82.848 101.51,80.88 100.118,79.392C98.726,77.856 96.926,77.088 94.718,77.088C92.51,77.088 90.71,77.856 89.318,79.392C87.926,80.88 87.23,82.848 87.23,85.296C87.23,87.744 87.926,89.736 89.318,91.272C90.71,92.76 92.51,93.504 94.718,93.504Z"
-      android:fillColor="#000000"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M146,30H46C37.163,30 30,37.163 30,46V146C30,154.837 37.163,162 46,162H121.373C125.616,162 129.686,160.314 132.686,157.314L157.314,132.686C160.314,129.686 162,125.616 162,121.373V46C162,37.163 154.837,30 146,30Z"
+        android:strokeWidth="12"
+        android:strokeColor="#000000" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M91.838,120.792C89.774,120.792 87.686,120.504 85.574,119.928C83.462,119.352 81.494,118.488 79.67,117.336C78.47,116.664 77.726,115.752 77.438,114.6C77.198,113.448 77.294,112.344 77.726,111.288C78.206,110.232 78.95,109.464 79.958,108.984C81.014,108.504 82.262,108.6 83.702,109.272C85.19,110.088 86.606,110.664 87.95,111C89.342,111.336 90.686,111.504 91.982,111.504C99.854,111.504 103.79,106.344 103.79,96.024V94.656C102.782,97.056 101.222,98.928 99.11,100.272C96.998,101.568 94.574,102.216 91.838,102.216C88.958,102.216 86.39,101.52 84.134,100.128C81.926,98.688 80.174,96.744 78.878,94.296C77.582,91.8 76.934,88.968 76.934,85.8C76.934,82.44 77.654,79.464 79.094,76.872C80.582,74.232 82.598,72.168 85.142,70.68C87.734,69.192 90.71,68.448 94.07,68.448C100.55,68.448 105.542,70.68 109.046,75.144C112.598,79.56 114.374,85.824 114.374,93.936C114.374,102.432 112.382,109.032 108.398,113.736C104.414,118.44 98.894,120.792 91.838,120.792ZM94.718,93.504C96.926,93.504 98.726,92.76 100.118,91.272C101.51,89.736 102.206,87.744 102.206,85.296C102.206,82.848 101.51,80.88 100.118,79.392C98.726,77.856 96.926,77.088 94.718,77.088C92.51,77.088 90.71,77.856 89.318,79.392C87.926,80.88 87.23,82.848 87.23,85.296C87.23,87.744 87.926,89.736 89.318,91.272C90.71,92.76 92.51,93.504 94.718,93.504Z" />
 </vector>
diff --git a/lawnchair/res/drawable/themed_icon_clock.xml b/lawnchair/res/drawable/themed_icon_clock.xml
index baa4099415..f3fe56f597 100644
--- a/lawnchair/res/drawable/themed_icon_clock.xml
+++ b/lawnchair/res/drawable/themed_icon_clock.xml
@@ -1,20 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <rotate android:fromDegrees="300" android:toDegrees="5300" android:pivotX="50%" android:pivotY="50%">
+        <rotate
+            android:fromDegrees="300"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="5300">
             <inset android:inset="16%">
-                <vector android:height="60dp" android:width="60dp" android:viewportWidth="60" android:viewportHeight="60">
-                    <path android:fillColor="@android:color/white" android:pathData="M 30 31 L 30 31 C 30.552 31 31 30.552 31 30 L 31 12 C 31 11.448 30.552 11 30 11 L 30 11 C 29.448 11 29 11.448 29 12 L 29 30 C 29 30.552 29.448 31 30 31 Z"/>
+                <vector
+                    android:width="60dp"
+                    android:height="60dp"
+                    android:viewportWidth="60"
+                    android:viewportHeight="60">
+                    <path
+                        android:fillColor="@android:color/white"
+                        android:pathData="M 30 31 L 30 31 C 30.552 31 31 30.552 31 30 L 31 12 C 31 11.448 30.552 11 30 11 L 30 11 C 29.448 11 29 11.448 29 12 L 29 30 C 29 30.552 29.448 31 30 31 Z" />
                 </vector>
             </inset>
         </rotate>
     </item>
     <item>
-        <rotate android:fromDegrees="60" android:toDegrees="60060" android:pivotX="50%" android:pivotY="50%">
+        <rotate
+            android:fromDegrees="60"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="60060">
             <inset android:inset="16%">
-                <vector android:height="60dp" android:width="60dp" android:viewportWidth="60" android:viewportHeight="60">
-                    <path android:fillColor="@android:color/white" android:pathData="M 30 7.021 H 30 A 1 1 0 0 1 31 8.021 V 30.021 A 1 1 0 0 1 30 31.021 H 30 A 1 1 0 0 1 29 30.021 V 8.021 A 1 1 0 0 1 30 7.021 Z"/>
-                    <path android:fillColor="@android:color/white" android:pathData="M 33 30 C 33 28.343 31.657 27 30 27 C 28.343 27 27 28.343 27 30 C 27 31.657 28.343 33 30 33 C 31.657 33 33 31.657 33 30 Z"/>
+                <vector
+                    android:width="60dp"
+                    android:height="60dp"
+                    android:viewportWidth="60"
+                    android:viewportHeight="60">
+                    <path
+                        android:fillColor="@android:color/white"
+                        android:pathData="M 30 7.021 H 30 A 1 1 0 0 1 31 8.021 V 30.021 A 1 1 0 0 1 30 31.021 H 30 A 1 1 0 0 1 29 30.021 V 8.021 A 1 1 0 0 1 30 7.021 Z" />
+                    <path
+                        android:fillColor="@android:color/white"
+                        android:pathData="M 33 30 C 33 28.343 31.657 27 30 27 C 28.343 27 27 28.343 27 30 C 27 31.657 28.343 33 30 33 C 31.657 33 33 31.657 33 30 Z" />
                 </vector>
             </inset>
         </rotate>
diff --git a/lawnchair/res/drawable/themed_icon_static_clock.xml b/lawnchair/res/drawable/themed_icon_static_clock.xml
index da5b774e65..057a44804e 100644
--- a/lawnchair/res/drawable/themed_icon_static_clock.xml
+++ b/lawnchair/res/drawable/themed_icon_static_clock.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="@dimen/theme_icon_size" android:width="@dimen/theme_icon_size" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M13.475 11.7258C13.4914 11.8147 13.5 11.9063 13.5 12C13.5 12.8284 12.8284 13.5 12 13.5C11.1716 13.5 10.5 12.8284 10.5 12C10.5 11.9443 10.503 11.8894 10.5089 11.8353L3.75001 7.93301C3.51086 7.79494 3.42892 7.48915 3.56699 7.25C3.70507 7.01085 4.01086 6.92892 4.25001 7.06699L10.9459 10.9329C11.2168 10.6652 11.5891 10.5 12 10.5C12.3721 10.5 12.7126 10.6355 12.9748 10.8599L21.2763 6.06699C21.5154 5.92892 21.8212 6.01085 21.9593 6.25C22.0974 6.48915 22.0154 6.79494 21.7763 6.93301L13.475 11.7258Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/theme_icon_size"
+    android:height="@dimen/theme_icon_size"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.475 11.7258C13.4914 11.8147 13.5 11.9063 13.5 12C13.5 12.8284 12.8284 13.5 12 13.5C11.1716 13.5 10.5 12.8284 10.5 12C10.5 11.9443 10.503 11.8894 10.5089 11.8353L3.75001 7.93301C3.51086 7.79494 3.42892 7.48915 3.56699 7.25C3.70507 7.01085 4.01086 6.92892 4.25001 7.06699L10.9459 10.9329C11.2168 10.6652 11.5891 10.5 12 10.5C12.3721 10.5 12.7126 10.6355 12.9748 10.8599L21.2763 6.06699C21.5154 5.92892 21.8212 6.01085 21.9593 6.25C22.0974 6.48915 22.0154 6.79494 21.7763 6.93301L13.475 11.7258Z" />
 </vector>