diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index 49023c8aa..f24735642 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -7,9 +7,8 @@ python copy OpenKeychain navigation white check 24
 python copy OpenKeychain navigation black expand_less 24
 python copy OpenKeychain navigation black expand_more 24
 python copy OpenKeychain navigation white refresh 24
-python copy OpenKeychain action white swap_vert 24
-python copy OpenKeychain action white swap_vert_circle 24
-python copy OpenKeychain action grey swap_vert 24
+python copy OpenKeychain av white repeat 24
+python copy OpenKeychain av grey repeat 24
 python copy OpenKeychain editor white mode_edit 24
 
 # navigation drawer sections
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index df586c11c..4e8a14008 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -676,7 +676,7 @@ public class ViewKeyActivity extends BaseActivity implements
                         mActionVerify.setVisibility(View.GONE);
                         mActionEdit.setVisibility(View.VISIBLE);
                         mFab.setVisibility(View.VISIBLE);
-                        mFab.setIconDrawable(getResources().getDrawable(R.drawable.ic_swap_vert_white_24dp));
+                        mFab.setIconDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp));
                     } else {
                         mActionEncryptFile.setVisibility(View.VISIBLE);
                         mActionEncryptText.setVisibility(View.VISIBLE);
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..48d6ce93a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..612e73458
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index ddd8bb736..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 961aedecc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 705a4cc70..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..60aa53747
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..8a2b641ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index efa97b3af..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index f7faa5cf4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 5f6e11bc8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..3d0e27547
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..729220066
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index 677b7267c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 22ff0c308..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index fb82f4208..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..6a8906126
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..63f8de50f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index 74557d202..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 3edec452e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index c34970372..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..bf33f287b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..f3c284330
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index c43cc4325..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 3dea0d014..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 06b27ea19..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 9f9cf4eca..27444a260 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:src="@drawable/ic_swap_vert_grey_24dp"
+            android:src="@drawable/ic_repeat_grey_24dp"
             android:padding="12dp"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index ff5fa6d94..bafad173b 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -69,7 +69,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:padding="8dp"
-                    android:src="@drawable/ic_swap_vert_grey_24dp"
+                    android:src="@drawable/ic_repeat_grey_24dp"
                     android:layout_gravity="center_vertical" />
 
             </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 782091f16..cd8f96e6f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -135,7 +135,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_swap_vert_grey_24dp"
+                android:src="@drawable/ic_repeat_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />