diff --git a/res/drawable-hdpi/ic_add_authentication.png b/res/drawable-hdpi/ic_add_authentication.png
deleted file mode 100644
index f3fde9772..000000000
Binary files a/res/drawable-hdpi/ic_add_authentication.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_clear_authentication.png b/res/drawable-hdpi/ic_clear_authentication.png
deleted file mode 100644
index 800eca40e..000000000
Binary files a/res/drawable-hdpi/ic_clear_authentication.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_setup_add_authentication.png b/res/drawable-hdpi/ic_setup_add_authentication.png
new file mode 100644
index 000000000..0a6d8792f
Binary files /dev/null and b/res/drawable-hdpi/ic_setup_add_authentication.png differ
diff --git a/res/drawable-mdpi/ic_setup_add_authentication.png b/res/drawable-mdpi/ic_setup_add_authentication.png
new file mode 100644
index 000000000..f0eedd158
Binary files /dev/null and b/res/drawable-mdpi/ic_setup_add_authentication.png differ
diff --git a/res/drawable-xhdpi/ic_setup_add_authentication.png b/res/drawable-xhdpi/ic_setup_add_authentication.png
new file mode 100644
index 000000000..f82bfe59f
Binary files /dev/null and b/res/drawable-xhdpi/ic_setup_add_authentication.png differ
diff --git a/res/drawable-xhdpi/ic_setup_delete.png b/res/drawable-xhdpi/ic_setup_delete.png
new file mode 100644
index 000000000..12a2cf7c9
Binary files /dev/null and b/res/drawable-xhdpi/ic_setup_delete.png differ
diff --git a/res/drawable-xxhdpi/ic_setup_add_authentication.png b/res/drawable-xxhdpi/ic_setup_add_authentication.png
new file mode 100644
index 000000000..a027b3c76
Binary files /dev/null and b/res/drawable-xxhdpi/ic_setup_add_authentication.png differ
diff --git a/res/drawable-xxhdpi/ic_setup_delete.png b/res/drawable-xxhdpi/ic_setup_delete.png
new file mode 100644
index 000000000..06cc8f3f5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_setup_delete.png differ
diff --git a/res/layout/authentication_view.xml b/res/layout/authentication_view.xml
index 13adceeaf..a77f322a0 100644
--- a/res/layout/authentication_view.xml
+++ b/res/layout/authentication_view.xml
@@ -46,8 +46,9 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_alignParentLeft="true"
+                android:paddingRight="16dip"
                 android:clickable="true"
-                android:src="@drawable/ic_add_authentication"
+                android:src="@drawable/ic_setup_add_authentication"
                 android:layout_centerVertical="true" />
 
             <TextView
@@ -95,7 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_alignParentRight="true"
                 android:clickable="true"
-                android:src="@drawable/ic_clear_authentication"
+                android:src="@drawable/ic_setup_delete"
                 android:layout_centerVertical="true" />
         </RelativeLayout>
 
@@ -121,7 +122,7 @@
                 android:layout_width="wrap_content"
                 android:layout_alignParentRight="true"
                 android:clickable="true"
-                android:src="@drawable/ic_clear_authentication"
+                android:src="@drawable/ic_setup_delete"
                 android:layout_centerVertical="true" />
         </RelativeLayout>