diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bd83cfa5f3..24465f78f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -400,7 +400,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".scribbles.StickerSelectActivity"
-              android:theme="@style/TextSecure.ScribbleTheme"
+              android:theme="@style/TextSecure.DarkTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
diff --git a/res/drawable-hdpi/ic_camera_emoji_36.png b/res/drawable-hdpi/ic_camera_emoji_36.png
new file mode 100644
index 0000000000..2be395fcc1
Binary files /dev/null and b/res/drawable-hdpi/ic_camera_emoji_36.png differ
diff --git a/res/drawable-hdpi/ic_highlighter_36.png b/res/drawable-hdpi/ic_highlighter_36.png
new file mode 100644
index 0000000000..586aa32d0b
Binary files /dev/null and b/res/drawable-hdpi/ic_highlighter_36.png differ
diff --git a/res/drawable-hdpi/ic_scribble_highlight.png b/res/drawable-hdpi/ic_scribble_highlight.png
deleted file mode 100644
index 8fa4e030fb..0000000000
Binary files a/res/drawable-hdpi/ic_scribble_highlight.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_scribble_sticker.png b/res/drawable-hdpi/ic_scribble_sticker.png
deleted file mode 100644
index 883e69eed8..0000000000
Binary files a/res/drawable-hdpi/ic_scribble_sticker.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_camera_emoji_36.png b/res/drawable-mdpi/ic_camera_emoji_36.png
new file mode 100644
index 0000000000..05d680eee5
Binary files /dev/null and b/res/drawable-mdpi/ic_camera_emoji_36.png differ
diff --git a/res/drawable-mdpi/ic_highlighter_36.png b/res/drawable-mdpi/ic_highlighter_36.png
new file mode 100644
index 0000000000..1cef04196f
Binary files /dev/null and b/res/drawable-mdpi/ic_highlighter_36.png differ
diff --git a/res/drawable-mdpi/ic_scribble_highlight.png b/res/drawable-mdpi/ic_scribble_highlight.png
deleted file mode 100644
index 9427b396f6..0000000000
Binary files a/res/drawable-mdpi/ic_scribble_highlight.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_scribble_sticker.png b/res/drawable-mdpi/ic_scribble_sticker.png
deleted file mode 100644
index a727960525..0000000000
Binary files a/res/drawable-mdpi/ic_scribble_sticker.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_camera_emoji_36.png b/res/drawable-xhdpi/ic_camera_emoji_36.png
new file mode 100644
index 0000000000..7ab20d07ab
Binary files /dev/null and b/res/drawable-xhdpi/ic_camera_emoji_36.png differ
diff --git a/res/drawable-xhdpi/ic_highlighter_36.png b/res/drawable-xhdpi/ic_highlighter_36.png
new file mode 100644
index 0000000000..40bc10a95d
Binary files /dev/null and b/res/drawable-xhdpi/ic_highlighter_36.png differ
diff --git a/res/drawable-xhdpi/ic_scribble_highlight.png b/res/drawable-xhdpi/ic_scribble_highlight.png
deleted file mode 100644
index 23e86125c0..0000000000
Binary files a/res/drawable-xhdpi/ic_scribble_highlight.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_scribble_sticker.png b/res/drawable-xhdpi/ic_scribble_sticker.png
deleted file mode 100644
index 9cc0bf0bde..0000000000
Binary files a/res/drawable-xhdpi/ic_scribble_sticker.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_camera_emoji_36.png b/res/drawable-xxhdpi/ic_camera_emoji_36.png
new file mode 100644
index 0000000000..34d9c6a4a0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_camera_emoji_36.png differ
diff --git a/res/drawable-xxhdpi/ic_highlighter_36.png b/res/drawable-xxhdpi/ic_highlighter_36.png
new file mode 100644
index 0000000000..c67056bc47
Binary files /dev/null and b/res/drawable-xxhdpi/ic_highlighter_36.png differ
diff --git a/res/drawable-xxhdpi/ic_scribble_highlight.png b/res/drawable-xxhdpi/ic_scribble_highlight.png
deleted file mode 100644
index 62ee1cf131..0000000000
Binary files a/res/drawable-xxhdpi/ic_scribble_highlight.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_scribble_sticker.png b/res/drawable-xxhdpi/ic_scribble_sticker.png
deleted file mode 100644
index 53825760e2..0000000000
Binary files a/res/drawable-xxhdpi/ic_scribble_sticker.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_camera_emoji_36.png b/res/drawable-xxxhdpi/ic_camera_emoji_36.png
new file mode 100644
index 0000000000..5bdb14b6ea
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_camera_emoji_36.png differ
diff --git a/res/drawable-xxxhdpi/ic_highlighter_36.png b/res/drawable-xxxhdpi/ic_highlighter_36.png
new file mode 100644
index 0000000000..296e2b93e0
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_highlighter_36.png differ
diff --git a/res/drawable-xxxhdpi/ic_scribble_highlight.png b/res/drawable-xxxhdpi/ic_scribble_highlight.png
deleted file mode 100644
index 0b507ab637..0000000000
Binary files a/res/drawable-xxxhdpi/ic_scribble_highlight.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_scribble_sticker.png b/res/drawable-xxxhdpi/ic_scribble_sticker.png
deleted file mode 100644
index 88d5a53f73..0000000000
Binary files a/res/drawable-xxxhdpi/ic_scribble_sticker.png and /dev/null differ
diff --git a/res/layout/scribble_hud.xml b/res/layout/scribble_hud.xml
index 36f0f08996..0b2ec15d9e 100644
--- a/res/layout/scribble_hud.xml
+++ b/res/layout/scribble_hud.xml
@@ -57,6 +57,22 @@
                 android:padding="8dp"
                 android:src="@drawable/ic_undo_36" />
 
+            <ImageView
+                android:id="@+id/scribble_draw_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_marker_36" />
+
+            <ImageView
+                android:id="@+id/scribble_highlight_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_highlighter_36" />
+
             <ImageView
                 android:id="@+id/scribble_text_button"
                 android:layout_width="wrap_content"
@@ -66,12 +82,12 @@
                 android:src="@drawable/ic_text_36" />
 
             <ImageView
-                android:id="@+id/scribble_draw_button"
+                android:id="@+id/scribble_sticker_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="8dp"
-                android:src="@drawable/ic_marker_36" />
+                android:src="@drawable/ic_camera_emoji_36" />
 
             <ImageView
                 android:id="@+id/scribble_confirm_button"
diff --git a/res/layout/scribble_select_sticker_activity.xml b/res/layout/scribble_select_sticker_activity.xml
index d05cc2b602..3e0dd01d43 100644
--- a/res/layout/scribble_select_sticker_activity.xml
+++ b/res/layout/scribble_select_sticker_activity.xml
@@ -9,15 +9,14 @@
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabBackground="@color/signal_primary"
+            app:tabBackground="@color/core_grey_90"
             app:tabMode="fixed"/>
 
     <android.support.v4.view.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="1"
-            android:background="@android:color/white" />
+            android:layout_weight="1" />
 
 </LinearLayout>
 
diff --git a/src/org/thoughtcrime/securesms/scribbles/ScribbleHud.java b/src/org/thoughtcrime/securesms/scribbles/ScribbleHud.java
index cd8c0fdeb3..10ffdae577 100644
--- a/src/org/thoughtcrime/securesms/scribbles/ScribbleHud.java
+++ b/src/org/thoughtcrime/securesms/scribbles/ScribbleHud.java
@@ -41,7 +41,9 @@ import java.util.Set;
 public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.OnGlobalLayoutListener {
 
   private View                     drawButton;
+  private View                     highlightButton;
   private View                     textButton;
+  private View                     stickerButton;
   private View                     undoButton;
   private View                     deleteButton;
   private View                     confirmButton;
@@ -110,7 +112,9 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
     setOrientation(VERTICAL);
 
     drawButton      = findViewById(R.id.scribble_draw_button);
+    highlightButton = findViewById(R.id.scribble_highlight_button);
     textButton      = findViewById(R.id.scribble_text_button);
+    stickerButton   = findViewById(R.id.scribble_sticker_button);
     undoButton      = findViewById(R.id.scribble_undo_button);
     deleteButton    = findViewById(R.id.scribble_delete_button);
     confirmButton   = findViewById(R.id.scribble_confirm_button);
@@ -255,7 +259,9 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
 
   private void presentModeNone() {
     drawButton.setVisibility(VISIBLE);
+    highlightButton.setVisibility(VISIBLE);
     textButton.setVisibility(VISIBLE);
+    stickerButton.setVisibility(VISIBLE);
 
     undoButton.setVisibility(GONE);
     deleteButton.setVisibility(GONE);
@@ -264,7 +270,9 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
     colorPalette.setVisibility(GONE);
 
     drawButton.setOnClickListener(v -> setMode(Mode.DRAW));
+    highlightButton.setOnClickListener(v -> setMode(Mode.HIGHLIGHT));
     textButton.setOnClickListener(v -> setMode(Mode.TEXT));
+    stickerButton.setOnClickListener(v -> setMode(Mode.STICKER));
   }
 
   private void presentModeDraw() {
@@ -274,7 +282,9 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
     colorPalette.setVisibility(VISIBLE);
 
     drawButton.setVisibility(GONE);
+    highlightButton.setVisibility(GONE);
     textButton.setVisibility(GONE);
+    stickerButton.setVisibility(GONE);
     deleteButton.setVisibility(GONE);
 
 
@@ -289,8 +299,10 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
     colorPalette.setVisibility(VISIBLE);
 
     drawButton.setVisibility(GONE);
+    highlightButton.setVisibility(GONE);
     textButton.setVisibility(GONE);
     deleteButton.setVisibility(GONE);
+    stickerButton.setVisibility(GONE);
 
     colorPicker.setOnColorChangeListener(highlightOnColorChangeListener);
     colorPicker.setActiveColor(Color.YELLOW);
@@ -304,6 +316,8 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
 
     textButton.setVisibility(GONE);
     drawButton.setVisibility(GONE);
+    highlightButton.setVisibility(GONE);
+    stickerButton.setVisibility(GONE);
     undoButton.setVisibility(GONE);
 
     colorPicker.setOnColorChangeListener(standardOnColorChangeListener);
@@ -315,7 +329,9 @@ public class ScribbleHud extends InputAwareLayout implements ViewTreeObserver.On
     confirmButton.setVisibility(VISIBLE);
 
     drawButton.setVisibility(GONE);
+    highlightButton.setVisibility(GONE);
     textButton.setVisibility(GONE);
+    stickerButton.setVisibility(GONE);
     undoButton.setVisibility(GONE);
     colorPicker.setVisibility(GONE);
     colorPalette.setVisibility(GONE);