diff --git a/app/src/main/res/layout/fragment_edit_contact.xml b/app/src/main/res/layout/fragment_edit_contact.xml
index 43d7258..64b8841 100644
--- a/app/src/main/res/layout/fragment_edit_contact.xml
+++ b/app/src/main/res/layout/fragment_edit_contact.xml
@@ -8,8 +8,9 @@
 
     <ImageView
         android:id="@+id/picture"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:scaleType="centerCrop"
         android:src="@drawable/ic_contact_picture" />
 
     <EditText
diff --git a/app/src/main/res/layout/fragment_edit_identity.xml b/app/src/main/res/layout/fragment_edit_identity.xml
index fc9868a..9a265af 100644
--- a/app/src/main/res/layout/fragment_edit_identity.xml
+++ b/app/src/main/res/layout/fragment_edit_identity.xml
@@ -8,8 +8,9 @@
 
     <ImageView
         android:id="@+id/picture"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:scaleType="centerCrop"
         android:src="@drawable/ic_contact_picture" />
 
     <EditText
diff --git a/app/src/main/res/layout/fragment_view_email.xml b/app/src/main/res/layout/fragment_view_email.xml
index 011cc5c..aa7b325 100644
--- a/app/src/main/res/layout/fragment_view_email.xml
+++ b/app/src/main/res/layout/fragment_view_email.xml
@@ -24,8 +24,9 @@
 
             <ImageView
                 android:id="@+id/picture"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="54dp"
+                android:layout_height="54dp"
+                android:scaleType="centerCrop"
                 android:layout_alignLeft="@+id/email_subject"
                 android:layout_below="@+id/email_subject"
                 android:src="@drawable/ic_contact_picture" />
diff --git a/app/src/main/res/layout/fragment_view_identity.xml b/app/src/main/res/layout/fragment_view_identity.xml
index f75de0e..56fb518 100644
--- a/app/src/main/res/layout/fragment_view_identity.xml
+++ b/app/src/main/res/layout/fragment_view_identity.xml
@@ -8,17 +8,21 @@
 
     <ImageView
         android:id="@+id/identity_picture"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:scaleType="centerCrop"
         android:src="@drawable/ic_contact_picture" />
 
     <TextView
         android:id="@+id/public_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/identity_picture"
+        android:layout_alignTop="@+id/identity_picture"
         android:layout_toRightOf="@+id/identity_picture"
+        android:layout_marginTop="15dp"
+        android:layout_marginLeft="5dp"
         android:ems="10"
+        android:textSize="20dp"
         android:text="@string/public_name" />
 
     <TextView
@@ -26,6 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/identity_picture"
+        android:layout_marginTop="5dp"
         android:ems="10"
         android:text="@string/description" />
 
@@ -35,6 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_alignLeft="@+id/description"
         android:layout_below="@+id/description"
+        android:layout_marginTop="5dp"
         android:text="Crypto implementation" />
 
     <TextView
@@ -42,6 +48,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/crypto_impl"
+        android:layout_marginTop="5dp"
         android:text="Key" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/listitem_contact.xml b/app/src/main/res/layout/listitem_contact.xml
index 7fe3b79..3760d85 100644
--- a/app/src/main/res/layout/listitem_contact.xml
+++ b/app/src/main/res/layout/listitem_contact.xml
@@ -6,8 +6,9 @@
 
     <ImageView
         android:id="@+id/contact_picture"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:scaleType="centerCrop"
         android:src="@drawable/ic_contact_picture" />
 
     <TextView
diff --git a/app/src/main/res/layout/listitem_email.xml b/app/src/main/res/layout/listitem_email.xml
index 2be4fbd..4d10d6f 100644
--- a/app/src/main/res/layout/listitem_email.xml
+++ b/app/src/main/res/layout/listitem_email.xml
@@ -12,8 +12,9 @@
 
     <ImageView
         android:id="@+id/email_selected"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:scaleType="centerCrop"
         android:layout_alignBottom="@+id/contact_picture"
         android:layout_alignLeft="@+id/contact_picture"
         android:visibility="gone"