diff --git a/app/src/main/res/drawable-hdpi/ic_photo_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_photo_black_24dp.png
new file mode 100644
index 000000000..52c788746
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_photo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_photo_camera_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_photo_camera_black_24dp.png
new file mode 100644
index 000000000..e9ed26d6e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_photo_camera_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_save_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_save_black_24dp.png
new file mode 100644
index 000000000..b959dc4a8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_save_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..7be098fde
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_undo_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..10deccffa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_undo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-ldrtl-hdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..e65515d62
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-ldrtl-mdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..d65d82294
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..3a25fbb86
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..89afc01b5
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..def070fd7
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_photo_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_photo_black_24dp.png
new file mode 100644
index 000000000..377ce1331
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_photo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_photo_camera_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_photo_camera_black_24dp.png
new file mode 100644
index 000000000..2ce3c5b7c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_photo_camera_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_save_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_save_black_24dp.png
new file mode 100644
index 000000000..663479b73
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_save_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..83156aa38
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_undo_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..a0e2b681b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_undo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_photo_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_photo_black_24dp.png
new file mode 100644
index 000000000..6b7cd7838
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_photo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_photo_camera_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_photo_camera_black_24dp.png
new file mode 100644
index 000000000..d83d658d0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_photo_camera_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_save_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_save_black_24dp.png
new file mode 100644
index 000000000..eca2d92ec
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_save_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..fd36be8b9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_undo_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..3d2340925
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_undo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_photo_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_photo_black_24dp.png
new file mode 100644
index 000000000..7297bd5d2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_photo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_photo_camera_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_photo_camera_black_24dp.png
new file mode 100644
index 000000000..6125fa2b7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_photo_camera_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png
new file mode 100644
index 000000000..871291b4e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_save_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..40b74ebc1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_undo_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..818191c0f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_undo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_photo_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_photo_black_24dp.png
new file mode 100644
index 000000000..ebe206ff7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_photo_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_black_24dp.png
new file mode 100644
index 000000000..6df33edd6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png
new file mode 100644
index 000000000..ba001835a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_save_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png
new file mode 100644
index 000000000..761929f43
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_undo_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_undo_black_24dp.png
new file mode 100644
index 000000000..9ca7eb73e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_undo_black_24dp.png differ
diff --git a/app/src/main/res/menu/activity_share.xml b/app/src/main/res/menu/activity_share.xml
index 67b23a77e..076caf775 100644
--- a/app/src/main/res/menu/activity_share.xml
+++ b/app/src/main/res/menu/activity_share.xml
@@ -2,7 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_upload_single"
         android:title="@string/menu_upload_single"
-        android:icon="@drawable/ic_send_white_24dp"
+        android:icon="?attr/iconSend"
         android:enabled="false"
         app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/fragment_categorization.xml b/app/src/main/res/menu/fragment_categorization.xml
index de0a87f8c..0b941eb28 100644
--- a/app/src/main/res/menu/fragment_categorization.xml
+++ b/app/src/main/res/menu/fragment_categorization.xml
@@ -4,6 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_save_categories"
           android:title="@string/menu_save_categories"
-          android:icon="@drawable/ic_save_white_24dp"
+          android:icon="?attr/iconSave"
           app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/fragment_contributions_list.xml b/app/src/main/res/menu/fragment_contributions_list.xml
index 5e40c83ac..404857ef3 100644
--- a/app/src/main/res/menu/fragment_contributions_list.xml
+++ b/app/src/main/res/menu/fragment_contributions_list.xml
@@ -4,13 +4,13 @@
           android:title="@string/menu_from_camera"
           android:orderInCategory="100"
           app:showAsAction="ifRoom|withText"
-          android:icon="@drawable/ic_photo_camera_white_24dp"
+          android:icon="?attr/iconCamera"
             />
     <item android:id="@+id/menu_from_gallery"
         android:title="@string/menu_from_gallery"
         android:orderInCategory="200"
         app:showAsAction="ifRoom|withText"
-        android:icon="@drawable/ic_photo_white_24dp"
+        android:icon="?attr/iconPhoto"
             />
     <item android:id="@+id/menu_settings"
           android:title="@string/menu_settings"
diff --git a/app/src/main/res/menu/fragment_image_detail.xml b/app/src/main/res/menu/fragment_image_detail.xml
index e864dddb2..5b3f3e6a9 100644
--- a/app/src/main/res/menu/fragment_image_detail.xml
+++ b/app/src/main/res/menu/fragment_image_detail.xml
@@ -18,7 +18,7 @@
     <item
         android:id="@+id/menu_retry_current_image"
         android:enabled="false"
-        android:icon="@drawable/ic_undo_white_24dp"
+        android:icon="?attr/iconUndo"
         android:title="@string/menu_retry_upload"
         android:visible="false"
         app:showAsAction="ifRoom|withText" />
diff --git a/app/src/main/res/menu/fragment_multiple_upload_list.xml b/app/src/main/res/menu/fragment_multiple_upload_list.xml
index 77b93e5c9..288d55332 100644
--- a/app/src/main/res/menu/fragment_multiple_upload_list.xml
+++ b/app/src/main/res/menu/fragment_multiple_upload_list.xml
@@ -6,6 +6,6 @@
     <item android:id="@+id/menu_upload_multiple"
           android:title="@string/share_upload_button"
           app:showAsAction="always|withText"
-          android:icon="@drawable/ic_send_white_24dp"
+        android:icon="?attr/iconSend"
         />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index daf787222..cff8a426f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,4 +8,9 @@
     <attr name="buttonBackground" format="reference"/>
     <attr name="uploadOverlayBackground" format="reference"/>
     <attr name="toggleButtonIcon" format="reference"/>
+    <attr name="iconSend" format="reference"/>
+    <attr name="iconSave" format="reference"/>
+    <attr name="iconCamera" format="reference"/>
+    <attr name="iconPhoto" format="reference"/>
+    <attr name="iconUndo" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1484ae59c..d3e392d99 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,7 +9,11 @@
         <item name="buttonBackground">@color/button_background_dark</item>
         <item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item>
         <item name="toggleButtonIcon">@drawable/toggle_inverse</item>
-
+        <item name="iconSend">@drawable/ic_send_white_24dp</item>
+        <item name="iconSave">@drawable/ic_save_white_24dp</item>
+        <item name="iconCamera">@drawable/ic_photo_camera_white_24dp</item>
+        <item name="iconPhoto">@drawable/ic_photo_white_24dp</item>
+        <item name="iconUndo">@drawable/ic_undo_white_24dp</item>
     </style>
 
     <style name="LightAppTheme" parent="Theme.AppCompat.Light">
@@ -21,6 +25,11 @@
         <item name="buttonBackground">@color/button_background_light</item>
         <item name="uploadOverlayBackground">@color/upload_overlay_background_light</item>
         <item name="toggleButtonIcon">@drawable/toggle</item>
+        <item name="iconSend">@drawable/ic_send_black_24dp</item>
+        <item name="iconSave">@drawable/ic_save_black_24dp</item>
+        <item name="iconCamera">@drawable/ic_photo_camera_black_24dp</item>
+        <item name="iconPhoto">@drawable/ic_photo_black_24dp</item>
+        <item name="iconUndo">@drawable/ic_undo_black_24dp</item>
     </style>
 
     <style name="NoTitle" parent="DarkAppTheme">