diff --git a/lawnchair/res/drawable/ic_about.xml b/lawnchair/res/drawable/ic_about.xml
index 38417d29c3..3c1f0411d8 100644
--- a/lawnchair/res/drawable/ic_about.xml
+++ b/lawnchair/res/drawable/ic_about.xml
@@ -1,10 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
+    android:tint="#000000"
     android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_app_drawer.xml b/lawnchair/res/drawable/ic_app_drawer.xml
deleted file mode 100644
index ab410cb95a..0000000000
--- a/lawnchair/res/drawable/ic_app_drawer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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="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_apps.xml b/lawnchair/res/drawable/ic_apps.xml
new file mode 100644
index 0000000000..e4fd939d1f
--- /dev/null
+++ b/lawnchair/res/drawable/ic_apps.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,800Q207,800 183.5,776.5Q160,753 160,720Q160,687 183.5,663.5Q207,640 240,640Q273,640 296.5,663.5Q320,687 320,720Q320,753 296.5,776.5Q273,800 240,800ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM720,800Q687,800 663.5,776.5Q640,753 640,720Q640,687 663.5,663.5Q687,640 720,640Q753,640 776.5,663.5Q800,687 800,720Q800,753 776.5,776.5Q753,800 720,800ZM240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560ZM240,320Q207,320 183.5,296.5Q160,273 160,240Q160,207 183.5,183.5Q207,160 240,160Q273,160 296.5,183.5Q320,207 320,240Q320,273 296.5,296.5Q273,320 240,320ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320ZM720,320Q687,320 663.5,296.5Q640,273 640,240Q640,207 663.5,183.5Q687,160 720,160Q753,160 776.5,183.5Q800,207 800,240Q800,273 776.5,296.5Q753,320 720,320Z" />
+
+</vector>
diff --git a/lawnchair/res/drawable/ic_dock.xml b/lawnchair/res/drawable/ic_dock.xml
index ef4d27568a..a2e7af9d4a 100644
--- a/lawnchair/res/drawable/ic_dock.xml
+++ b/lawnchair/res/drawable/ic_dock.xml
@@ -1,5 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M480,691L314,791Q303,798 291,797Q279,796 270,789Q261,782 256,771.5Q251,761 254,748L298,559L151,432Q141,423 138.5,411.5Q136,400 140,389Q144,378 152,371Q160,364 174,362L368,345L443,167Q448,155 458.5,149Q469,143 480,143Q491,143 501.5,149Q512,155 517,167L592,345L786,362Q800,364 808,371Q816,378 820,389Q824,400 821.5,411.5Q819,423 809,432L662,559L706,748Q709,761 704,771.5Q699,782 690,789Q681,796 669,797Q657,798 646,791L480,691Z"/>
-    
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM480,691L314,791Q303,798 291,797Q279,796 270,789Q261,782 256,771.5Q251,761 254,748L298,559L151,432Q141,423 138.5,411.5Q136,400 140,389Q144,378 152,371Q160,364 174,362L368,345L443,167Q448,155 458.5,149Q469,143 480,143Q491,143 501.5,149Q512,155 517,167L592,345L786,362Q800,364 808,371Q816,378 820,389Q824,400 821.5,411.5Q819,423 809,432L662,559L706,748Q709,761 704,771.5Q699,782 690,789Q681,796 669,797Q657,798 646,791L480,691ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_edit.xml b/lawnchair/res/drawable/ic_edit.xml
index 9cf0d4a4de..ffdc3f43e9 100644
--- a/lawnchair/res/drawable/ic_edit.xml
+++ b/lawnchair/res/drawable/ic_edit.xml
@@ -1,5 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M160,840Q143,840 131.5,828.5Q120,817 120,800L120,703Q120,687 126,672.5Q132,658 143,647L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L313,817Q302,828 287.5,834Q273,840 257,840L160,840ZM704,312L760,256L704,200L648,256L704,312Z"/>
-    
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM160,840Q143,840 131.5,828.5Q120,817 120,800L120,703Q120,687 126,672.5Q132,658 143,647L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L313,817Q302,828 287.5,834Q273,840 257,840L160,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_folder.xml b/lawnchair/res/drawable/ic_folder.xml
index 138e9542e7..0b84c7b9d6 100644
--- a/lawnchair/res/drawable/ic_folder.xml
+++ b/lawnchair/res/drawable/ic_folder.xml
@@ -1,5 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
 
-    <path android:fillColor="@android:color/white" android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L367,160Q383,160 397.5,166Q412,172 423,183L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L367,160Q383,160 397.5,166Q412,172 423,183L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240Q367,240 367,240Q367,240 367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z" />
 
 </vector>
diff --git a/lawnchair/res/drawable/ic_github.xml b/lawnchair/res/drawable/ic_github.xml
index 04ef8b4629..63adee548c 100644
--- a/lawnchair/res/drawable/ic_github.xml
+++ b/lawnchair/res/drawable/ic_github.xml
@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="192"
+    android:viewportWidth="192"
+    android:width="24dp">
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M121.13,169c0.03,-4.61 0.06,-20.59 0.06,-26.92 0,-9.15 -3.11,-15.13 -6.6,-18.16C136.25,121.49 159,113.2 159,75.51c0,-10.71 -3.76,-19.47 -10,-26.32 1,-2.48 4.34,-12.46 -0.97,-25.96 0,0 -8.15,-2.64 -26.73,10.07 -7.78,-2.18 -16.09,-3.26 -24.35,-3.31 -8.27,0.04 -16.58,1.13 -24.35,3.31C54.01,20.59 45.86,23.23 45.86,23.23c-5.31,13.51 -1.97,23.48 -0.97,25.96 -6.24,6.85 -10,15.61 -10,26.32 0,37.69 22.75,45.97 44.42,48.4 -3.49,3.03 -6.6,9.01 -6.6,18.16 0,6.33 0.03,22.32 0.06,26.92M29,129.54c9.77,0.69 15.4,9.6 15.4,9.6 8.68,14.99 22.78,10.66 28.32,8.15"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:strokeWidth="12" />
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="192dp" android:height="192dp" android:viewportWidth="192" android:viewportHeight="192" android:tint="#000000">
-<path android:pathData="M121.75,170c0.03,-4.67 0.06,-20.87 0.06,-27.29 0,-9.27 -3.17,-15.34 -6.72,-18.41 22.05,-2.46 45.2,-10.86 45.2,-49.07 0,-10.85 -3.82,-19.74 -10.18,-26.68 1.02,-2.52 4.41,-12.63 -0.99,-26.32 0,0 -8.3,-2.67 -27.2,10.2 -7.91,-2.21 -16.37,-3.31 -24.78,-3.35 -8.41,0.04 -16.87,1.14 -24.78,3.35C53.46,19.56 45.16,22.23 45.16,22.23c-5.4,13.69 -2,23.8 -0.99,26.32C37.82,55.5 34,64.38 34,75.23c0,38.2 23.15,46.6 45.2,49.07 -3.55,3.07 -6.72,9.14 -6.72,18.41 0,6.42 0.03,22.62 0.06,27.29M28,130c9.94,0.7 15.67,9.73 15.67,9.73 8.83,15.2 23.18,10.8 28.82,8.27" android:strokeLineJoin="round" android:strokeWidth="14" android:fillColor="#00000000" android:strokeColor="#000000" android:strokeLineCap="round"/>
 </vector>
diff --git a/lawnchair/res/drawable/ic_home_screen.xml b/lawnchair/res/drawable/ic_home_screen.xml
index 9736025aa0..59a2a5279a 100644
--- a/lawnchair/res/drawable/ic_home_screen.xml
+++ b/lawnchair/res/drawable/ic_home_screen.xml
@@ -1,5 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M160,760L160,400Q160,381 168.5,364Q177,347 192,336L432,156Q453,140 480,140Q507,140 528,156L768,336Q783,347 791.5,364Q800,381 800,400L800,760Q800,793 776.5,816.5Q753,840 720,840L600,840Q583,840 571.5,828.5Q560,817 560,800L560,600Q560,583 548.5,571.5Q537,560 520,560L440,560Q423,560 411.5,571.5Q400,583 400,600L400,800Q400,817 388.5,828.5Q377,840 360,840L240,840Q207,840 183.5,816.5Q160,793 160,760Z"/>
-    
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,760L360,760L360,560Q360,543 371.5,531.5Q383,520 400,520L560,520Q577,520 588.5,531.5Q600,543 600,560L600,760L720,760L720,400Q720,400 720,400Q720,400 720,400L480,220Q480,220 480,220Q480,220 480,220L240,400Q240,400 240,400Q240,400 240,400L240,760ZM160,760L160,400Q160,381 168.5,364Q177,347 192,336L432,156Q453,140 480,140Q507,140 528,156L768,336Q783,347 791.5,364Q800,381 800,400L800,760Q800,793 776.5,816.5Q753,840 720,840L560,840Q543,840 531.5,828.5Q520,817 520,800L520,600Q520,600 520,600Q520,600 520,600L440,600Q440,600 440,600Q440,600 440,600L440,800Q440,817 428.5,828.5Q417,840 400,840L240,840Q207,840 183.5,816.5Q160,793 160,760ZM480,490L480,490L480,490Q480,490 480,490Q480,490 480,490L480,490L480,490L480,490L480,490Q480,490 480,490Q480,490 480,490L480,490Q480,490 480,490Q480,490 480,490L480,490Z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/ic_open_collective.xml b/lawnchair/res/drawable/ic_open_collective.xml
new file mode 100644
index 0000000000..4e2dab7682
--- /dev/null
+++ b/lawnchair/res/drawable/ic_open_collective.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <path
+        android:pathData="M22,96c0,40.87 33.13,74 74,74 15.06,0 29.08,-4.5 40.77,-12.23l-18.98,-18.98A47.8,47.8 0,0 1,96 144c-26.51,0 -48,-21.49 -48,-48s21.49,-48 48,-48a47.79,47.79 0,0 1,21.78 5.22l18.98,-18.98C125.08,26.5 111.06,22 96,22c-40.87,0 -74,33.13 -74,74ZM170,96c0,-15.06 -4.5,-29.08 -12.23,-40.77l-18.98,18.98A47.8,47.8 0,0 1,144 96a47.8,47.8 0,0 1,-5.22 21.78l18.98,18.98C165.5,125.08 170,111.06 170,96Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="12"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/lawnchair/res/drawable/ic_quickstep.xml b/lawnchair/res/drawable/ic_quickstep.xml
index 67ead94e5d..1845a54269 100644
--- a/lawnchair/res/drawable/ic_quickstep.xml
+++ b/lawnchair/res/drawable/ic_quickstep.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#000000"
-        android:fillType="nonZero"
+        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="#000000"
diff --git a/lawnchair/res/drawable/info_24px.xml b/lawnchair/res/drawable/info_24px.xml
index 0a1c66739f..f682e75943 100644
--- a/lawnchair/res/drawable/info_24px.xml
+++ b/lawnchair/res/drawable/info_24px.xml
@@ -1,5 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
-    
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640L520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480L440,640Q440,657 451.5,668.5Q463,680 480,680ZM480,360Q497,360 508.5,348.5Q520,337 520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320Q440,337 451.5,348.5Q463,360 480,360ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+
 </vector>
diff --git a/lawnchair/res/drawable/keep_24px.xml b/lawnchair/res/drawable/keep_24px.xml
new file mode 100644
index 0000000000..ad3674cf24
--- /dev/null
+++ b/lawnchair/res/drawable/keep_24px.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M640,200L640,480L708,548Q714,554 717,561.5Q720,569 720,577L720,600Q720,617 708.5,628.5Q697,640 680,640L520,640L520,874Q520,891 508.5,902.5Q497,914 480,914Q463,914 451.5,902.5Q440,891 440,874L440,640L280,640Q263,640 251.5,628.5Q240,617 240,600L240,577Q240,569 243,561.5Q246,554 252,548L320,480L320,200L320,200Q303,200 291.5,188.5Q280,177 280,160Q280,143 291.5,131.5Q303,120 320,120L640,120Q657,120 668.5,131.5Q680,143 680,160Q680,177 668.5,188.5Q657,200 640,200ZM354,560L606,560L560,514L560,200L400,200L400,514L354,560ZM480,560L480,560L480,560L480,560L480,560L480,560Z" />
+
+</vector>
diff --git a/lawnchair/res/drawable/widgets_24px.xml b/lawnchair/res/drawable/widgets_24px.xml
new file mode 100644
index 0000000000..c4f998e42e
--- /dev/null
+++ b/lawnchair/res/drawable/widgets_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M638,492L468,322Q462,316 459.5,309Q457,302 457,294Q457,286 459.5,279Q462,272 468,266L638,96Q644,90 651,87.5Q658,85 666,85Q674,85 681,87.5Q688,90 694,96L864,266Q870,272 872.5,279Q875,286 875,294Q875,302 872.5,309Q870,316 864,322L694,492Q688,498 681,500.5Q674,503 666,503Q658,503 651,500.5Q644,498 638,492ZM120,400L120,160Q120,143 131.5,131.5Q143,120 160,120L400,120Q417,120 428.5,131.5Q440,143 440,160L440,400Q440,417 428.5,428.5Q417,440 400,440L160,440Q143,440 131.5,428.5Q120,417 120,400ZM520,800L520,560Q520,543 531.5,531.5Q543,520 560,520L800,520Q817,520 828.5,531.5Q840,543 840,560L840,800Q840,817 828.5,828.5Q817,840 800,840L560,840Q543,840 531.5,828.5Q520,817 520,800ZM120,800L120,560Q120,543 131.5,531.5Q143,520 160,520L400,520Q417,520 428.5,531.5Q440,543 440,560L440,800Q440,817 428.5,828.5Q417,840 400,840L160,840Q143,840 131.5,828.5Q120,817 120,800ZM200,360L360,360L360,200L200,200L200,360ZM667,408L780,295L667,182L554,295L667,408ZM600,760L760,760L760,600L600,600L600,760ZM200,760L360,760L360,600L200,600L200,760ZM360,360L360,360L360,360L360,360ZM554,295L554,295L554,295L554,295ZM360,600L360,600L360,600L360,600ZM600,600L600,600L600,600L600,600Z" />
+</vector>
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt
index b96db7b035..d84b5424be 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt
@@ -199,7 +199,7 @@ class AboutViewModel(
                 url = "https://lawnchair.crowdin.com/lawnchair",
             ),
             Link(
-                iconResId = R.drawable.ic_donate,
+                iconResId = R.drawable.ic_open_collective,
                 labelResId = R.string.donate,
                 url = "https://opencollective.com/lawnchair",
             ),
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/PreferencesDashboard.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/PreferencesDashboard.kt
index ceb4c5ef5d..c28ae3c281 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/PreferencesDashboard.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/PreferencesDashboard.kt
@@ -171,7 +171,7 @@ fun PreferencesDashboard(
                 PreferenceCategory(
                     label = stringResource(R.string.app_drawer_label),
                     description = stringResource(R.string.app_drawer_description),
-                    iconResource = R.drawable.ic_app_drawer,
+                    iconResource = R.drawable.ic_apps,
                     onNavigate = { onNavigate(AppDrawer) },
                     isSelected = currentRoute is AppDrawer,
                     isFirst = it.isFirst,
diff --git a/res/drawable/ic_smartspace.xml b/res/drawable/ic_smartspace.xml
deleted file mode 100644
index 3c18c866ae..0000000000
--- a/res/drawable/ic_smartspace.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q346,760 235.5,688Q125,616 61,498Q56,489 53.5,479.5Q51,470 51,460Q51,450 53.5,440.5Q56,431 61,422Q125,304 235.5,232Q346,160 480,160Q614,160 724.5,232Q835,304 899,422Q904,431 906.5,440.5Q909,450 909,460Q909,470 906.5,479.5Q904,489 899,498Q835,616 724.5,688Q614,760 480,760Z"/>
-    
-</vector>
diff --git a/res/drawable/ic_smartspace_off.xml b/res/drawable/ic_smartspace_off.xml
deleted file mode 100644
index 156b4bda33..0000000000
--- a/res/drawable/ic_smartspace_off.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M764,876L624,738Q589,749 553,754.5Q517,760 480,760Q346,760 235,688Q124,616 61,498Q56,489 53.5,479.5Q51,470 51,460Q51,450 53.5,440.5Q56,431 61,422Q83,383 108,346Q133,309 166,280L83,196Q72,185 72,168.5Q72,152 84,140Q95,129 112,129Q129,129 140,140L820,820Q831,831 831.5,847.5Q832,864 820,876Q809,887 792,887Q775,887 764,876ZM480,640Q491,640 501,639Q511,638 521,635L305,419Q302,429 301,439Q300,449 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,160Q614,160 725.5,232.5Q837,305 900,423Q905,431 907.5,440.5Q910,450 910,460Q910,470 908,479.5Q906,489 901,497Q882,534 858.5,567Q835,600 806,629Q792,643 773,642Q754,641 740,627L660,547Q653,540 651,530.5Q649,521 652,511Q656,498 658,486Q660,474 660,460Q660,385 607.5,332.5Q555,280 480,280Q466,280 454,282Q442,284 429,288Q419,291 409,289Q399,287 392,280L359,247Q340,228 346.5,203Q353,178 378,171Q403,166 428.5,163Q454,160 480,160ZM559,386Q570,399 577.5,414.5Q585,430 587,447Q588,455 581,458Q574,461 568,455L486,373Q480,367 483.5,360Q487,353 495,353Q514,355 530,363.5Q546,372 559,386Z"/>
-    
-</vector>