diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml
index 6676ed11..e4f56b3e 100644
--- a/app/src/main/res/layout/activity_view_contact.xml
+++ b/app/src/main/res/layout/activity_view_contact.xml
@@ -94,6 +94,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_below="@+id/contact_photo"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -111,6 +112,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -127,6 +129,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -143,6 +146,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -159,6 +163,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -175,6 +180,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -191,6 +197,7 @@
                 android:maxLines="1"
                 android:paddingStart="@dimen/small_margin"
                 android:paddingTop="@dimen/normal_margin"
+                android:paddingEnd="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"
                 android:singleLine="true"
                 android:textSize="@dimen/bigger_text_size" />
@@ -200,6 +207,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_numbers_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -211,6 +219,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_emails_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -222,6 +231,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_addresses_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -233,6 +243,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_ims_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -244,6 +255,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_events_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -255,6 +267,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_notes"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -266,6 +279,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_organization_company"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -277,6 +291,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_websites_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -288,6 +303,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_groups_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -299,6 +315,7 @@
                 android:layout_width="@dimen/contact_icons_size"
                 android:layout_height="@dimen/contact_icons_size"
                 android:layout_alignTop="@+id/contact_sources_holder"
+                android:layout_marginStart="@dimen/normal_margin"
                 android:paddingTop="@dimen/medium_margin"
                 android:paddingEnd="@dimen/small_margin"
                 android:paddingBottom="@dimen/small_margin"
@@ -312,7 +329,6 @@
                 android:layout_below="@+id/contact_nickname"
                 android:layout_toEndOf="@+id/contact_numbers_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -322,7 +338,6 @@
                 android:layout_below="@+id/contact_numbers_holder"
                 android:layout_toEndOf="@+id/contact_name_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -332,7 +347,6 @@
                 android:layout_below="@+id/contact_emails_holder"
                 android:layout_toEndOf="@+id/contact_name_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -342,7 +356,6 @@
                 android:layout_below="@+id/contact_addresses_holder"
                 android:layout_toEndOf="@+id/contact_name_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -370,7 +383,6 @@
                 android:layout_below="@+id/contact_websites_holder"
                 android:layout_toEndOf="@+id/contact_name_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <LinearLayout
@@ -380,7 +392,6 @@
                 android:layout_below="@+id/contact_groups_holder"
                 android:layout_toEndOf="@+id/contact_name_image"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/small_margin"
                 android:visibility="gone" />
 
             <com.simplemobiletools.commons.views.MyTextView
diff --git a/app/src/main/res/layout/item_view_address.xml b/app/src/main/res/layout/item_view_address.xml
index 73f3dfc9..ec68f527 100644
--- a/app/src/main/res/layout/item_view_address.xml
+++ b/app/src/main/res/layout/item_view_address.xml
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_address_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="@dimen/normal_margin"
-    android:paddingTop="@dimen/normal_margin">
+    android:paddingStart="@dimen/small_margin"
+    android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
+    android:paddingBottom="@dimen/normal_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_address"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/contact_address_type"
         android:layout_toStartOf="@+id/contact_address_type"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_address_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/contact_address"
         android:layout_alignBottom="@+id/contact_address"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/contact_address"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:paddingStart="@dimen/medium_margin"
         android:paddingEnd="@dimen/medium_margin"
         android:text="@string/home"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_view_contact_source.xml b/app/src/main/res/layout/item_view_contact_source.xml
index cfa4fda6..236280cc 100644
--- a/app/src/main/res/layout/item_view_contact_source.xml
+++ b/app/src/main/res/layout/item_view_contact_source.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.commons.views.MyTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.simplemobiletools.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_source"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,7 +8,9 @@
     android:ellipsize="end"
     android:lines="1"
     android:maxLines="1"
+    android:paddingStart="@dimen/small_margin"
     android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
     android:paddingBottom="@dimen/normal_margin"
     android:singleLine="true"
-    android:textSize="@dimen/bigger_text_size"/>
+    android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_view_email.xml b/app/src/main/res/layout/item_view_email.xml
index 7169d289..470811c8 100644
--- a/app/src/main/res/layout/item_view_email.xml
+++ b/app/src/main/res/layout/item_view_email.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_email_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="@dimen/normal_margin"
-    android:paddingTop="@dimen/normal_margin">
+    android:paddingStart="@dimen/small_margin"
+    android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
+    android:paddingBottom="@dimen/normal_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_email"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/contact_email_type"
         android:layout_toStartOf="@+id/contact_email_type"
         android:lines="1"
         android:maxLines="1"
         android:singleLine="true"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_email_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/contact_email"
         android:layout_alignBottom="@+id/contact_email"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/contact_email"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/home"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_view_event.xml b/app/src/main/res/layout/item_view_event.xml
index 002f5cf4..9563636c 100644
--- a/app/src/main/res/layout/item_view_event.xml
+++ b/app/src/main/res/layout/item_view_event.xml
@@ -4,7 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:paddingStart="@dimen/small_margin"
     android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
     android:paddingBottom="@dimen/normal_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
@@ -27,8 +29,8 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:gravity="center"
-        android:paddingLeft="@dimen/medium_margin"
-        android:paddingRight="@dimen/medium_margin"
+        android:paddingStart="@dimen/medium_margin"
+        android:paddingEnd="@dimen/medium_margin"
         android:text="@string/home"
         android:textSize="@dimen/bigger_text_size" />
 
diff --git a/app/src/main/res/layout/item_view_group.xml b/app/src/main/res/layout/item_view_group.xml
index 12959127..3d62da8e 100644
--- a/app/src/main/res/layout/item_view_group.xml
+++ b/app/src/main/res/layout/item_view_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.simplemobiletools.commons.views.MyTextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.simplemobiletools.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_group"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,7 +8,9 @@
     android:ellipsize="end"
     android:lines="1"
     android:maxLines="1"
+    android:paddingStart="@dimen/small_margin"
     android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
     android:paddingBottom="@dimen/normal_margin"
     android:singleLine="true"
-    android:textSize="@dimen/bigger_text_size"/>
+    android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_view_im.xml b/app/src/main/res/layout/item_view_im.xml
index 3ee5f615..5e17fdb1 100644
--- a/app/src/main/res/layout/item_view_im.xml
+++ b/app/src/main/res/layout/item_view_im.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_im_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="@dimen/normal_margin"
-    android:paddingTop="@dimen/normal_margin">
+    android:paddingStart="@dimen/small_margin"
+    android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
+    android:paddingBottom="@dimen/normal_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_im"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/contact_im_type"
         android:layout_toStartOf="@+id/contact_im_type"
         android:lines="1"
         android:maxLines="1"
         android:singleLine="true"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_im_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/contact_im"
         android:layout_alignBottom="@+id/contact_im"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/contact_im"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:paddingStart="@dimen/medium_margin"
         android:paddingEnd="@dimen/medium_margin"
         android:text="@string/aim"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_view_phone_number.xml b/app/src/main/res/layout/item_view_phone_number.xml
index 12e8bbae..26f267b8 100644
--- a/app/src/main/res/layout/item_view_phone_number.xml
+++ b/app/src/main/res/layout/item_view_phone_number.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/contact_number_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="@dimen/normal_margin"
-    android:paddingTop="@dimen/normal_margin">
+    android:paddingStart="@dimen/small_margin"
+    android:paddingTop="@dimen/normal_margin"
+    android:paddingEnd="@dimen/normal_margin"
+    android:paddingBottom="@dimen/normal_margin">
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_number"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/contact_number_type"
         android:layout_toStartOf="@+id/contact_number_type"
         android:lines="1"
         android:maxLines="1"
         android:singleLine="true"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/contact_number_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/contact_number"
         android:layout_alignBottom="@+id/contact_number"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/contact_number"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:paddingStart="@dimen/medium_margin"
         android:paddingEnd="@dimen/medium_margin"
         android:text="@string/mobile"
-        android:textSize="@dimen/bigger_text_size"/>
+        android:textSize="@dimen/bigger_text_size" />
 
 </RelativeLayout>