Add back the highlight and sticker tools.

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"

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>