diff --git a/lawnchair/res/values/colors.xml b/lawnchair/res/values/colors.xml
index e9ee390eda..bcadf74d7a 100644
--- a/lawnchair/res/values/colors.xml
+++ b/lawnchair/res/values/colors.xml
@@ -17,8 +17,8 @@
   -->
 
 <resources>
-    <color name="primary_500">#1a73e8</color>
-    <color name="primary_200">#8ab4f8</color>
+    <color name="accent_light">@color/system_accent1_500</color>
+    <color name="accent_dark">@color/system_accent1_200</color>
     <color name="dark_drawer_text_color">#FFFFFFFF</color>
     <color name="light_drawer_text_color">#DE000000</color>
 
diff --git a/lawnchair/res/values/styles.xml b/lawnchair/res/values/styles.xml
index 83a1f0dd30..93fb7ba600 100644
--- a/lawnchair/res/values/styles.xml
+++ b/lawnchair/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <style name="AppTheme" parent="@style/LauncherTheme">
-        <item name="android:colorAccent">@color/primary_500</item>
+        <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
@@ -22,7 +22,7 @@
         <item name="searchboxHighlight">@color/surface_variant_light</item>
     </style>
     <style name="AppTheme.DarkMainColor" parent="@style/LauncherTheme.DarkMainColor">
-        <item name="android:colorAccent">@color/primary_500</item>
+        <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
@@ -43,7 +43,7 @@
         <item name="searchboxHighlight">@color/surface_variant_light</item>
     </style>
     <style name="AppTheme.DarkText" parent="@style/LauncherTheme.DarkText">
-        <item name="android:colorAccent">@color/primary_500</item>
+        <item name="android:colorAccent">@color/accent_light</item>
         <item name="android:colorBackground">@color/background_device_default_light</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_light</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
@@ -65,7 +65,7 @@
     </style>
 
     <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark">
-        <item name="android:colorAccent">@color/primary_200</item>
+        <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
@@ -86,7 +86,7 @@
         <item name="searchboxHighlight">@color/system_neutral1_800</item>
     </style>
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor">
-        <item name="android:colorAccent">@color/primary_200</item>
+        <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
@@ -107,7 +107,7 @@
         <item name="searchboxHighlight">@color/system_neutral1_800</item>
     </style>
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText">
-        <item name="android:colorAccent">@color/primary_200</item>
+        <item name="android:colorAccent">@color/accent_dark</item>
         <item name="android:colorBackground">@color/background_device_default_dark</item>
         <item name="android:colorBackgroundFloating">@color/background_floating_device_default_dark</item>
         <item name="android:dialogCornerRadius" tools:ignore="NewApi">@dimen/lawnchair_dialog_corner_radius</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0d15e111e0..086c7d3c0d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -72,7 +72,7 @@
     <color name="folder_background_light">#F9F9F9</color>
     <color name="folder_background_dark">#464746</color>
 
-    <color name="folder_dot_color">@color/primary_500</color>
+    <color name="folder_dot_color">@color/system_accent2_50</color>
 
     <color name="text_color_primary_dark">#FFFFFFFF</color>
     <color name="text_color_secondary_dark">#FFFFFFFF</color>