diff --git a/res/drawable-hdpi/ic_action_copy_dark.png b/res/drawable-hdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..72c6bc6e2
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_copy_light.png b/res/drawable-hdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..623b71504
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_dark.png b/res/drawable-hdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-hdpi/ic_action_move_dark.png
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_light.png b/res/drawable-hdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_move_or_copy_light.png
rename to res/drawable-hdpi/ic_action_move_light.png
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_dark.png b/res/drawable-ldpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_move_or_copy_dark.png
rename to res/drawable-ldpi/ic_action_move_dark.png
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_light.png b/res/drawable-ldpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_move_or_copy_light.png
rename to res/drawable-ldpi/ic_action_move_light.png
diff --git a/res/drawable-mdpi/ic_action_copy_dark.png b/res/drawable-mdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..d93968e5b
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_copy_light.png b/res/drawable-mdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..efb2445f0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_dark.png b/res/drawable-mdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-mdpi/ic_action_move_dark.png
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_light.png b/res/drawable-mdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_move_or_copy_light.png
rename to res/drawable-mdpi/ic_action_move_light.png
diff --git a/res/drawable-xhdpi/ic_action_copy_dark.png b/res/drawable-xhdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..04e290d8b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_copy_light.png b/res/drawable-xhdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..00bff33c7
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_dark.png b/res/drawable-xhdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-xhdpi/ic_action_move_dark.png
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_light.png b/res/drawable-xhdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_move_or_copy_light.png
rename to res/drawable-xhdpi/ic_action_move_light.png
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 89c1007aa..33b12b594 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -28,11 +28,12 @@
         android:id="@+id/move"
         android:title="@string/move_action"
         android:showAsAction="ifRoom"
-        android:icon="?attr/iconActionMoveOrCopy"
+        android:icon="?attr/iconActionMove"
     />
     <item
         android:id="@+id/copy"
         android:title="@string/copy_action"
+        android:icon="?attr/iconActionCopy"
     />
     <item
         android:id="@+id/flag"
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index ab758f372..cf5aff30b 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -71,13 +71,13 @@
     <!-- MessageView -->
     <item
         android:id="@+id/move"
-        android:icon="?attr/iconActionMoveOrCopy"
+        android:icon="?attr/iconActionMove"
         android:showAsAction="ifRoom"
         android:title="@string/move_action"/>
     <!-- MessageView -->
     <item
         android:id="@+id/copy"
-        android:icon="?attr/iconActionMoveOrCopy"
+        android:icon="?attr/iconActionCopy"
         android:showAsAction="ifRoom"
         android:title="@string/copy_action"/>
 
@@ -126,13 +126,14 @@
             <!-- MessageView -->
             <item
                 android:id="@+id/move"
-                android:icon="?attr/iconActionMoveOrCopy"
+                android:icon="?attr/iconActionMove"
                 android:showAsAction="ifRoom"
                 android:title="@string/move_action"/>
 
             <!-- MessageView -->
             <item
                 android:id="@+id/copy"
+                android:icon="?attr/iconActionCopy"
                 android:title="@string/copy_action"/>
         </menu>
     </item>
@@ -228,7 +229,7 @@
         android:id="@+id/toggle_message_view_theme"
         android:showAsAction="never"
         android:title="@string/message_view_theme_action_dark"/>
-    <item 
+    <item
         android:id="@+id/show_folder_list"
         android:showAsAction="never"
         android:title="@string/folders_title" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9858a5ddc..dc108fa98 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -10,7 +10,8 @@
         <attr name="iconActionArchive" format="reference" />
         <attr name="iconActionCompose" format="reference" />
         <attr name="iconActionDelete" format="reference" />
-        <attr name="iconActionMoveOrCopy" format="reference" />
+        <attr name="iconActionMove" format="reference" />
+        <attr name="iconActionCopy" format="reference" />
         <attr name="iconActionNextMessage" format="reference" />
         <attr name="iconActionPreviousMessage" format="reference" />
         <attr name="iconActionRefresh" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 017c3eb0c..a8bbb9a66 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -12,7 +12,8 @@
         <item name="iconActionArchive">@drawable/ic_action_archive_light</item>
         <item name="iconActionCompose">@drawable/ic_action_compose_light</item>
         <item name="iconActionDelete">@drawable/ic_action_delete_light</item>
-        <item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_light</item>
+        <item name="iconActionMove">@drawable/ic_action_move_light</item>
+        <item name="iconActionCopy">@drawable/ic_action_copy_light</item>
         <item name="iconActionNextMessage">@drawable/ic_action_next_message_light</item>
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
@@ -63,7 +64,8 @@
         <item name="iconActionArchive">@drawable/ic_action_archive_dark</item>
         <item name="iconActionCompose">@drawable/ic_action_compose_dark</item>
         <item name="iconActionDelete">@drawable/ic_action_delete_dark</item>
-        <item name="iconActionMoveOrCopy">@drawable/ic_action_move_or_copy_dark</item>
+        <item name="iconActionMove">@drawable/ic_action_move_dark</item>
+        <item name="iconActionCopy">@drawable/ic_action_copy_dark</item>
         <item name="iconActionNextMessage">@drawable/ic_action_next_message_dark</item>
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>