diff --git a/OpenKeychain/src/main/res/layout/api_display_transfer_code.xml b/OpenKeychain/src/main/res/layout/api_display_transfer_code.xml
index adb970240..517ca15f5 100644
--- a/OpenKeychain/src/main/res/layout/api_display_transfer_code.xml
+++ b/OpenKeychain/src/main/res/layout/api_display_transfer_code.xml
@@ -18,8 +18,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:src="@mipmap/ic_launcher"/>
diff --git a/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml b/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
index b86c109ed..b3587bb06 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
@@ -17,8 +17,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher"
             />
 
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 53b07ac26..65ec7f0c8 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -17,8 +17,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher"
             />
 
diff --git a/OpenKeychain/src/main/res/layout/api_remote_request_key_permission.xml b/OpenKeychain/src/main/res/layout/api_remote_request_key_permission.xml
index 298eba655..7a3fa0323 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_request_key_permission.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_request_key_permission.xml
@@ -17,8 +17,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher"
             />
 
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml b/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml
index 3246f1801..67843f35a 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_authentication_key.xml
@@ -17,8 +17,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher"
             />
 
diff --git a/OpenKeychain/src/main/res/layout/api_select_identity_key.xml b/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
index 489a7d5f4..719695478 100644
--- a/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
+++ b/OpenKeychain/src/main/res/layout/api_select_identity_key.xml
@@ -18,8 +18,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:src="@mipmap/ic_launcher"/>
diff --git a/OpenKeychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
index cbe1c3331..3d9ae42bd 100644
--- a/OpenKeychain/src/main/res/layout/help_about_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/help_about_fragment.xml
@@ -28,8 +28,8 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
                     android:layout_gravity="top"
                     android:layout_marginRight="10dp"
                     android:src="@mipmap/ic_launcher" />
diff --git a/OpenKeychain/src/main/res/layout/remote_security_issue_dialog.xml b/OpenKeychain/src/main/res/layout/remote_security_issue_dialog.xml
index 9b81be222..5743612a2 100644
--- a/OpenKeychain/src/main/res/layout/remote_security_issue_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/remote_security_issue_dialog.xml
@@ -18,8 +18,8 @@
         tools:targetApi="lollipop">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher"
             />