diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a98134a55e..3a5500570c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -411,7 +411,7 @@
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:label="@string/AndroidManifest__media_preview"
             android:screenOrientation="portrait"
-            android:theme="@style/Session.DarkTheme.SubtitleActionBar"
+            android:theme="@style/Session.DarkTheme"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" />
         <activity
diff --git a/res/drawable-hdpi/ic_forward_white_24dp.png b/res/drawable-hdpi/ic_forward_white_24dp.png
deleted file mode 100644
index ee62c532c3..0000000000
Binary files a/res/drawable-hdpi/ic_forward_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_save_white_24dp.png b/res/drawable-hdpi/ic_save_white_24dp.png
deleted file mode 100644
index 8e4fdd006e..0000000000
Binary files a/res/drawable-hdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_forward_white_24dp.png b/res/drawable-mdpi/ic_forward_white_24dp.png
deleted file mode 100644
index 0b9869ae84..0000000000
Binary files a/res/drawable-mdpi/ic_forward_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_save_white_24dp.png b/res/drawable-mdpi/ic_save_white_24dp.png
deleted file mode 100644
index 2aee517ccb..0000000000
Binary files a/res/drawable-mdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_forward_white_24dp.png b/res/drawable-xhdpi/ic_forward_white_24dp.png
deleted file mode 100644
index 80841b1329..0000000000
Binary files a/res/drawable-xhdpi/ic_forward_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_save_white_24dp.png b/res/drawable-xhdpi/ic_save_white_24dp.png
deleted file mode 100644
index 273f33ac65..0000000000
Binary files a/res/drawable-xhdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_forward_white_24dp.png b/res/drawable-xxhdpi/ic_forward_white_24dp.png
deleted file mode 100644
index 26294e574d..0000000000
Binary files a/res/drawable-xxhdpi/ic_forward_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_save_white_24dp.png b/res/drawable-xxhdpi/ic_save_white_24dp.png
deleted file mode 100644
index 6c87e13588..0000000000
Binary files a/res/drawable-xxhdpi/ic_save_white_24dp.png and /dev/null differ
diff --git a/res/drawable/ic_baseline_forward_24.xml b/res/drawable/ic_baseline_forward_24.xml
new file mode 100644
index 0000000000..3f0ba0b613
--- /dev/null
+++ b/res/drawable/ic_baseline_forward_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,8V4l8,8 -8,8v-4H4V8z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_photo_library_24.xml b/res/drawable/ic_baseline_photo_library_24.xml
new file mode 100644
index 0000000000..ee0f6931c5
--- /dev/null
+++ b/res/drawable/ic_baseline_photo_library_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_save_24.xml b/res/drawable/ic_baseline_save_24.xml
new file mode 100644
index 0000000000..1a8d86d20c
--- /dev/null
+++ b/res/drawable/ic_baseline_save_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/res/menu/media_overview_context.xml b/res/menu/media_overview_context.xml
index 5ebdf2b524..f7e59ef8ae 100644
--- a/res/menu/media_overview_context.xml
+++ b/res/menu/media_overview_context.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/save"
         android:title="@string/save"
-        android:icon="@drawable/ic_save_white_24dp"
+        android:icon="?attr/menu_save_icon"
         app:showAsAction="always"/>
 
     <item android:id="@+id/delete"
diff --git a/res/menu/media_preview.xml b/res/menu/media_preview.xml
index df7f7cebcb..9f89ae61ec 100644
--- a/res/menu/media_preview.xml
+++ b/res/menu/media_preview.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/media_preview__forward"
-          android:title="@string/media_preview__forward_title"
-          android:icon="@drawable/ic_forward_white_24dp"
-          app:showAsAction="always"/>
-    <item android:id="@+id/save"
-          android:title="@string/media_preview__save_title"
-          android:icon="@drawable/ic_save_white_24dp"
-          app:showAsAction="always"/>
-    <item android:id="@+id/media_preview__overview"
-          android:title="@string/media_preview__all_media_title"
-          android:icon="@drawable/ic_photo_library_white_24dp"
-          app:showAsAction="ifRoom"/>
-    <item android:id="@+id/delete"
-          android:title="@string/delete"
-          android:icon="@drawable/ic_baseline_delete_24"
-          app:showAsAction="ifRoom"/>
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/media_preview__forward"
+        android:icon="?menu_forward_icon"
+        android:title="@string/media_preview__forward_title"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/save"
+        android:icon="?menu_save_icon"
+        android:title="@string/media_preview__save_title"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/media_preview__overview"
+        android:icon="?menu_photo_library_icon"
+        android:title="@string/media_preview__all_media_title"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/delete"
+        android:icon="?menu_delete_icon"
+        android:title="@string/delete"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml
index f27c4e2895..1401bf37fb 100644
--- a/res/values-notnight/themes.xml
+++ b/res/values-notnight/themes.xml
@@ -147,8 +147,6 @@
         <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
-        <item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
         <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d214178e77..658f6dbb0e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -145,6 +145,8 @@
     <attr name="menu_save_icon" format="reference" />
     <attr name="menu_reply_icon" format="reference" />
     <attr name="menu_block_icon" format="reference" />
+    <attr name="menu_photo_library_icon" format="reference" />
+    <attr name="menu_delete_icon" format="reference" />
 
     <attr name="pref_icon_tint" format="color"/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d70f125fd4..7fc706df54 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -12,25 +12,24 @@
     </style>
 
     <style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="background">@color/action_bar_background</item>
         <item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
         <item name="elevation">0dp</item>
     </style>
 
     <style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/text</item>
+<!--        <item name="android:textColor">@color/text</item>-->
         <item name="android:textSize">@dimen/very_large_font_size</item>
     </style>
 
     <style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/text</item>
+<!--        <item name="android:textColor">@color/text</item>-->
         <item name="android:textSize">@dimen/large_font_size</item>
         <item name="android:fontFamily">sans-serif-medium</item>
     </style>
 
     <style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/text</item>
+<!--        <item name="android:textColor">@color/text</item>-->
         <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a6b5369b83..3aaafc31b2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -43,6 +43,10 @@
         <item name="menu_accept_icon">@drawable/ic_baseline_done_24</item>
         <item name="menu_trash_icon">@drawable/ic_baseline_delete_24</item>
         <item name="menu_block_icon">@drawable/ic_baseline_block_24</item>
+        <item name="menu_forward_icon">@drawable/ic_baseline_forward_24</item>
+        <item name="menu_save_icon">@drawable/ic_baseline_save_24</item>
+        <item name="menu_photo_library_icon">@drawable/ic_baseline_photo_library_24</item>
+        <item name="menu_delete_icon">@drawable/ic_baseline_delete_24</item>
     </style>
 
     <style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
@@ -54,7 +58,7 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Session.DarkTheme.NoActionBar">
+    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Session.DarkTheme">
         <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
     </style>
     <!-- Session -->
@@ -323,8 +327,6 @@
         <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
-        <item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
         <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
@@ -507,8 +509,6 @@
         <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
         <item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
         <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-        <item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
-        <item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
         <item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
 
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>