diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
index 96c3dc507a..9eaec89cb7 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
@@ -1494,34 +1494,31 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity {
             return;
         }
 
+        // Set button colors
+        mEase1Layout.setBackgroundResource(R.drawable.footer_button_again);
+        mEase2Layout.setBackgroundResource(R.drawable.footer_button_hard);
+        mEase3Layout.setBackgroundResource(R.drawable.footer_button_good);
+        mEase4Layout.setBackgroundResource(R.drawable.footer_button_easy);
+        // Set button text
+        mEase1.setText(res.getString(R.string.ease1_successive));
+        mEase2.setText(res.getString(R.string.ease2_successive));
+        mEase3.setText(res.getString(R.string.ease3_successive));
+        mEase4.setText(res.getString(R.string.ease3_learning));
+
         // Set correct label and background resource for each button
         switch (buttonCount) {
             case 2:
-                mEase1.setText(res.getString(R.string.ease1_successive));
-                mEase2Layout.setBackgroundResource(R.drawable.footer_button_green);
-                mEase2.setText(res.getString(R.string.ease3_successive));
                 mEase1Layout.setVisibility(View.VISIBLE);
                 mEase2Layout.setVisibility(View.VISIBLE);
                 mEase2Layout.requestFocus();
                 break;
             case 3:
-                mEase2Layout.setBackgroundResource(R.drawable.footer_button_green);
-                mEase3Layout.setBackgroundResource(R.drawable.footer_button);  // Make sure it’s not green
-                mEase1.setText(res.getString(R.string.ease1_successive));
-                mEase2.setText(res.getString(R.string.ease3_successive));
-                mEase3.setText(res.getString(R.string.ease3_learning));
                 mEase1Layout.setVisibility(View.VISIBLE);
                 mEase2Layout.setVisibility(View.VISIBLE);
                 mEase3Layout.setVisibility(View.VISIBLE);
                 mEase2Layout.requestFocus();
                 break;
             default:
-                mEase2Layout.setBackgroundResource(R.drawable.footer_button);  // Make sure it’s not green
-                mEase3Layout.setBackgroundResource(R.drawable.footer_button_green);
-                mEase1.setText(res.getString(R.string.ease1_successive));
-                mEase2.setText(res.getString(R.string.ease2_successive));
-                mEase3.setText(res.getString(R.string.ease3_successive));
-                mEase4.setText(res.getString(R.string.ease3_learning));
                 mEase1Layout.setVisibility(View.VISIBLE);
                 mEase2Layout.setVisibility(View.VISIBLE);
                 mEase3Layout.setVisibility(View.VISIBLE);
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CardBrowserContextMenu.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CardBrowserContextMenu.java
index 3d1770ea85..63a71a9e2d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CardBrowserContextMenu.java
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CardBrowserContextMenu.java
@@ -40,8 +40,8 @@ public class CardBrowserContextMenu extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Resources res = getResources();
-        Drawable icon = res.getDrawable(R.drawable.ic_settings_applications_black_36dp);
-        icon.setAlpha(Themes.ALPHA_ICON_ENABLED_DARK);
+        //Drawable icon = res.getDrawable(R.drawable.ic_settings_applications_black_36dp);
+        //icon.setAlpha(Themes.ALPHA_ICON_ENABLED_DARK);
 
         String[] entries = new String[4];
         entries[CONTEXT_MENU_DELETE] = res.getString(R.string.card_browser_delete_card);
@@ -57,7 +57,7 @@ public class CardBrowserContextMenu extends DialogFragment {
 
         return new MaterialDialog.Builder(getActivity())
                 .title(getArguments().getString("dialogTitle"))
-                .icon(icon)
+                //.icon(icon)
                 .items(entries)
                 .itemsCallback(mContextMenuListener)
                 .build();
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java
index 2389e739a5..c2181336cc 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java
@@ -42,8 +42,8 @@ public class DeckPickerContextMenu extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Resources res = getResources();
-        Drawable icon = res.getDrawable(R.drawable.ic_settings_applications_black_36dp);
-        icon.setAlpha(Themes.ALPHA_ICON_ENABLED_DARK);
+        //Drawable icon = res.getDrawable(R.drawable.ic_settings_applications_black_36dp);
+        //icon.setAlpha(Themes.ALPHA_ICON_ENABLED_DARK);
 
         boolean hasSubdecks = getArguments().getBoolean("hasSubdecks");
         String[] entries = new String[hasSubdecks ? 5 : 4];
@@ -59,7 +59,7 @@ public class DeckPickerContextMenu extends DialogFragment {
         }
         return new MaterialDialog.Builder(getActivity())
                 .title(getArguments().getString("dialogTitle"))
-                .icon(icon)
+                //.icon(icon)
                 .cancelable(true)
                 .autoDismiss(false)
                 .items(entries)
diff --git a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png b/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png
index e10ffedd4a..662c0e45fc 100644
Binary files a/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png and b/AnkiDroid/src/main/res/drawable-nodpi/nav_drawer_logo_dark_theme.png differ
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_red.xml b/AnkiDroid/src/main/res/drawable/footer_button_again.xml
similarity index 72%
rename from AnkiDroid/src/main/res/drawable/footer_button_red.xml
rename to AnkiDroid/src/main/res/drawable/footer_button_again.xml
index b5dda27d04..0eab585912 100644
--- a/AnkiDroid/src/main/res/drawable/footer_button_red.xml
+++ b/AnkiDroid/src/main/res/drawable/footer_button_again.xml
@@ -4,17 +4,17 @@
     <selector>
         <item android:state_pressed="true">
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_red_700" />
+                <solid android:color="?attr/againButtonColorPressed" />
             </shape>
         </item>
         <item android:state_focused="true">
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_red_600" />
+                <solid android:color="?attr/againButtonColorFocussed" />
             </shape>
         </item>
         <item>
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_red_500" />
+                <solid android:color="?attr/againButtonColor" />
             </shape>
         </item>
     </selector>
diff --git a/AnkiDroid/src/main/res/drawable/footer_button.xml b/AnkiDroid/src/main/res/drawable/footer_button_easy.xml
similarity index 73%
rename from AnkiDroid/src/main/res/drawable/footer_button.xml
rename to AnkiDroid/src/main/res/drawable/footer_button_easy.xml
index da9de9febd..30db185cac 100644
--- a/AnkiDroid/src/main/res/drawable/footer_button.xml
+++ b/AnkiDroid/src/main/res/drawable/footer_button_easy.xml
@@ -4,17 +4,17 @@
         <selector>
             <item android:state_pressed="true">
                 <shape android:shape="rectangle" >
-                    <solid android:color="@color/material_blue_grey_900" />
+                    <solid android:color="?attr/easyButtonColorPressed" />
                 </shape>
             </item>
             <item android:state_focused="true">
                 <shape android:shape="rectangle" >
-                    <solid android:color="@color/material_blue_grey_800" />
+                    <solid android:color="?attr/easyButtonColorFocussed" />
                 </shape>
             </item>
             <item>
                 <shape android:shape="rectangle" >
-                    <solid android:color="@color/material_blue_grey_700" />
+                    <solid android:color="?attr/easyButtonColor" />
                 </shape>
             </item>
         </selector>
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_green.xml b/AnkiDroid/src/main/res/drawable/footer_button_good.xml
similarity index 73%
rename from AnkiDroid/src/main/res/drawable/footer_button_green.xml
rename to AnkiDroid/src/main/res/drawable/footer_button_good.xml
index 2d65792360..55012fddc4 100644
--- a/AnkiDroid/src/main/res/drawable/footer_button_green.xml
+++ b/AnkiDroid/src/main/res/drawable/footer_button_good.xml
@@ -4,17 +4,17 @@
     <selector>
         <item android:state_pressed="true">
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_green_700" />
+                <solid android:color="?attr/goodButtonColorPressed" />
             </shape>
         </item>
         <item android:state_focused="true">
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_green_600" />
+                <solid android:color="?attr/goodButtonColorFocussed" />
             </shape>
         </item>
         <item>
             <shape android:shape="rectangle" >
-                <solid android:color="@color/material_green_500" />
+                <solid android:color="?attr/goodButtonColor" />
             </shape>
         </item>
     </selector>
diff --git a/AnkiDroid/src/main/res/drawable/footer_button_hard.xml b/AnkiDroid/src/main/res/drawable/footer_button_hard.xml
new file mode 100644
index 0000000000..d05fc9e650
--- /dev/null
+++ b/AnkiDroid/src/main/res/drawable/footer_button_hard.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_background">
+        <selector>
+            <item android:state_pressed="true">
+                <shape android:shape="rectangle" >
+                    <solid android:color="?attr/hardButtonColorPressed" />
+                </shape>
+            </item>
+            <item android:state_focused="true">
+                <shape android:shape="rectangle" >
+                    <solid android:color="?attr/hardButtonColorFocussed" />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle" >
+                    <solid android:color="?attr/hardButtonColor" />
+                </shape>
+            </item>
+        </selector>
+    </item>
+</layer-list>
diff --git a/AnkiDroid/src/main/res/layout/flashcard.xml b/AnkiDroid/src/main/res/layout/flashcard.xml
index 051e751dff..2f6c4bc561 100644
--- a/AnkiDroid/src/main/res/layout/flashcard.xml
+++ b/AnkiDroid/src/main/res/layout/flashcard.xml
@@ -196,7 +196,7 @@
 
                     <LinearLayout
                         style="@style/FooterButton"
-                        android:background="@drawable/footer_button_red"
+                        android:background="@drawable/footer_button_again"
                         android:id="@+id/flashcard_layout_ease1"
                         android:layout_width="0dip"
                         android:layout_height="@dimen/touch_target"
@@ -215,7 +215,7 @@
 
                     <LinearLayout
                             style="@style/FooterButton"
-                            android:background="@drawable/footer_button"
+                            android:background="@drawable/footer_button_hard"
                             android:id="@+id/flashcard_layout_ease2"
                             android:layout_width="0dip"
                             android:layout_height="@dimen/touch_target"
@@ -235,7 +235,7 @@
 
                     <LinearLayout
                             style="@style/FooterButton"
-                            android:background="@drawable/footer_button_green"
+                            android:background="@drawable/footer_button_good"
                             android:id="@+id/flashcard_layout_ease3"
                             android:layout_width="0dip"
                             android:layout_height="@dimen/touch_target"
@@ -254,7 +254,7 @@
 
                     <LinearLayout
                             style="@style/FooterButton"
-                            android:background="@drawable/footer_button"
+                            android:background="@drawable/footer_button_easy"
                             android:id="@+id/flashcard_layout_ease4"
                             android:layout_width="0dip"
                             android:layout_height="@dimen/touch_target"
diff --git a/AnkiDroid/src/main/res/values/attrs.xml b/AnkiDroid/src/main/res/values/attrs.xml
index 0211b2709b..7376ef54a9 100644
--- a/AnkiDroid/src/main/res/values/attrs.xml
+++ b/AnkiDroid/src/main/res/values/attrs.xml
@@ -32,14 +32,26 @@
     <declare-styleable name="SeekBarPreference">
         <attr name="interval" format="integer" />
     </declare-styleable>
-
-    <!-- Reviewer colors -->
-    <attr name="topBarColor" format="color"/>
+    <!-- Card count colors -->
     <attr name="newCountColor" format="color"/>
     <attr name="learnCountColor" format="color"/>
     <attr name="reviewCountColor" format="color"/>
     <attr name="zeroCountColor" format="color"/>
-    <attr name="backgroundColor" format="color"/>
+    <!-- Reviewer button colors -->
+    <attr name="againButtonColor" format="color"/>
+    <attr name="hardButtonColor" format="color"/>
+    <attr name="goodButtonColor" format="color"/>
+    <attr name="easyButtonColor" format="color"/>
+    <attr name="againButtonColorPressed" format="color"/>
+    <attr name="hardButtonColorPressed" format="color"/>
+    <attr name="goodButtonColorPressed" format="color"/>
+    <attr name="easyButtonColorPressed" format="color"/>
+    <attr name="againButtonColorFocussed" format="color"/>
+    <attr name="hardButtonColorFocussed" format="color"/>
+    <attr name="goodButtonColorFocussed" format="color"/>
+    <attr name="easyButtonColorFocussed" format="color"/>
+    <!-- Reviewer other colors -->
+    <attr name="topBarColor" format="color"/>
     <!-- Browser colors -->
     <attr name="suspendedColor" format="color"/>
     <attr name="markedColor" format="color"/>
diff --git a/AnkiDroid/src/main/res/values/colors.xml b/AnkiDroid/src/main/res/values/colors.xml
index 0328f015c2..6e7285b3b5 100644
--- a/AnkiDroid/src/main/res/values/colors.xml
+++ b/AnkiDroid/src/main/res/values/colors.xml
@@ -108,10 +108,13 @@
     <color name="material_grey_700">#ff616161</color>
     <color name="material_grey_800">#ff424242</color>
 
-    <color name="material_red_200">#ef9a9a</color>
+    <color name="material_red_200">#ffef9a9a</color>
+    <color name="material_red_300">#ffE57373</color>
+    <color name="material_red_400">#ffEF5350</color>
     <color name="material_red_500">#fff44336</color>
     <color name="material_red_600">#ffe53935</color>
     <color name="material_red_700">#ffd32f2f</color>
+    <color name="material_red_800">#ffC62828</color>
     <color name="material_red_900">#ffb71c1c</color>
     <color name="material_red_A700">#ffd50000</color>
     <color name="material_orange_A700">#ffff6d00</color>
@@ -120,20 +123,33 @@
     <color name="material_indigo_700">#ff303f9f</color>
     <color name="material_indigo_A700">#ff304ffe</color>
     <color name="material_blue_A700">#ff2962ff</color>
-    <color name="material_light_blue_100">#ffb3e5fc</color>
+    <color name="material_light_blue_100">#ffB3E5FC</color>
+    <color name="material_light_blue_200">#ff81D4FA</color>
+    <color name="material_light_blue_300">#ff4FC3F7</color>
+    <color name="material_light_blue_400">#ff29B6F6</color>
     <color name="material_light_blue_500">#ff03a9f4</color>
     <color name="material_light_blue_600">#ff039be5</color>
     <color name="material_light_blue_700">#ff0288d1</color>
+    <color name="material_light_blue_800">#ff0277BD</color>
+    <color name="material_light_blue_900">#ff01579B</color>
     <color name="material_light_blue_A700">#ff0091ea</color>
     <color name="material_cyan_A700">#ff00b8d4</color>
 
-    <color name="material_green_200">#a5d6a7</color>
+    <color name="material_green_200">#ffa5d6a7</color>
+    <color name="material_green_300">#ff81C784</color>
+    <color name="material_green_400">#ff66BB6A</color>
     <color name="material_green_500">#ff4caf50</color>
     <color name="material_green_600">#ff43a047</color>
     <color name="material_green_700">#ff388e3c</color>
+    <color name="material_green_800">#ff2E7D32</color>
+    <color name="material_green_900">#ff1B5E20</color>
     <color name="material_light_green_A700">#ff64dd17</color>
     <color name="material_lime_green_A700">#ffaeea00</color>
 
+    <color name="material_deep_purple_400">#ff7E57C2</color>
+
+
+
 
     <color name="theme_primary">@color/material_light_blue_500</color>
     <color name="theme_primary_dark">@color/material_light_blue_700</color>
diff --git a/AnkiDroid/src/main/res/values/styles.xml b/AnkiDroid/src/main/res/values/styles.xml
index 5a1d268340..6ccc4c4e10 100644
--- a/AnkiDroid/src/main/res/values/styles.xml
+++ b/AnkiDroid/src/main/res/values/styles.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- White theme -->
-    <style name="White">
-        <item name="android:background">@color/white_background</item>
-    </style>
-
-
+    <!-- App themes -->
+    <style name="App_Theme_White" parent="Theme_White"/>
+    <style name="App_Theme_Dark" parent="Theme_Dark"/>
+    <!-- Theme for crash report dialog -->
     <style name="Theme.CrashReportDialog" parent="@android:style/Theme.Dialog" />
 
     <!-- Widget elements -->
@@ -38,7 +36,7 @@
 
     <!--  Material Design-style persistant footer button -->
     <style name="FooterButton">
-        <item name="android:background">@drawable/footer_button</item>
+        <item name="android:background">@drawable/footer_button_hard</item>
         <item name="android:layout_height">48dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">true</item>
diff --git a/AnkiDroid/src/main/res/values/theme_dark.xml b/AnkiDroid/src/main/res/values/theme_dark.xml
new file mode 100644
index 0000000000..5622fe35ad
--- /dev/null
+++ b/AnkiDroid/src/main/res/values/theme_dark.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme_Base_Custom_Dark" parent="@style/Theme.AppCompat"/>
+    <!-- Dark theme -->
+    <style name="Theme_Dark" parent="Theme_Base_Custom_Dark">
+        <item name="colorPrimary">@color/white_background_night</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">@color/material_light_blue_700</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="actionBarTextColor">@color/white</item>
+        <!-- Action bar styles -->
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionBarThemeRef">@style/ActionBarDark</item>
+        <item name="actionBarPopupThemeRef">@style/ActionBar.Popup.Dark</item>
+        <!-- Reviewer button colors -->
+        <item name="againButtonColor">@color/material_red_800</item>
+        <item name="hardButtonColor">@color/material_blue_grey_800</item>
+        <item name="goodButtonColor">@color/material_green_800</item>
+        <item name="easyButtonColor">@color/material_light_blue_800</item>
+        <item name="againButtonColorPressed">@color/material_red_700</item>
+        <item name="hardButtonColorPressed">@color/material_blue_grey_700</item>
+        <item name="goodButtonColorPressed">@color/material_green_700</item>
+        <item name="easyButtonColorPressed">@color/material_light_blue_700</item>
+        <item name="againButtonColorFocussed">@color/material_red_600</item>
+        <item name="hardButtonColorFocussed">@color/material_blue_grey_600</item>
+        <item name="goodButtonColorFocussed">@color/material_green_600</item>
+        <item name="easyButtonColorFocussed">@color/material_light_blue_600</item>
+        <!-- Reviewer colors -->
+        <item name="topBarColor">@color/theme_primary_light_inv</item>
+        <item name="newCountColor">@color/new_count_night</item>
+        <item name="learnCountColor">@color/learn_count_night</item>
+        <item name="zeroCountColor">@color/zero_count_night</item>
+        <item name="reviewCountColor">@color/review_count_night</item>
+        <!-- Browser colors -->
+        <item name="suspendedColor">@color/material_grey_700</item>
+        <item name="markedColor">@color/material_deep_purple_400</item>
+
+        <!-- Images -->
+        <item name="navDrawerImage">@drawable/nav_drawer_logo_dark_theme</item>
+        <item name="attachFileImage">@drawable/ic_attachment_white_24dp</item>
+        <item name="upDownImage">@drawable/ic_import_export_white_24dp</item>
+    </style>
+
+
+    <!-- ActionBar -->
+    <style name="ActionBarDark" parent="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
+        <!-- Determines color of text and system icons (overflow etc.) in the action bar -->
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/white</item>
+    </style>
+
+    <!-- Legacy action bar  (used in Preferences with no explicit Toolbar) -->
+    <style name="LegacyActionBarDark" parent="App_Theme_Dark">
+        <item name="windowActionBar">true</item>
+        <item name="windowNoTitle">false</item>
+    </style>
+
+    <!-- For all other action bar popups (except spinner dropdown in Lollipop) -->
+    <style name="ActionBar.Popup.Dark" parent="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:drawSelectorOnTop">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/AnkiDroid/src/main/res/values/themes.xml b/AnkiDroid/src/main/res/values/theme_white.xml
similarity index 57%
rename from AnkiDroid/src/main/res/values/themes.xml
rename to AnkiDroid/src/main/res/values/theme_white.xml
index 4e828b4af6..729fa95520 100644
--- a/AnkiDroid/src/main/res/values/themes.xml
+++ b/AnkiDroid/src/main/res/values/theme_white.xml
@@ -2,37 +2,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme_Base_Custom_Light" parent="@style/Theme.AppCompat.Light.DarkActionBar" />
-    <style name="Theme_Base_Custom_Dark" parent="@style/Theme.AppCompat"/>
-    <style name="App_Theme_White" parent="Theme_White"/>
-    <style name="App_Theme_Dark" parent="Theme_Dark"/>
-    <!-- Dark theme -->
-    <style name="Theme_Dark" parent="Theme_Base_Custom_Dark">
-        <item name="colorPrimary">@color/white_background_night</item>
-        <item name="colorPrimaryDark">@color/black</item>
-        <item name="colorAccent">@color/material_light_blue_700</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="actionBarTextColor">@color/white</item>
-        <!-- Action bar styles -->
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionModeOverlay">true</item>
-        <item name="actionBarThemeRef">@style/ActionBarDark</item>
-        <item name="actionBarPopupThemeRef">@style/ActionBar.Popup.Dark</item>
-        <!-- Reviewer colors -->
-        <item name="topBarColor">@color/theme_primary_light_inv</item>
-        <item name="newCountColor">@color/new_count_night</item>
-        <item name="learnCountColor">@color/learn_count_night</item>
-        <item name="zeroCountColor">@color/zero_count_night</item>
-        <item name="reviewCountColor">@color/review_count_night</item>
-        <!-- Browser colors -->
-        <item name="suspendedColor">@color/material_red_900</item>
-        <item name="markedColor">@color/material_indigo_700</item>
-
-        <!-- Images -->
-        <item name="navDrawerImage">@drawable/nav_drawer_logo_dark_theme</item>
-        <item name="attachFileImage">@drawable/ic_attachment_white_24dp</item>
-        <item name="upDownImage">@drawable/ic_import_export_white_24dp</item>
-    </style>
 
     <!-- White theme -->
     <style name="Theme_White" parent="@style/Theme_Base_Custom_Light">
@@ -43,6 +12,8 @@
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:dropDownListViewStyle">@style/White.Dropdown</item>
         <item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
+        <!-- Use black on white text for higher contrast than standard light theme -->
+        <item name="android:textColor">@color/black</item>
         <!-- Action bar styles -->
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -50,23 +21,30 @@
         <item name="actionModeBackground">@color/theme_accent</item>
         <item name="actionBarThemeRef">@style/ActionBar</item>
         <item name="popupTheme">@style/ActionBar.Popup</item>
-
         <!-- Dialog styles -->
         <item name="android:listPreferredItemHeight">56dip</item>
-
         <!-- Reviewer colors -->
         <item name="topBarColor">@color/theme_primary_light</item>
         <item name="newCountColor">@color/new_count</item>
         <item name="learnCountColor">@color/learn_count</item>
         <item name="zeroCountColor">@color/zero_count</item>
         <item name="reviewCountColor">@color/review_count</item>
-        <item name="android:textColor">@color/black</item>
-        <item name="backgroundColor">@color/white</item>
-
+        <!-- Reviewer button colors -->
+        <item name="againButtonColor">@color/material_red_500</item>
+        <item name="hardButtonColor">@color/material_blue_grey_700</item>
+        <item name="goodButtonColor">@color/material_green_500</item>
+        <item name="easyButtonColor">@color/material_light_blue_500</item>
+        <item name="againButtonColorPressed">@color/material_red_600</item>
+        <item name="hardButtonColorPressed">@color/material_blue_grey_800</item>
+        <item name="goodButtonColorPressed">@color/material_green_600</item>
+        <item name="easyButtonColorPressed">@color/material_light_blue_600</item>
+        <item name="againButtonColorFocussed">@color/material_red_700</item>
+        <item name="hardButtonColorFocussed">@color/material_blue_grey_900</item>
+        <item name="goodButtonColorFocussed">@color/material_green_700</item>
+        <item name="easyButtonColorFocussed">@color/material_light_blue_700</item>
         <!-- Browser colors -->
         <item name="suspendedColor">@color/card_browser_suspended</item>
         <item name="markedColor">@color/card_browser_marked</item>
-
         <!-- Images -->
         <item name="navDrawerImage">@drawable/nav_drawer_logo</item>
         <item name="attachFileImage">@drawable/ic_attachment_black_24dp</item>
@@ -82,10 +60,6 @@
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
     </style>
-    <style name="LegacyActionBarDark" parent="App_Theme_Dark">
-        <item name="windowActionBar">true</item>
-        <item name="windowNoTitle">false</item>
-    </style>
 
     <!-- ActionBar -->
     <!-- Inheriting from light theme necessary to get light spinner dropdown background in Lollipop -->
@@ -95,21 +69,10 @@
         <item name="android:textColorSecondary">@color/white</item>
     </style>
 
-    <style name="ActionBarDark" parent="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
-        <!-- Determines color of text and system icons (overflow etc.) in the action bar -->
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:textColorSecondary">@color/white</item>
-    </style>
-
     <!-- For all other action bar popups (except spinner dropdown in Lollipop) -->
     <style name="ActionBar.Popup" parent="Base.ThemeOverlay.AppCompat.ActionBar">
         <item name="android:textColorPrimary">@color/text_color_black</item>
         <item name="android:background">@color/white_background</item>
         <item name="android:drawSelectorOnTop">true</item>
     </style>
-
-    <!-- For all other action bar popups (except spinner dropdown in Lollipop) -->
-    <style name="ActionBar.Popup.Dark" parent="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:drawSelectorOnTop">true</item>
-    </style>
 </resources>
diff --git a/docs/marketing/icons/navigation_drawer_background_dark_theme.svg b/docs/marketing/icons/navigation_drawer_background_dark_theme.svg
index 3dcdad3590..195555645a 100644
--- a/docs/marketing/icons/navigation_drawer_background_dark_theme.svg
+++ b/docs/marketing/icons/navigation_drawer_background_dark_theme.svg
@@ -16,7 +16,7 @@
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="navigation_drawer_background.svg"
+   sodipodi:docname="navigation_drawer_background_dark_theme.svg"
    version="1.0"
    inkscape:export-filename="/home/alex/Downloads/fcwx/FC.png"
    inkscape:export-xdpi="180"
@@ -736,6 +736,15 @@
          offset="1"
          style="stop-color:white;stop-opacity:1" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4825"
+       id="linearGradient3909"
+       gradientUnits="userSpaceOnUse"
+       x1="253.74718"
+       y1="412.82977"
+       x2="188.00023"
+       y2="542.33295" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -748,8 +757,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="50.835322"
-     inkscape:cy="-108.74737"
+     inkscape:cx="78.412487"
+     inkscape:cy="-87.534166"
      inkscape:document-units="px"
      inkscape:current-layer="g5673"
      inkscape:window-width="1920"
@@ -1265,32 +1274,31 @@
          inkscape:export-xdpi="815.04272"
          inkscape:export-ydpi="815.04272"
          transform="matrix(0.66452639,0,0,1,40.944168,0)"
-         inkscape:export-filename="C:\Users\Timothy\Desktop\drawer concept\test4.png" />
-      <g
-         inkscape:export-ydpi="3913.04"
-         inkscape:export-xdpi="3913.04"
-         inkscape:export-filename="/Users/dae/g2843.png"
-         id="g2843"
-         transform="matrix(6.2123506,-0.34038252,0.34038252,6.2123506,-164.64224,-45.58586)"
-         clip-path="none"
-         style="opacity:1">
-        <path
-           transform="matrix(0.09989622,-0.07848917,0.07848917,0.09989622,-23.590489,6.1840683)"
-           d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
-           inkscape:randomized="0"
-           inkscape:rounded="0.21"
-           inkscape:flatsided="false"
-           sodipodi:arg2="1.428641"
-           sodipodi:arg1="0.80032243"
-           sodipodi:r2="52"
-           sodipodi:r1="94"
-           sodipodi:cy="456"
-           sodipodi:cx="229"
-           sodipodi:sides="5"
-           id="path1920"
-           style="fill:url(#linearGradient5634);fill-opacity:1;stroke:#303030;stroke-width:15.98397757999999900;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="star" />
-      </g>
+         inkscape:export-filename="C:\Users\Timothy\Desktop\drawer concept\dark_alpha_40.png" />
+      <path
+         sodipodi:type="star"
+         style="fill:url(#linearGradient3909);fill-opacity:1;stroke:#303030;stroke-width:15.98397732;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path1920"
+         sodipodi:sides="5"
+         sodipodi:cx="229"
+         sodipodi:cy="456"
+         sodipodi:r1="94"
+         sodipodi:r2="52"
+         sodipodi:arg1="0.80032243"
+         sodipodi:arg2="1.428641"
+         inkscape:flatsided="false"
+         inkscape:rounded="0.21"
+         inkscape:randomized="0"
+         d="m 294.46869,523.45259 c -9.08043,8.81335 -45.57491,-17.76993 -58.10148,-15.97712 -12.52658,1.79282 -40.09949,37.54547 -51.28749,31.63294 -11.18801,-5.91252 2.81678,-48.83551 -2.75921,-60.19499 -5.57599,-11.35947 -48.09928,-26.53469 -45.93342,-39.00218 2.16586,-12.46749 47.31577,-12.41208 56.39619,-21.22544 9.08043,-8.81335 10.3725,-53.9448 22.89908,-55.73762 12.52657,-1.79281 26.42597,41.16443 37.61397,47.07695 11.188,5.91252 54.50984,-6.80503 60.08583,4.55445 5.57599,11.35947 -30.98363,37.85309 -33.14948,50.32059 -2.16586,12.46749 23.31643,49.73906 14.23601,58.55242 z"
+         transform="matrix(0.593874,-0.52160517,0.52160517,0.593874,-309.08968,0.86153051)" />
+      <rect
+         rx="9.1788263"
+         y="81.320702"
+         x="24.748735"
+         height="90.332893"
+         width="123.92046"
+         id="rect3905"
+         style="fill:#303030;fill-opacity:0.15686275;stroke:#303030;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
 </svg>