diff --git a/res/drawable-hdpi/ic_action_name.png b/res/drawable-hdpi/ic_action_name.png
deleted file mode 100644
index 798948971..000000000
Binary files a/res/drawable-hdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_add_caption_36.png b/res/drawable-hdpi/ic_add_caption_36.png
deleted file mode 100644
index 3aa8cfb0f..000000000
Binary files a/res/drawable-hdpi/ic_add_caption_36.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_add_photo.png b/res/drawable-hdpi/ic_add_photo.png
deleted file mode 100644
index 06df8c379..000000000
Binary files a/res/drawable-hdpi/ic_add_photo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_create_album_filled_32.png b/res/drawable-hdpi/ic_create_album_filled_32.png
deleted file mode 100644
index fc6159d9c..000000000
Binary files a/res/drawable-hdpi/ic_create_album_filled_32.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_file_download_white_36dp.png b/res/drawable-hdpi/ic_file_download_white_36dp.png
deleted file mode 100644
index 9f23ce8ee..000000000
Binary files a/res/drawable-hdpi/ic_file_download_white_36dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_info_white_18dp.png b/res/drawable-hdpi/ic_info_white_18dp.png
deleted file mode 100644
index 7bc6eb1c5..000000000
Binary files a/res/drawable-hdpi/ic_info_white_18dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_mood_grey600_24dp.png b/res/drawable-hdpi/ic_mood_grey600_24dp.png
deleted file mode 100644
index 1660ce956..000000000
Binary files a/res/drawable-hdpi/ic_mood_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_mood_white_24dp.png b/res/drawable-hdpi/ic_mood_white_24dp.png
deleted file mode 100644
index 5f5773ea7..000000000
Binary files a/res/drawable-hdpi/ic_mood_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_restore_white_24dp.png b/res/drawable-hdpi/ic_restore_white_24dp.png
deleted file mode 100644
index 41cf4576c..000000000
Binary files a/res/drawable-hdpi/ic_restore_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_scribble_save.png b/res/drawable-hdpi/ic_scribble_save.png
deleted file mode 100644
index 37ae7639c..000000000
Binary files a/res/drawable-hdpi/ic_scribble_save.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_textsms_white_48dp.png b/res/drawable-hdpi/ic_textsms_white_48dp.png
deleted file mode 100644
index a3d45a5a4..000000000
Binary files a/res/drawable-hdpi/ic_textsms_white_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_x_circle.png b/res/drawable-hdpi/ic_x_circle.png
deleted file mode 100644
index f6292fabc..000000000
Binary files a/res/drawable-hdpi/ic_x_circle.png and /dev/null differ
diff --git a/res/drawable-hdpi/icon_lock.png b/res/drawable-hdpi/icon_lock.png
deleted file mode 100644
index 9bcc28284..000000000
Binary files a/res/drawable-hdpi/icon_lock.png and /dev/null differ
diff --git a/res/drawable-hdpi/quick_camera_exit_fullscreen.png b/res/drawable-hdpi/quick_camera_exit_fullscreen.png
deleted file mode 100755
index 061e737da..000000000
Binary files a/res/drawable-hdpi/quick_camera_exit_fullscreen.png and /dev/null differ
diff --git a/res/drawable-hdpi/quick_camera_fullscreen.png b/res/drawable-hdpi/quick_camera_fullscreen.png
deleted file mode 100755
index bd69358cb..000000000
Binary files a/res/drawable-hdpi/quick_camera_fullscreen.png and /dev/null differ
diff --git a/res/drawable-hdpi/quick_camera_hide.png b/res/drawable-hdpi/quick_camera_hide.png
deleted file mode 100755
index 724eb1f7a..000000000
Binary files a/res/drawable-hdpi/quick_camera_hide.png and /dev/null differ
diff --git a/res/drawable-hdpi/quick_shutter_button.png b/res/drawable-hdpi/quick_shutter_button.png
deleted file mode 100755
index 9817b7e7e..000000000
Binary files a/res/drawable-hdpi/quick_shutter_button.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_name.png b/res/drawable-mdpi/ic_action_name.png
deleted file mode 100644
index eeefcc09d..000000000
Binary files a/res/drawable-mdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_add_caption_36.png b/res/drawable-mdpi/ic_add_caption_36.png
deleted file mode 100644
index f7f08d5de..000000000
Binary files a/res/drawable-mdpi/ic_add_caption_36.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_add_photo.png b/res/drawable-mdpi/ic_add_photo.png
deleted file mode 100644
index 27e783ca7..000000000
Binary files a/res/drawable-mdpi/ic_add_photo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_create_album_filled_32.png b/res/drawable-mdpi/ic_create_album_filled_32.png
deleted file mode 100644
index db1838fac..000000000
Binary files a/res/drawable-mdpi/ic_create_album_filled_32.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_file_download_white_36dp.png b/res/drawable-mdpi/ic_file_download_white_36dp.png
deleted file mode 100644
index 6c2665d24..000000000
Binary files a/res/drawable-mdpi/ic_file_download_white_36dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_info_white_18dp.png b/res/drawable-mdpi/ic_info_white_18dp.png
deleted file mode 100644
index 5d692dcc1..000000000
Binary files a/res/drawable-mdpi/ic_info_white_18dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_mood_grey600_24dp.png b/res/drawable-mdpi/ic_mood_grey600_24dp.png
deleted file mode 100644
index 81eea97a7..000000000
Binary files a/res/drawable-mdpi/ic_mood_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_mood_white_24dp.png b/res/drawable-mdpi/ic_mood_white_24dp.png
deleted file mode 100644
index 34001392c..000000000
Binary files a/res/drawable-mdpi/ic_mood_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_restore_white_24dp.png b/res/drawable-mdpi/ic_restore_white_24dp.png
deleted file mode 100644
index 72c39f5ed..000000000
Binary files a/res/drawable-mdpi/ic_restore_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_scribble_save.png b/res/drawable-mdpi/ic_scribble_save.png
deleted file mode 100644
index 1bf4c3b0c..000000000
Binary files a/res/drawable-mdpi/ic_scribble_save.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_textsms_white_48dp.png b/res/drawable-mdpi/ic_textsms_white_48dp.png
deleted file mode 100644
index 9818088d9..000000000
Binary files a/res/drawable-mdpi/ic_textsms_white_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_x_circle.png b/res/drawable-mdpi/ic_x_circle.png
deleted file mode 100644
index 11fee34e3..000000000
Binary files a/res/drawable-mdpi/ic_x_circle.png and /dev/null differ
diff --git a/res/drawable-mdpi/icon_lock.png b/res/drawable-mdpi/icon_lock.png
deleted file mode 100644
index e3298cc10..000000000
Binary files a/res/drawable-mdpi/icon_lock.png and /dev/null differ
diff --git a/res/drawable-mdpi/quick_camera_exit_fullscreen.png b/res/drawable-mdpi/quick_camera_exit_fullscreen.png
deleted file mode 100755
index 2e88a8773..000000000
Binary files a/res/drawable-mdpi/quick_camera_exit_fullscreen.png and /dev/null differ
diff --git a/res/drawable-mdpi/quick_camera_fullscreen.png b/res/drawable-mdpi/quick_camera_fullscreen.png
deleted file mode 100755
index 382fe09ed..000000000
Binary files a/res/drawable-mdpi/quick_camera_fullscreen.png and /dev/null differ
diff --git a/res/drawable-mdpi/quick_camera_hide.png b/res/drawable-mdpi/quick_camera_hide.png
deleted file mode 100755
index 6c2476660..000000000
Binary files a/res/drawable-mdpi/quick_camera_hide.png and /dev/null differ
diff --git a/res/drawable-mdpi/quick_shutter_button.png b/res/drawable-mdpi/quick_shutter_button.png
deleted file mode 100755
index 90022770f..000000000
Binary files a/res/drawable-mdpi/quick_shutter_button.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_name.png b/res/drawable-xhdpi/ic_action_name.png
deleted file mode 100644
index 28cd18b55..000000000
Binary files a/res/drawable-xhdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_add_caption_36.png b/res/drawable-xhdpi/ic_add_caption_36.png
deleted file mode 100644
index 7d6a2c322..000000000
Binary files a/res/drawable-xhdpi/ic_add_caption_36.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_add_photo.png b/res/drawable-xhdpi/ic_add_photo.png
deleted file mode 100644
index b0e119af4..000000000
Binary files a/res/drawable-xhdpi/ic_add_photo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_create_album_filled_32.png b/res/drawable-xhdpi/ic_create_album_filled_32.png
deleted file mode 100644
index 142ba5ccf..000000000
Binary files a/res/drawable-xhdpi/ic_create_album_filled_32.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_file_download_white_36dp.png b/res/drawable-xhdpi/ic_file_download_white_36dp.png
deleted file mode 100644
index d508aa948..000000000
Binary files a/res/drawable-xhdpi/ic_file_download_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_info_white_18dp.png b/res/drawable-xhdpi/ic_info_white_18dp.png
deleted file mode 100644
index 00f53edce..000000000
Binary files a/res/drawable-xhdpi/ic_info_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_mood_grey600_24dp.png b/res/drawable-xhdpi/ic_mood_grey600_24dp.png
deleted file mode 100644
index bfb47ecb9..000000000
Binary files a/res/drawable-xhdpi/ic_mood_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_mood_white_24dp.png b/res/drawable-xhdpi/ic_mood_white_24dp.png
deleted file mode 100644
index 75115cb79..000000000
Binary files a/res/drawable-xhdpi/ic_mood_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_restore_white_24dp.png b/res/drawable-xhdpi/ic_restore_white_24dp.png
deleted file mode 100644
index 235e253e6..000000000
Binary files a/res/drawable-xhdpi/ic_restore_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_scribble_save.png b/res/drawable-xhdpi/ic_scribble_save.png
deleted file mode 100644
index bbdcc4c89..000000000
Binary files a/res/drawable-xhdpi/ic_scribble_save.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_textsms_white_48dp.png b/res/drawable-xhdpi/ic_textsms_white_48dp.png
deleted file mode 100644
index 4f23ef581..000000000
Binary files a/res/drawable-xhdpi/ic_textsms_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_x_circle.png b/res/drawable-xhdpi/ic_x_circle.png
deleted file mode 100644
index 9c62d4cff..000000000
Binary files a/res/drawable-xhdpi/ic_x_circle.png and /dev/null differ
diff --git a/res/drawable-xhdpi/icon_lock.png b/res/drawable-xhdpi/icon_lock.png
deleted file mode 100644
index 2da9c339c..000000000
Binary files a/res/drawable-xhdpi/icon_lock.png and /dev/null differ
diff --git a/res/drawable-xhdpi/quick_camera_exit_fullscreen.png b/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
deleted file mode 100755
index fbb53e5c6..000000000
Binary files a/res/drawable-xhdpi/quick_camera_exit_fullscreen.png and /dev/null differ
diff --git a/res/drawable-xhdpi/quick_camera_fullscreen.png b/res/drawable-xhdpi/quick_camera_fullscreen.png
deleted file mode 100755
index 5709dd8be..000000000
Binary files a/res/drawable-xhdpi/quick_camera_fullscreen.png and /dev/null differ
diff --git a/res/drawable-xhdpi/quick_camera_hide.png b/res/drawable-xhdpi/quick_camera_hide.png
deleted file mode 100755
index f00aa8bd4..000000000
Binary files a/res/drawable-xhdpi/quick_camera_hide.png and /dev/null differ
diff --git a/res/drawable-xhdpi/quick_shutter_button.png b/res/drawable-xhdpi/quick_shutter_button.png
deleted file mode 100755
index 9324ec8cb..000000000
Binary files a/res/drawable-xhdpi/quick_shutter_button.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_name.png b/res/drawable-xxhdpi/ic_action_name.png
deleted file mode 100644
index c60efa5ac..000000000
Binary files a/res/drawable-xxhdpi/ic_action_name.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_add_caption_36.png b/res/drawable-xxhdpi/ic_add_caption_36.png
deleted file mode 100644
index 1136f4a20..000000000
Binary files a/res/drawable-xxhdpi/ic_add_caption_36.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_add_photo.png b/res/drawable-xxhdpi/ic_add_photo.png
deleted file mode 100644
index 791d9fb7e..000000000
Binary files a/res/drawable-xxhdpi/ic_add_photo.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_create_album_filled_32.png b/res/drawable-xxhdpi/ic_create_album_filled_32.png
deleted file mode 100644
index 5aef02de3..000000000
Binary files a/res/drawable-xxhdpi/ic_create_album_filled_32.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_file_download_white_36dp.png b/res/drawable-xxhdpi/ic_file_download_white_36dp.png
deleted file mode 100644
index 30b762d70..000000000
Binary files a/res/drawable-xxhdpi/ic_file_download_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_info_white_18dp.png b/res/drawable-xxhdpi/ic_info_white_18dp.png
deleted file mode 100644
index a5062dd03..000000000
Binary files a/res/drawable-xxhdpi/ic_info_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_mood_grey600_24dp.png b/res/drawable-xxhdpi/ic_mood_grey600_24dp.png
deleted file mode 100644
index cce3d5797..000000000
Binary files a/res/drawable-xxhdpi/ic_mood_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_mood_white_24dp.png b/res/drawable-xxhdpi/ic_mood_white_24dp.png
deleted file mode 100644
index 30b902532..000000000
Binary files a/res/drawable-xxhdpi/ic_mood_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_restore_white_24dp.png b/res/drawable-xxhdpi/ic_restore_white_24dp.png
deleted file mode 100644
index 8008fa640..000000000
Binary files a/res/drawable-xxhdpi/ic_restore_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_scribble_save.png b/res/drawable-xxhdpi/ic_scribble_save.png
deleted file mode 100644
index dba7db425..000000000
Binary files a/res/drawable-xxhdpi/ic_scribble_save.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_textsms_white_48dp.png b/res/drawable-xxhdpi/ic_textsms_white_48dp.png
deleted file mode 100644
index 4c240ba64..000000000
Binary files a/res/drawable-xxhdpi/ic_textsms_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_x_circle.png b/res/drawable-xxhdpi/ic_x_circle.png
deleted file mode 100644
index 7e13ad600..000000000
Binary files a/res/drawable-xxhdpi/ic_x_circle.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png b/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
deleted file mode 100755
index d041734c1..000000000
Binary files a/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/quick_camera_fullscreen.png b/res/drawable-xxhdpi/quick_camera_fullscreen.png
deleted file mode 100755
index ce96d83e3..000000000
Binary files a/res/drawable-xxhdpi/quick_camera_fullscreen.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/quick_camera_hide.png b/res/drawable-xxhdpi/quick_camera_hide.png
deleted file mode 100755
index 16094f9bc..000000000
Binary files a/res/drawable-xxhdpi/quick_camera_hide.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/quick_shutter_button.png b/res/drawable-xxhdpi/quick_shutter_button.png
deleted file mode 100755
index 439434938..000000000
Binary files a/res/drawable-xxhdpi/quick_shutter_button.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_add_caption_36.png b/res/drawable-xxxhdpi/ic_add_caption_36.png
deleted file mode 100644
index 89052339c..000000000
Binary files a/res/drawable-xxxhdpi/ic_add_caption_36.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_add_photo.png b/res/drawable-xxxhdpi/ic_add_photo.png
deleted file mode 100644
index de0ab056e..000000000
Binary files a/res/drawable-xxxhdpi/ic_add_photo.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_create_album_filled_32.png b/res/drawable-xxxhdpi/ic_create_album_filled_32.png
deleted file mode 100644
index 743184120..000000000
Binary files a/res/drawable-xxxhdpi/ic_create_album_filled_32.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_file_download_white_36dp.png b/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
deleted file mode 100644
index e261f9a87..000000000
Binary files a/res/drawable-xxxhdpi/ic_file_download_white_36dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_info_white_18dp.png b/res/drawable-xxxhdpi/ic_info_white_18dp.png
deleted file mode 100644
index 0db142917..000000000
Binary files a/res/drawable-xxxhdpi/ic_info_white_18dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_restore_white_24dp.png b/res/drawable-xxxhdpi/ic_restore_white_24dp.png
deleted file mode 100644
index baccc4fc9..000000000
Binary files a/res/drawable-xxxhdpi/ic_restore_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_scribble_save.png b/res/drawable-xxxhdpi/ic_scribble_save.png
deleted file mode 100644
index 265a7acc4..000000000
Binary files a/res/drawable-xxxhdpi/ic_scribble_save.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_textsms_white_48dp.png b/res/drawable-xxxhdpi/ic_textsms_white_48dp.png
deleted file mode 100644
index 10fc897b2..000000000
Binary files a/res/drawable-xxxhdpi/ic_textsms_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_x_circle.png b/res/drawable-xxxhdpi/ic_x_circle.png
deleted file mode 100644
index cdfaa67ea..000000000
Binary files a/res/drawable-xxxhdpi/ic_x_circle.png and /dev/null differ
diff --git a/res/drawable/ic_emoji_outline_keyboard.xml b/res/drawable/ic_emoji_outline_keyboard.xml
deleted file mode 100644
index 943277e7a..000000000
--- a/res/drawable/ic_emoji_outline_keyboard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <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"/>
-</vector>
diff --git a/res/drawable/ic_sticker_outline_keyboard.xml b/res/drawable/ic_sticker_outline_keyboard.xml
deleted file mode 100644
index d2f6e5bb0..000000000
--- a/res/drawable/ic_sticker_outline_keyboard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <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"/>
-</vector>
diff --git a/res/drawable/notify_panel_notification_icon_bg_tile.xml b/res/drawable/notify_panel_notification_icon_bg_tile.xml
deleted file mode 100644
index 57c4b085b..000000000
--- a/res/drawable/notify_panel_notification_icon_bg_tile.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tileMode="repeat"
-    android:src="@drawable/notify_panel_notification_icon_bg"
-    />
diff --git a/res/drawable/quick_camera_shutter_ring.xml b/res/drawable/quick_camera_shutter_ring.xml
deleted file mode 100644
index 582a575ae..000000000
--- a/res/drawable/quick_camera_shutter_ring.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:innerRadiusRatio="3"
-               android:shape="ring"
-               android:thickness="2dp"
-               android:useLevel="false">
-            <solid android:color="@android:color/white" />
-            <size android:height="@dimen/quick_camera_shutter_ring_size" android:width="@dimen/quick_camera_shutter_ring_size" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:innerRadiusRatio="3"
-               android:shape="ring"
-               android:thickness="2dp"
-               android:useLevel="false" >
-            <solid android:color="#40ffffff" />
-            <size android:height="@dimen/quick_camera_shutter_ring_size" android:width="@dimen/quick_camera_shutter_ring_size" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/res/layout/camera_activity.xml b/res/layout/camera_activity.xml
deleted file mode 100644
index b50ffc517..000000000
--- a/res/layout/camera_activity.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/core_black">
-
-    <ImageView
-        android:id="@+id/camera_snapshot"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerInside"
-        tools:src="@color/grey_800"/>
-
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/key_caching_notification.xml b/res/layout/key_caching_notification.xml
deleted file mode 100644
index 6bae90dde..000000000
--- a/res/layout/key_caching_notification.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_alignParentStart="true"
-                  android:layout_centerVertical="true"
-                  android:orientation="vertical"
-                  android:layout_marginStart="10dip">
-	<TextView android:id="@+id/title"
-        android:textAppearance="@style/NotificationTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:text="@string/KeyCachingService_passphrase_cached"
-        />
-
-   <TextView android:id="@+id/text2"
-        android:textAppearance="@style/NotificationText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="-2dp"
-        android:singleLine="true"
-        android:fadingEdge="horizontal"
-        android:ellipsize="marquee"
-        android:text="@string/KeyCachingService_signal_passphrase_cached_with_lock"
-        />
-    </LinearLayout>
-    
-	<ImageView android:id="@+id/lock_cache_icon"
-        android:src="@drawable/icon_lock"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:background="@drawable/notify_panel_notification_icon_bg_tile"
-        android:scaleType="center" 
-        android:layout_alignParentEnd="true"
-        />
-	    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/quick_attachment_drawer.xml b/res/layout/quick_attachment_drawer.xml
deleted file mode 100644
index 62ec6213a..000000000
--- a/res/layout/quick_attachment_drawer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <org.thoughtcrime.securesms.components.camera.CameraView
-        android:id="@+id/quick_camera"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible" />
-
-</merge>
\ No newline at end of file
diff --git a/res/layout/quick_camera_controls.xml b/res/layout/quick_camera_controls.xml
deleted file mode 100644
index 6010107c1..000000000
--- a/res/layout/quick_camera_controls.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/controls"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom"
-                tools:background="@android:color/darker_gray">
-
-    <ImageButton android:id="@+id/shutter_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentBottom="true"
-                 android:layout_centerHorizontal="true"
-                 android:background="@drawable/quick_camera_shutter_ring"
-                 android:src="@drawable/quick_shutter_button"
-                 android:enabled="false"
-                 android:padding="20dp"/>
-
-    <ImageButton android:id="@+id/fullscreen_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentBottom="true"
-                 android:layout_alignParentEnd="true"
-                 android:background="@drawable/circle_touch_highlight_background"
-                 android:src="@drawable/quick_camera_fullscreen"
-                 android:padding="20dp" />
-
-    <ImageButton android:id="@+id/swap_camera_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentBottom="true"
-                 android:layout_alignParentStart="true"
-                 android:background="@drawable/circle_touch_highlight_background"
-                 android:src="@drawable/quick_camera_rear"
-                 android:enabled="false"
-                 android:padding="20dp"
-                 android:visibility="invisible"
-                 tools:visibility="visible" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/quick_camera_controls_land.xml b/res/layout/quick_camera_controls_land.xml
deleted file mode 100644
index cc0c684ea..000000000
--- a/res/layout/quick_camera_controls_land.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/controls"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom"
-                tools:background="@android:color/darker_gray">
-
-    <ImageButton android:id="@+id/shutter_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentEnd="true"
-                 android:layout_centerVertical="true"
-                 android:background="@drawable/quick_camera_shutter_ring"
-                 android:src="@drawable/quick_shutter_button"
-                 android:enabled="false"
-                 android:padding="20dp"/>
-
-    <ImageButton android:id="@+id/fullscreen_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentBottom="true"
-                 android:layout_alignParentEnd="true"
-                 android:background="@drawable/circle_touch_highlight_background"
-                 android:src="@drawable/quick_camera_fullscreen"
-                 android:padding="20dp"/>
-
-    <ImageButton android:id="@+id/swap_camera_button"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_alignParentTop="true"
-                 android:layout_alignParentEnd="true"
-                 android:background="@drawable/circle_touch_highlight_background"
-                 android:src="@drawable/quick_camera_rear"
-                 android:enabled="false"
-                 android:padding="20dp"
-                 android:visibility="invisible"
-                 tools:visibility="visible"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0ddbef44e..3d17db691 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -5,10 +5,6 @@
     <dimen name="default_custom_keyboard_size">220dp</dimen>
     <dimen name="min_custom_keyboard_size">110dp</dimen>
     <dimen name="min_custom_keyboard_top_margin_portrait">170dp</dimen>
-    <dimen name="min_custom_keyboard_top_margin_landscape">50dp</dimen>
-    <dimen name="emoji_drawer_item_padding">5dp</dimen>
-    <dimen name="emoji_drawer_indicator_height">1.5dp</dimen>
-    <dimen name="emoji_drawer_left_right_padding">5dp</dimen>
     <dimen name="emoji_drawer_item_width">48dp</dimen>
     <dimen name="conversation_item_body_text_size">16sp</dimen>
     <dimen name="conversation_item_date_text_size">12sp</dimen>
@@ -74,8 +70,6 @@
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
 
-    <dimen name="quick_camera_shutter_ring_size">52dp</dimen>
-
     <dimen name="sticker_page_item_padding">8dp</dimen>
     <dimen name="sticker_page_item_divisor">88dp</dimen>
     <dimen name="sticker_page_item_multiplier">8dp</dimen>
@@ -85,8 +79,6 @@
 
     <dimen name="tooltip_popup_margin">8dp</dimen>
 
-    <dimen name="transfer_controls_expanded_width">150dp</dimen>
-    <dimen name="transfer_controls_contracted_width">70dp</dimen>
     <dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
     <dimen name="contact_selection_actions_tap_area">10dp</dimen>
 
@@ -107,8 +99,6 @@
     <dimen name="onboarding_title_size">34sp</dimen>
     <dimen name="onboarding_subtitle_size">20sp</dimen>
 
-    <dimen name="scribble_stroke_size">2dp</dimen>
-
     <dimen name="floating_action_button_margin">16dp</dimen>
 
     <dimen name="alertview_small_icon_size">14dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a9aaf9d78..57adeda4c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -97,15 +97,6 @@
         <item name="android:textColor">#BFffffff</item>
     </style>
 
-    <style name="NotificationText">
-      <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="NotificationTitle">
-      <item name="android:textColor">?android:attr/textColorPrimary</item>
-      <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="Registration.Description" parent="@android:style/TextAppearance">
         <item name="android:textSize">16.0sp</item>
         <item name="android:typeface">sans</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b4b84f3b3..393998271 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -481,9 +481,6 @@
         <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
     </style>
 
-    <style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
-    </style>
-
     <style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
         <item name="android:background">@color/core_grey_95</item>
     </style>