diff --git a/res/drawable/ic_emoji_outline_keyboard.xml b/res/drawable/ic_emoji_outline_keyboard.xml
index 943277e7a3..ee61f62a88 100644
--- a/res/drawable/ic_emoji_outline_keyboard.xml
+++ b/res/drawable/ic_emoji_outline_keyboard.xml
@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
   <path
       android:fillColor="#FF636467"
       android:pathData="M12,18.7c-2.1,0 -4.2,-1 -5.5,-2.7c-0.2,-0.3 -0.2,-0.8 0.2,-1.1s0.8,-0.2 1.1,0.2l0,0c1,1.3 2.6,2.1 4.3,2.1c1.7,0 3.3,-0.8 4.3,-2.1c0.2,-0.3 0.7,-0.4 1,-0.2c0,0 0,0 0,0c0.3,0.2 0.4,0.7 0.2,1C16.2,17.6 14.2,18.7 12,18.7zM12,2.5c-5.1,-0.2 -9.3,3.8 -9.5,8.9c0,0.2 0,0.4 0,0.6c-0.2,5.1 3.8,9.3 8.9,9.5c0.2,0 0.4,0 0.6,0c5.1,0.2 9.3,-3.8 9.5,-8.9c0,-0.2 0,-0.4 0,-0.6c0.2,-5.1 -3.8,-9.3 -8.9,-9.5C12.4,2.5 12.2,2.5 12,2.5M12,1c5.9,-0.2 10.8,4.5 11,10.4c0,0.2 0,0.4 0,0.6c0.2,5.9 -4.5,10.8 -10.4,11c-0.2,0 -0.4,0 -0.6,0C6.1,23.2 1.2,18.5 1,12.6c0,-0.2 0,-0.4 0,-0.6C0.8,6.1 5.5,1.2 11.4,1C11.6,1 11.8,1 12,1zM8.5,8C7.7,8 7,8.9 7,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S9.3,8 8.5,8zM15.5,8C14.7,8 14,8.9 14,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S16.3,8 15.5,8z"/>
diff --git a/res/drawable/ic_outline_keyboard_24.xml b/res/drawable/ic_outline_keyboard_24.xml
new file mode 100644
index 0000000000..4a2b3a78f1
--- /dev/null
+++ b/res/drawable/ic_outline_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,7v10L4,17L4,7h16m0,-2L4,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-2zM11,11h2v2h-2zM8,8h2v2L8,10zM8,11h2v2L8,13zM5,11h2v2L5,13zM5,8h2v2L5,10zM8,14h8v2L8,16zM14,11h2v2h-2zM14,8h2v2h-2zM17,11h2v2h-2zM17,8h2v2h-2z"/>
+</vector>
diff --git a/res/drawable/ic_outline_photo_camera_24.xml b/res/drawable/ic_outline_photo_camera_24.xml
new file mode 100644
index 0000000000..4e8623f3fa
--- /dev/null
+++ b/res/drawable/ic_outline_photo_camera_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="M14.12,4l1.83,2L20,6v12L4,18L4,6h4.05l1.83,-2h4.24M15,2L9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2zM12,9c1.65,0 3,1.35 3,3s-1.35,3 -3,3 -3,-1.35 -3,-3 1.35,-3 3,-3m0,-2c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5z"/>
+</vector>
diff --git a/res/drawable/ic_sticker_outline_keyboard.xml b/res/drawable/ic_sticker_outline_keyboard.xml
index d2f6e5bb03..b334a9cff3 100644
--- a/res/drawable/ic_sticker_outline_keyboard.xml
+++ b/res/drawable/ic_sticker_outline_keyboard.xml
@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?colorControlNormal">
   <path
       android:fillColor="#FF636467"
       android:pathData="M21.5,4.1c-0.3,-0.6 -0.8,-1.2 -1.5,-1.5c-1,-0.5 -2.1,-0.6 -3.1,-0.5H7.1C6.1,1.9 5,2.1 4.1,2.5C3.4,2.9 2.9,3.4 2.5,4.1C2.1,5 1.9,6.1 2,7.1v9.7C1.9,17.9 2.1,19 2.5,20c0.3,0.6 0.9,1.2 1.5,1.5c1,0.4 2,0.6 3.1,0.5h2.1c0.8,0 1.6,-0.3 2.1,-0.9l9.7,-9.7c0.6,-0.6 0.9,-1.3 0.9,-2.1V7.1C22.1,6.1 21.9,5 21.5,4.1zM11.5,18.9v-3c-0.1,-0.9 0.1,-1.9 0.5,-2.7c0.3,-0.5 0.7,-0.9 1.2,-1.2c0.8,-0.4 1.8,-0.6 2.7,-0.4h3L11.5,18.9zM19,10h-3.1c-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.4V19c0,1.4 -0.4,1.5 -1,1.5H7.1c-1.7,0 -2,-0.2 -2.4,-0.4c-0.4,-0.2 -0.7,-0.5 -0.9,-0.9c-0.2,-0.3 -0.4,-0.7 -0.4,-2.4V7.1c0,-1.7 0.2,-2 0.4,-2.4c0.2,-0.4 0.5,-0.7 0.9,-0.9c0.3,-0.2 0.7,-0.4 2.4,-0.4h9.7c1.7,0 2,0.2 2.4,0.4c0.4,0.2 0.7,0.5 0.9,0.9c0.2,0.3 0.4,0.7 0.4,2.4V9C20.5,9.5 20.5,10 19,10z"/>
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 4e77f8226d..5805b9cb88 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Session.DayNight">
+    <style name="Theme.Session.Light">
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
         <item name="android:textColorHint">@color/gray50</item>
 
@@ -16,7 +16,17 @@
         <item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
 
+        <item name="conversation_emoji_toggle">@drawable/ic_emoji_outline_keyboard</item>
+        <item name="conversation_sticker_toggle">@drawable/ic_sticker_outline_keyboard</item>
+        <item name="conversation_keyboard_toggle">@drawable/ic_outline_keyboard_24</item>
         <item name="conversation_input_background">@drawable/compose_background_light</item>
+
+        <item name="quick_camera_icon">@drawable/ic_outline_photo_camera_24</item>
+
+    </style>
+
+    <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
+
     </style>
 
     <style name="Theme.TextSecure.DayNight">
diff --git a/res/values-notnight-v23/themes.xml b/res/values-notnight-v23/themes.xml
index 4e55488512..69b65c8699 100644
--- a/res/values-notnight-v23/themes.xml
+++ b/res/values-notnight-v23/themes.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Session.DayNight">
-        <item name="android:navigationBarColor">?android:navigationBarColor</item>
-        <item name="android:textColorHint">@color/gray50</item>
-
-        <item name="home_gradient_start">#00FFFFFF</item>
-        <item name="home_gradient_end">#FFFFFFFF</item>
-
-        <item name="message_received_background_color">#F5F5F5</item>
-        <item name="message_sent_background_color">?colorAccent</item>
-
+    <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index ad8e36edb3..74ea16fb8b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -83,6 +83,8 @@
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
+
+        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
     </style>
 
     <!-- This should be the default theme for the application. -->
@@ -545,7 +547,7 @@
         <item name="linkpreview_secondary_text_color">@color/text</item>
         <item name="linkpreview_divider_color">@color/transparent</item>
 
-        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
+<!--        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>-->
         <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
 
         <item name="media_keyboard_button_color">@color/core_grey_25</item>
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
index 11199196d6..4d5b85d637 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -46,11 +46,11 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
   }
 
   private void initialize() {
-    int attributes[] = new int[] {R.attr.conversation_emoji_toggle,
-                                  R.attr.conversation_sticker_toggle,
-                                  R.attr.conversation_keyboard_toggle};
+    TypedArray drawables = getContext().obtainStyledAttributes(new int[] {
+            R.attr.conversation_emoji_toggle,
+            R.attr.conversation_sticker_toggle,
+            R.attr.conversation_keyboard_toggle});
 
-    TypedArray drawables = getContext().obtainStyledAttributes(attributes);
     this.emojiToggle     = drawables.getDrawable(0);
     this.stickerToggle   = drawables.getDrawable(1);
     this.imeToggle       = drawables.getDrawable(2);