diff --git a/app/src/main/res/layout/activity_edit_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml
index 188320dd..835637d9 100644
--- a/app/src/main/res/layout/activity_edit_contact.xml
+++ b/app/src/main/res/layout/activity_edit_contact.xml
@@ -96,6 +96,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"
@@ -107,6 +108,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_photo"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/prefix"
@@ -123,6 +125,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_prefix"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/first_name"
@@ -139,6 +142,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_first_name"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/middle_name"
@@ -155,6 +159,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_middle_name"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/normal_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/surname"
@@ -171,6 +176,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_surname"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/suffix"
@@ -187,6 +193,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/contact_suffix"
android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_toEndOf="@+id/contact_name_image"
android:hint="@string/nickname"
@@ -202,6 +209,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"
@@ -239,6 +247,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"
@@ -275,6 +284,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"
@@ -312,6 +322,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"
@@ -349,6 +360,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"
@@ -386,6 +398,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"
@@ -398,6 +411,7 @@
android:layout_below="@+id/contact_events_add_new"
android:layout_centerVertical="true"
android:layout_marginTop="@dimen/normal_margin"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_toEndOf="@+id/contact_notes_image"
android:hint="@string/notes"
android:inputType="textCapSentences|textMultiLine"
@@ -409,6 +423,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"
@@ -421,6 +436,7 @@
android:layout_below="@+id/contact_notes"
android:layout_centerVertical="true"
android:layout_marginTop="@dimen/normal_margin"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_toEndOf="@+id/contact_organization_image"
android:hint="@string/company"
android:inputType="textCapWords"
@@ -436,6 +452,7 @@
android:layout_below="@+id/contact_organization_company"
android:layout_centerVertical="true"
android:layout_marginTop="@dimen/normal_margin"
+ android:layout_marginEnd="@dimen/activity_margin"
android:layout_toEndOf="@+id/contact_organization_image"
android:hint="@string/job_position"
android:inputType="textCapWords"
@@ -449,6 +466,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"
@@ -486,6 +504,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"
@@ -523,6 +542,7 @@
android:layout_width="@dimen/contact_icons_size"
android:layout_height="@dimen/contact_icons_size"
android:layout_alignTop="@+id/contact_source"
+ android:layout_marginStart="@dimen/normal_margin"
android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"
diff --git a/app/src/main/res/layout/item_edit_address.xml b/app/src/main/res/layout/item_edit_address.xml
index d742a213..a7dc2ad7 100644
--- a/app/src/main/res/layout/item_edit_address.xml
+++ b/app/src/main/res/layout/item_edit_address.xml
@@ -1,9 +1,9 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_edit_email.xml b/app/src/main/res/layout/item_edit_email.xml
index 3fb37f47..705e7094 100644
--- a/app/src/main/res/layout/item_edit_email.xml
+++ b/app/src/main/res/layout/item_edit_email.xml
@@ -1,16 +1,15 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_edit_group.xml b/app/src/main/res/layout/item_edit_group.xml
index 903951f9..debd0c63 100644
--- a/app/src/main/res/layout/item_edit_group.xml
+++ b/app/src/main/res/layout/item_edit_group.xml
@@ -1,41 +1,40 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:visibility="gone" />
diff --git a/app/src/main/res/layout/item_edit_im.xml b/app/src/main/res/layout/item_edit_im.xml
index 01cd411f..60af427f 100644
--- a/app/src/main/res/layout/item_edit_im.xml
+++ b/app/src/main/res/layout/item_edit_im.xml
@@ -1,38 +1,36 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_edit_phone_number.xml b/app/src/main/res/layout/item_edit_phone_number.xml
index 0107e0c3..d48da51c 100644
--- a/app/src/main/res/layout/item_edit_phone_number.xml
+++ b/app/src/main/res/layout/item_edit_phone_number.xml
@@ -1,16 +1,15 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_edit_website.xml b/app/src/main/res/layout/item_edit_website.xml
index 8eda6c0c..66a3c10b 100644
--- a/app/src/main/res/layout/item_edit_website.xml
+++ b/app/src/main/res/layout/item_edit_website.xml
@@ -1,9 +1,9 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml
index 80407d33..e3d33608 100644
--- a/app/src/main/res/layout/item_event.xml
+++ b/app/src/main/res/layout/item_event.xml
@@ -1,57 +1,55 @@
-
+ android:layout_height="wrap_content"
+ android:paddingEnd="@dimen/activity_margin">
+ android:textSize="@dimen/bigger_text_size" />
+ android:visibility="gone" />
+ android:textSize="@dimen/bigger_text_size" />
diff --git a/app/src/main/res/layout/item_filter_contact_source.xml b/app/src/main/res/layout/item_filter_contact_source.xml
index 8c19bbc4..a7040588 100644
--- a/app/src/main/res/layout/item_filter_contact_source.xml
+++ b/app/src/main/res/layout/item_filter_contact_source.xml
@@ -1,6 +1,5 @@
-
+ android:paddingStart="@dimen/small_margin" />