diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e6db37b88..168512d4c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -61,8 +61,6 @@
 
     <attr name="unread_count" format="reference|color" />
 
-    <attr name="conversations_overview_background" format="reference|color" />
-
     <attr name="icon_alpha" format="float" />
     <attr name="delete_icon_alpha" format="float" />
 
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 5e93c1f02..a7920d002 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -51,6 +51,9 @@
 	<color name="editor_draw_default_color">#000000</color>
 
 
+	<color name="primary_default">@color/primary_override_7</color>
+	<color name="primary_default_dark">@color/primary_override_7_dark</color>
+
 	<color name="primary_override_1">#e91e63</color>
 	<color name="primary_override_1_dark">#b41249</color>
 	<color name="primary_override_2">#9c27b0</color>
@@ -87,6 +90,4 @@
 	<color name="primary_override_17_dark">#767676</color>
 	<color name="primary_override_18">#607d8b</color>
 	<color name="primary_override_18_dark">#485e68</color>
-
-
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 1bdcf3fd9..f546caf68 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/green600</item>
-        <item name="colorPrimaryDark">@color/green800</item>
+        <item name="colorPrimary">@color/primary_default</item>
+        <item name="colorPrimaryDark">@color/primary_default_dark</item>
         <item name="colorAccent">@color/blue_a400</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
 
@@ -83,8 +83,6 @@
 
         <item name="unread_count">?colorPrimaryDark</item>
 
-        <item name="conversations_overview_background">@color/green700</item>
-
         <item name="icon_alpha" type="float">0.54</item>
         <item name="delete_icon_alpha" type="float">0.70</item>
 
@@ -162,8 +160,8 @@
     </style>
 
     <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar">
-        <item name="colorPrimary">@color/green800</item>
-        <item name="colorPrimaryDark">@color/green900</item>
+        <item name="colorPrimary">@color/primary_default</item>
+        <item name="colorPrimaryDark">@color/primary_default_dark</item>
         <item name="colorAccent">@color/blue_a100</item>
         <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item>
@@ -251,8 +249,6 @@
 
         <item name="unread_count">?colorPrimaryDark</item>
 
-        <item name="conversations_overview_background">@color/green900</item>
-
         <item name="icon_alpha" type="float">0.7</item>
         <item name="delete_icon_alpha" type="float">0.7</item>
 
@@ -378,9 +374,9 @@
     </style>
 
     <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light">
-        <item name="colorPrimary">@color/green600</item>
-        <item name="colorPrimaryDark">@color/green700</item>
-        <item name="colorAccent">@color/green600</item>
+        <item name="colorPrimary">@color/primary_default</item>
+        <item name="colorPrimaryDark">@color/primary_default_dark</item>
+        <item name="colorAccent">@color/primary_default</item>
         <item name="colorSurface">@color/white</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
@@ -404,8 +400,8 @@
     </style>
 
     <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
-        <item name="colorPrimary">@color/green600</item>
-        <item name="colorPrimaryDark">@color/green700</item>
+        <item name="colorPrimary">@color/primary_default</item>
+        <item name="colorPrimaryDark">@color/primary_default_dark</item>
         <item name="colorAccent">@color/blue_a400</item>
         <item name="color_background_primary">@color/grey50</item>
         <item name="divider">@color/black12</item>
@@ -416,8 +412,8 @@
     </style>
 
     <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog">
-        <item name="colorPrimary">@color/green800</item>
-        <item name="colorPrimaryDark">@color/green900</item>
+        <item name="colorPrimary">@color/primary_default</item>
+        <item name="colorPrimaryDark">@color/primary_default_dark</item>
         <item name="colorAccent">@color/blue_a100</item>
         <item name="color_background_primary">@color/grey800</item>
         <item name="divider">@color/white12</item>