diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_contact.xml
index 9120814a..0c285632 100644
--- a/app/src/main/res/layout/activity_contact.xml
+++ b/app/src/main/res/layout/activity_contact.xml
@@ -28,8 +28,8 @@
             <ImageView
                 android:id="@+id/contact_send_email"
                 style="@style/MyBorderlessBackgroundStyle"
-                android:layout_width="@dimen/contact_action_size"
-                android:layout_height="@dimen/contact_action_size"
+                android:layout_width="@dimen/contact_actions_size"
+                android:layout_height="@dimen/contact_actions_size"
                 android:layout_marginRight="@dimen/activity_margin"
                 android:adjustViewBounds="true"
                 android:paddingLeft="@dimen/activity_margin"
@@ -40,8 +40,8 @@
             <ImageView
                 android:id="@+id/contact_start_call"
                 style="@style/MyBorderlessBackgroundStyle"
-                android:layout_width="@dimen/contact_action_size"
-                android:layout_height="@dimen/contact_action_size"
+                android:layout_width="@dimen/contact_actions_size"
+                android:layout_height="@dimen/contact_actions_size"
                 android:layout_marginRight="@dimen/activity_margin"
                 android:adjustViewBounds="true"
                 android:paddingLeft="@dimen/activity_margin"
@@ -52,8 +52,8 @@
             <ImageView
                 android:id="@+id/contact_send_sms"
                 style="@style/MyBorderlessBackgroundStyle"
-                android:layout_width="@dimen/contact_action_size"
-                android:layout_height="@dimen/contact_action_size"
+                android:layout_width="@dimen/contact_actions_size"
+                android:layout_height="@dimen/contact_actions_size"
                 android:adjustViewBounds="true"
                 android:paddingLeft="@dimen/activity_margin"
                 android:paddingRight="@dimen/activity_margin"
@@ -64,11 +64,12 @@
 
         <ImageView
             android:id="@+id/contact_name_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/contact_first_name"
+            android:layout_width="@dimen/contact_icons_size"
+            android:layout_height="@dimen/contact_icons_size"
             android:layout_alignTop="@+id/contact_first_name"
-            android:paddingBottom="@dimen/medium_margin"
+            android:paddingBottom="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:paddingRight="@dimen/small_margin"
             android:paddingTop="@dimen/medium_margin"
             android:src="@drawable/ic_person"/>
 
@@ -78,8 +79,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_photo"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/normal_margin"
             android:layout_toRightOf="@+id/contact_name_image"
             android:hint="@string/first_name"
@@ -95,8 +94,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_first_name"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/normal_margin"
             android:layout_toRightOf="@+id/contact_name_image"
             android:hint="@string/middle_name"
@@ -112,8 +109,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_middle_name"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/normal_margin"
             android:layout_toRightOf="@+id/contact_name_image"
             android:hint="@string/surname"
@@ -125,11 +120,12 @@
 
         <ImageView
             android:id="@+id/contact_number_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/contact_number"
+            android:layout_width="@dimen/contact_icons_size"
+            android:layout_height="@dimen/contact_icons_size"
             android:layout_alignTop="@+id/contact_number"
-            android:paddingBottom="@dimen/medium_margin"
+            android:paddingBottom="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:paddingRight="@dimen/small_margin"
             android:paddingTop="@dimen/medium_margin"
             android:src="@drawable/ic_phone"/>
 
@@ -139,8 +135,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_surname"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/normal_margin"
             android:layout_toLeftOf="@+id/contact_number_type"
             android:layout_toRightOf="@+id/contact_name_image"
@@ -182,11 +176,12 @@
 
         <ImageView
             android:id="@+id/contact_email_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/contact_email"
+            android:layout_width="@dimen/contact_icons_size"
+            android:layout_height="@dimen/contact_icons_size"
             android:layout_alignTop="@+id/contact_email"
-            android:paddingBottom="@dimen/medium_margin"
+            android:paddingBottom="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:paddingRight="@dimen/small_margin"
             android:paddingTop="@dimen/medium_margin"
             android:src="@drawable/ic_email"/>
 
@@ -196,8 +191,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_number_add_new"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/medium_margin"
             android:layout_toLeftOf="@+id/contact_email_type"
             android:layout_toRightOf="@+id/contact_name_image"
@@ -239,11 +232,12 @@
 
         <ImageView
             android:id="@+id/contact_source_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@+id/contact_source"
+            android:layout_width="@dimen/contact_icons_size"
+            android:layout_height="@dimen/contact_icons_size"
             android:layout_alignTop="@+id/contact_source"
-            android:paddingBottom="@dimen/medium_margin"
+            android:paddingBottom="@dimen/small_margin"
+            android:paddingEnd="@dimen/small_margin"
+            android:paddingRight="@dimen/small_margin"
             android:paddingTop="@dimen/medium_margin"
             android:src="@drawable/ic_account_box"/>
 
@@ -253,8 +247,6 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/contact_email_add_new"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/medium_margin"
-            android:layout_marginStart="@dimen/medium_margin"
             android:layout_marginTop="@dimen/medium_margin"
             android:layout_toRightOf="@+id/contact_name_image"
             android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4d333740..d6f4ab48 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="contact_photo_size">80dp</dimen>
-    <dimen name="contact_action_size">50dp</dimen>
+    <dimen name="contact_actions_size">50dp</dimen>
+    <dimen name="contact_icons_size">40dp</dimen>
 </resources>