diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a5500570c..7518929d98 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -355,7 +355,7 @@
             android:name="org.thoughtcrime.securesms.mediasend.MediaSendActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:screenOrientation="portrait"
-            android:theme="@style/Session.DarkTheme.NoActionBar"
+            android:theme="@style/Theme.Session.ForceDark.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.PassphraseChangeActivity"
diff --git a/res/drawable/ic_baseline_keyboard_24.xml b/res/drawable/ic_baseline_keyboard_24.xml
new file mode 100644
index 0000000000..533fc1562a
--- /dev/null
+++ b/res/drawable/ic_baseline_keyboard_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="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
+</vector>
diff --git a/res/drawable/ic_emoji_filled_keyboard_24.xml b/res/drawable/ic_emoji_filled_keyboard_24.xml
new file mode 100644
index 0000000000..af2c68e3c8
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28"
+    android:tint="?colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14,2C7.6,1.8 2.2,6.9 2,13.3c0,0.2 0,0.4 0,0.7c-0.2,6.4 4.9,11.8 11.3,12c0.2,0 0.4,0 0.7,0c6.4,0.2 11.8,-4.9 12,-11.3c0,-0.2 0,-0.4 0,-0.7c0.2,-6.4 -4.9,-11.8 -11.3,-12C14.4,2 14.2,2 14,2zM17.6,9.5c0.9,0 1.6,1 1.6,2.2S18.5,14 17.6,14S16,13 16,11.8S16.7,9.5 17.6,9.5zM10.4,9.5c0.9,0 1.6,1 1.6,2.2S11.3,14 10.4,14s-1.6,-1 -1.6,-2.2S9.5,9.5 10.4,9.5zM20,18.3c-2.5,3.3 -7.2,3.9 -10.5,1.4c-0.5,-0.4 -1,-0.9 -1.4,-1.4c-0.3,-0.3 -0.2,-0.8 0.1,-1.1C8.5,16.9 9,17 9.2,17.3c0,0 0.1,0.1 0.1,0.1c1.1,1.5 2.8,2.3 4.7,2.3c1.9,0 3.6,-0.8 4.7,-2.3c0.2,-0.3 0.7,-0.4 1,-0.2S20.2,17.9 20,18.3L20,18.3z" />
+</vector>
diff --git a/res/drawable/ic_sticker_filled_keyboard_24.xml b/res/drawable/ic_sticker_filled_keyboard_24.xml
new file mode 100644
index 0000000000..de5399d3e7
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_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="?colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,22H7.1c-1.1,0.1 -2.1,-0.1 -3.1,-0.5c-0.6,-0.3 -1.2,-0.8 -1.5,-1.5c-0.5,-1 -0.6,-2.1 -0.5,-3.1V7.1C1.9,6.1 2.1,5 2.5,4.1c0.3,-0.6 0.9,-1.2 1.5,-1.5c1,-0.5 2,-0.6 3.1,-0.5h9.7C17.9,1.9 19,2.1 20,2.5c0.6,0.3 1.2,0.9 1.5,1.5c0.4,1 0.6,2 0.5,3.1V9c0,0.5 0,1 -1.5,1h-4.6c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4v4.6C10,21.9 9.6,22 9,22zM15.9,11.5c-0.9,-0.1 -1.9,0 -2.7,0.4c-0.5,0.3 -0.9,0.7 -1.2,1.2c-0.4,0.8 -0.6,1.8 -0.4,2.7v4.6c0,0.2 0,0.4 0,0.5l9.5,-9.6c-0.2,0 -0.4,0 -0.5,0L15.9,11.5z" />
+</vector>
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index de1978593b..648b6dde5f 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -5,7 +5,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/core_black">
+    android:background="@color/core_black"
+    tools:context="org.thoughtcrime.securesms.mediasend.MediaSendActivity">
 
     <org.thoughtcrime.securesms.components.ControllableViewPager
         android:id="@+id/mediasend_pager"
@@ -56,6 +57,7 @@
                 android:layout_marginTop="2dp"
                 android:layout_marginStart="2dp"
                 android:layout_marginEnd="2dp"
+                tools:listitem="@layout/mediarail_media_item"
                 tools:layout_height="64dp"/>
 
             <LinearLayout
diff --git a/res/layout/recording_layout.xml b/res/layout/recording_layout.xml
index 569a8e8066..92e8077983 100644
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@@ -34,7 +34,7 @@
         android:layout_marginStart="4dp"
         android:ellipsize="none"
         android:singleLine="true"
-        android:textColor="#99FFFFFF"
+        android:textColor="?android:textColorTertiary"
         android:visibility="gone"
         android:textSize="@dimen/small_font_size"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -85,7 +85,7 @@
                 android:layout_height="24dp"
                 android:layout_marginTop="1dp"
                 android:src="@drawable/ic_keyboard_arrow_left_grey600_24dp"
-                android:tint="#99FFFFFF"
+                android:tint="?android:textColorTertiary"
                 android:scaleType="centerInside" />
 
             <TextView
@@ -95,7 +95,7 @@
                 android:textSize="@dimen/small_font_size"
                 android:ellipsize="none"
                 android:text="@string/conversation_input_panel__slide_to_cancel"
-                android:textColor="#99FFFFFF" />
+                android:textColor="?android:textColorTertiary" />
 
         </LinearLayout>
 
diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml
index 2fc463004d..f5b1155ace 100644
--- a/res/values-notnight/themes.xml
+++ b/res/values-notnight/themes.xml
@@ -59,9 +59,6 @@
         <item name="conversation_input_background">@drawable/compose_background_light</item>
         <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
         <item name="conversation_transport_popup_background">@color/white</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_outline_keyboard</item>
-        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_light</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
         <item name="conversation_attach_camera">@drawable/ic_photo_camera_light</item>
         <item name="conversation_attach_image">@drawable/ic_image_light</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index aee94c168b..5d7cfde690 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -58,6 +58,10 @@
         <item name="menu_selectall_icon">@drawable/ic_baseline_select_all_24</item>
         <item name="menu_split_icon">@drawable/ic_baseline_call_split_24</item>
         <item name="menu_popup_expand">@drawable/ic_baseline_launch_24</item>
+
+        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_24</item>
+        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
     </style>
 
     <style name="Session.DarkTheme" parent="Session.BaseDarkTheme">
@@ -72,6 +76,21 @@
     <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Session.DarkTheme">
         <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
     </style>
+
+    <!-- TODO Refactor this -->
+    <style name="Theme.Session.ForceDark" parent="Session.BaseDarkTheme">
+        <!-- TODO Use a color resource -->
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="android:textColorPrimary">#FFFFFF</item>
+        <item name="colorControlNormal">?android:textColorPrimary</item>
+        <item name="android:colorBackground">#121212</item>
+        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:navigationBarColor">?android:colorBackground</item>
+    </style>
+    <style name="Theme.Session.ForceDark.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
     <!-- Session -->
 
     <style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
@@ -462,9 +481,9 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up_circle_24</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_arrow_up_circle_24</item>
         <item name="conversation_transport_popup_background">@color/black</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_dark</item>
-        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_dark</item>
-        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
+<!--        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_dark</item>-->
+<!--        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_dark</item>-->
+<!--        <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>-->
         <item name="conversation_attach_camera">@drawable/ic_photo_camera_dark</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
index ad9aead5a7..11199196d6 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -1,12 +1,12 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatImageButton;
-import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -56,8 +56,6 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     this.imeToggle       = drawables.getDrawable(2);
     this.mediaToggle     = emojiToggle;
 
-    setImageTintList(ColorStateList.valueOf(getResources().getColor(R.color.text)));
-
     drawables.recycle();
     setToMedia();
   }