diff --git a/res/layout-w600dp/authentication_view.xml b/res/layout-w600dp/authentication_view.xml
index 03be41078..d505b5cd9 100644
--- a/res/layout-w600dp/authentication_view.xml
+++ b/res/layout-w600dp/authentication_view.xml
@@ -23,21 +23,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
-            android:paddingRight="16dip"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>
diff --git a/res/layout/authentication_view.xml b/res/layout/authentication_view.xml
index e3be57d36..cd8695065 100644
--- a/res/layout/authentication_view.xml
+++ b/res/layout/authentication_view.xml
@@ -32,21 +32,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <ImageView
-            android:id="@+id/add_authentication"
-            android:contentDescription="@string/add_authentication_label"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:clickable="true"
-            android:paddingRight="16dip"
-            android:src="@drawable/ic_setup_add_authentication"/>
-
         <TextView
-            android:id="@+id/add_authentication_label"
+            android:id="@+id/add_authentication"
             android:text="@string/add_authentication_label"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_weight="1"
+            android:padding="16dip"
+            android:drawablePadding="16dip"
+            android:drawableStart="@drawable/ic_setup_add_authentication"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorPrimary"/>
     </LinearLayout>