diff --git a/app/src/main/res/drawable-hdpi/ic_photo_camera_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_photo_camera_white_24dp.png
new file mode 100644
index 0000000000..497c88ca82
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_photo_camera_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_photo_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_photo_white_24dp.png
new file mode 100644
index 0000000000..b414cf5b68
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_photo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000000..dd3f106646
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..0f00172014
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_undo_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_undo_white_24dp.png
new file mode 100644
index 0000000000..eb7522cdb1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_undo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/social_send_now.png b/app/src/main/res/drawable-hdpi/social_send_now.png
deleted file mode 100644
index 75e18b1500..0000000000
Binary files a/app/src/main/res/drawable-hdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-ldrtl-hdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..0cc14e7541
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-hdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png
deleted file mode 100644
index 5103c40ad8..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-ldrtl-mdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..d5fe50b368
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-mdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png
deleted file mode 100644
index 54af2099c6..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..4735a7d711
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png
deleted file mode 100644
index 4ec1523fe5..0000000000
Binary files a/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..9f64e5b389
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..76d135b90f
Binary files /dev/null and b/app/src/main/res/drawable-ldrtl-xxxhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_photo_camera_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_photo_camera_white_24dp.png
new file mode 100644
index 0000000000..e830522008
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_photo_camera_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_photo_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_photo_white_24dp.png
new file mode 100644
index 0000000000..d474bd577d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_photo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000000..015062ed3b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..048d3eb29d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_undo_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_undo_white_24dp.png
new file mode 100644
index 0000000000..294b575784
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_undo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/social_send_now.png b/app/src/main/res/drawable-mdpi/social_send_now.png
deleted file mode 100644
index 382fdd4849..0000000000
Binary files a/app/src/main/res/drawable-mdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_photo_camera_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_photo_camera_white_24dp.png
new file mode 100644
index 0000000000..be9fb226a5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_photo_camera_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_photo_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_photo_white_24dp.png
new file mode 100644
index 0000000000..2642b9e09e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_photo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000000..adda095754
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..ef59e77678
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_undo_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_undo_white_24dp.png
new file mode 100644
index 0000000000..c4c28d0a4a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_undo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/social_send_now.png b/app/src/main/res/drawable-xhdpi/social_send_now.png
deleted file mode 100644
index bd37dc596a..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/social_send_now.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_photo_camera_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_photo_camera_white_24dp.png
new file mode 100644
index 0000000000..c8e69dcebb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_photo_camera_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_photo_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_photo_white_24dp.png
new file mode 100644
index 0000000000..f9f1defa6d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_photo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000000..3e0ce1a5f0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..1bc7552a96
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_undo_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_undo_white_24dp.png
new file mode 100644
index 0000000000..1e1e3d8661
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_undo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_24dp.png
new file mode 100644
index 0000000000..777658e955
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_photo_camera_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_photo_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_photo_white_24dp.png
new file mode 100644
index 0000000000..2ffdb55f26
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_photo_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png
new file mode 100644
index 0000000000..bd80bf1f74
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_save_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png
new file mode 100644
index 0000000000..6aeaa850b0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_undo_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_undo_white_24dp.png
new file mode 100644
index 0000000000..6b10718b9a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_undo_white_24dp.png differ
diff --git a/app/src/main/res/menu/activity_share.xml b/app/src/main/res/menu/activity_share.xml
index f9a2bced5b..67b23a77e9 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/social_send_now"
+        android:icon="@drawable/ic_send_white_24dp"
         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 b3d8cce163..de0a87f8c2 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="@android:drawable/ic_menu_save"
+          android:icon="@drawable/ic_save_white_24dp"
           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 06c39006c4..20b11943a9 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="@android:drawable/ic_menu_camera"
+          android:icon="@drawable/ic_photo_camera_white_24dp"
             />
     <item android:id="@+id/menu_from_gallery"
         android:title="@string/menu_from_gallery"
         android:orderInCategory="200"
         app:showAsAction="ifRoom|withText"
-        android:icon="@android:drawable/ic_menu_gallery"
+        android:icon="@drawable/ic_photo_white_24dp"
             />
     <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 2d0d2a2997..e864dddb25 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="@android:drawable/ic_menu_revert"
+        android:icon="@drawable/ic_undo_white_24dp"
         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 82d8fb815c..77b93e5c9f 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="@android:drawable/ic_menu_send"
+          android:icon="@drawable/ic_send_white_24dp"
         />
 </menu>
\ No newline at end of file