diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce27f3d1..1cde8a1e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,7 +103,8 @@
 
         <activity
             android:name=".activities.EditContactActivity"
-            android:parentActivityName=".activities.MainActivity">
+            android:parentActivityName=".activities.MainActivity"
+            android:theme="@style/TranslucentTheme">
 
             <intent-filter>
                 <action android:name="android.intent.action.EDIT"/>
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index 2e463177..9d7e0716 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -5,15 +5,14 @@ import android.content.ClipData
 import android.content.ContentValues
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.provider.ContactsContract.CommonDataKinds
 import android.provider.ContactsContract.CommonDataKinds.*
 import android.provider.MediaStore
-import android.view.Menu
-import android.view.MenuItem
-import android.view.ViewGroup
-import android.view.WindowManager
+import android.view.*
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.TextView
@@ -60,6 +59,7 @@ class EditContactActivity : ContactActivity() {
     private var originalContactSource = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        useDynamicTheme = false
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_edit_contact)
 
@@ -67,6 +67,9 @@ class EditContactActivity : ContactActivity() {
             return
         }
 
+        contact_wrapper.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+        contact_wrapper.background = ColorDrawable(config.backgroundColor)
+
         val action = intent.action
         isThirdPartyIntent = action == Intent.ACTION_EDIT || action == Intent.ACTION_INSERT || action == ADD_NEW_CONTACT_NUMBER
         val isFromSimpleContacts = intent.getBooleanExtra(IS_FROM_SIMPLE_CONTACTS, false)
@@ -91,6 +94,11 @@ class EditContactActivity : ContactActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        window.statusBarColor = Color.TRANSPARENT
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_edit_contact, menu)
         if (wasActivityInitialized) {
diff --git a/app/src/main/res/layout/activity_edit_contact.xml b/app/src/main/res/layout/activity_edit_contact.xml
index f24bd75e..4f9f8375 100644
--- a/app/src/main/res/layout/activity_edit_contact.xml
+++ b/app/src/main/res/layout/activity_edit_contact.xml
@@ -1,539 +1,545 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/contact_scrollview"
+    android:id="@+id/contact_wrapper"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none"
-    android:visibility="gone">
+    android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/contact_holder"
+    <ScrollView
+        android:id="@+id/contact_scrollview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/normal_margin"
-        android:paddingTop="@dimen/activity_margin"
-        android:paddingEnd="@dimen/normal_margin"
-        android:paddingBottom="@dimen/medium_margin">
+        android:scrollbars="none"
+        android:visibility="gone">
 
-        <ImageView
-            android:id="@+id/contact_photo"
-            android:layout_width="@dimen/contact_photo_size"
-            android:layout_height="@dimen/contact_photo_size"
-            android:layout_marginBottom="@dimen/normal_margin" />
-
-        <ImageView
-            android:id="@+id/contact_toggle_favorite"
-            android:layout_width="@dimen/contact_actions_size"
-            android:layout_height="@dimen/contact_actions_size"
-            android:layout_alignTop="@+id/contact_photo"
-            android:layout_alignBottom="@id/contact_photo"
-            android:layout_marginStart="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_photo"
-            android:adjustViewBounds="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:padding="@dimen/tiny_margin"
-            android:src="@drawable/ic_star_off_vector" />
-
-        <LinearLayout
-            android:id="@+id/contact_actions_holder"
+        <RelativeLayout
+            android:id="@+id/contact_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/contact_photo"
-            android:layout_alignBottom="@id/contact_photo"
-            android:gravity="center_vertical|end">
+            android:paddingStart="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingEnd="@dimen/normal_margin"
+            android:paddingBottom="@dimen/medium_margin">
 
             <ImageView
-                android:id="@+id/contact_send_email"
-                android:layout_width="@dimen/contact_actions_size"
-                android:layout_height="@dimen/contact_actions_size"
-                android:adjustViewBounds="true"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/small_margin"
-                android:paddingRight="@dimen/small_margin"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_email_vector" />
+                android:id="@+id/contact_photo"
+                android:layout_width="@dimen/contact_photo_size"
+                android:layout_height="@dimen/contact_photo_size"
+                android:layout_marginBottom="@dimen/normal_margin" />
 
             <ImageView
-                android:id="@+id/contact_start_call"
+                android:id="@+id/contact_toggle_favorite"
                 android:layout_width="@dimen/contact_actions_size"
                 android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginStart="@dimen/normal_margin"
+                android:layout_alignTop="@+id/contact_photo"
+                android:layout_alignBottom="@id/contact_photo"
+                android:layout_marginStart="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_photo"
                 android:adjustViewBounds="true"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/small_margin"
-                android:paddingRight="@dimen/small_margin"
-                android:scaleType="fitCenter"
+                android:padding="@dimen/tiny_margin"
+                android:src="@drawable/ic_star_off_vector" />
+
+            <LinearLayout
+                android:id="@+id/contact_actions_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@+id/contact_photo"
+                android:layout_alignBottom="@id/contact_photo"
+                android:gravity="center_vertical|end">
+
+                <ImageView
+                    android:id="@+id/contact_send_email"
+                    android:layout_width="@dimen/contact_actions_size"
+                    android:layout_height="@dimen/contact_actions_size"
+                    android:adjustViewBounds="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_email_vector" />
+
+                <ImageView
+                    android:id="@+id/contact_start_call"
+                    android:layout_width="@dimen/contact_actions_size"
+                    android:layout_height="@dimen/contact_actions_size"
+                    android:layout_marginStart="@dimen/normal_margin"
+                    android:adjustViewBounds="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_phone_vector" />
+
+                <ImageView
+                    android:id="@+id/contact_send_sms"
+                    android:layout_width="@dimen/contact_actions_size"
+                    android:layout_height="@dimen/contact_actions_size"
+                    android:layout_marginStart="@dimen/normal_margin"
+                    android:adjustViewBounds="true"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_sms_vector" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/contact_name_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_below="@+id/contact_photo"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_person_vector" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_prefix"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_photo"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/prefix"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_first_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_prefix"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/first_name"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_middle_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_first_name"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/middle_name"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_surname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_middle_name"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/surname"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_suffix"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_surname"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/suffix"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_nickname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_suffix"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:hint="@string/nickname"
+                android:inputType="textCapWords"
+                android:lines="1"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
+
+            <ImageView
+                android:id="@+id/contact_numbers_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_numbers_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
                 android:src="@drawable/ic_phone_vector" />
 
+            <LinearLayout
+                android:id="@+id/contact_numbers_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_nickname"
+                android:layout_marginBottom="@dimen/small_margin"
+                android:layout_toEndOf="@+id/contact_numbers_image"
+                android:orientation="vertical">
+
+                <include layout="@layout/item_edit_phone_number" />
+
+            </LinearLayout>
+
             <ImageView
-                android:id="@+id/contact_send_sms"
-                android:layout_width="@dimen/contact_actions_size"
-                android:layout_height="@dimen/contact_actions_size"
-                android:layout_marginStart="@dimen/normal_margin"
-                android:adjustViewBounds="true"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:paddingLeft="@dimen/small_margin"
-                android:paddingRight="@dimen/small_margin"
-                android:scaleType="fitCenter"
-                android:src="@drawable/ic_sms_vector" />
+                android:id="@+id/contact_numbers_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_numbers_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="@dimen/medium_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-        </LinearLayout>
+            <ImageView
+                android:id="@+id/contact_emails_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_emails_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_email_vector" />
 
-        <ImageView
-            android:id="@+id/contact_name_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_below="@+id/contact_photo"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_person_vector" />
+            <LinearLayout
+                android:id="@+id/contact_emails_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_numbers_add_new"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_prefix"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_photo"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/prefix"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+                <include layout="@layout/item_edit_email" />
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_first_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_prefix"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/first_name"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            </LinearLayout>
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_middle_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_first_name"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/middle_name"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            <ImageView
+                android:id="@+id/contact_emails_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_emails_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_surname"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_middle_name"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/surname"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            <ImageView
+                android:id="@+id/contact_addresses_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_addresses_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_place_vector" />
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_suffix"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_surname"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/suffix"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            <LinearLayout
+                android:id="@+id/contact_addresses_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_emails_add_new"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_nickname"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_suffix"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:hint="@string/nickname"
-            android:inputType="textCapWords"
-            android:lines="1"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+                <include layout="@layout/item_edit_address" />
 
-        <ImageView
-            android:id="@+id/contact_numbers_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_numbers_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_phone_vector" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/contact_numbers_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_nickname"
-            android:layout_marginBottom="@dimen/small_margin"
-            android:layout_toEndOf="@+id/contact_numbers_image"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/contact_addresses_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_addresses_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-            <include layout="@layout/item_edit_phone_number" />
+            <ImageView
+                android:id="@+id/contact_ims_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_ims_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_im" />
 
-        </LinearLayout>
+            <LinearLayout
+                android:id="@+id/contact_ims_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_addresses_add_new"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/contact_numbers_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_numbers_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
+                <include layout="@layout/item_edit_im" />
 
-        <ImageView
-            android:id="@+id/contact_emails_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_emails_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_email_vector" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/contact_emails_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_numbers_add_new"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/contact_ims_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_ims_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-            <include layout="@layout/item_edit_email" />
+            <ImageView
+                android:id="@+id/contact_events_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_events_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_cake_vector" />
 
-        </LinearLayout>
+            <LinearLayout
+                android:id="@+id/contact_events_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_ims_add_new"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/contact_emails_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_emails_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
+                <include layout="@layout/item_event" />
 
-        <ImageView
-            android:id="@+id/contact_addresses_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_addresses_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_place_vector" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/contact_addresses_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_emails_add_new"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/contact_events_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_events_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-            <include layout="@layout/item_edit_address" />
+            <ImageView
+                android:id="@+id/contact_notes_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_notes"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_label_vector" />
 
-        </LinearLayout>
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_notes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_events_add_new"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_notes_image"
+                android:hint="@string/notes"
+                android:inputType="textCapSentences|textMultiLine"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
 
-        <ImageView
-            android:id="@+id/contact_addresses_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_addresses_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
+            <ImageView
+                android:id="@+id/contact_organization_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_organization_company"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_business_vector" />
 
-        <ImageView
-            android:id="@+id/contact_ims_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_ims_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_im" />
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_organization_company"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_notes"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_organization_image"
+                android:hint="@string/company"
+                android:inputType="textCapWords"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
 
-        <LinearLayout
-            android:id="@+id/contact_ims_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_addresses_add_new"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/contact_organization_job_position"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_organization_company"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/normal_margin"
+                android:layout_toEndOf="@+id/contact_organization_image"
+                android:hint="@string/job_position"
+                android:inputType="textCapWords"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/bigger_text_size" />
 
-            <include layout="@layout/item_edit_im" />
+            <ImageView
+                android:id="@+id/contact_websites_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_websites_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_link_vector" />
 
-        </LinearLayout>
+            <LinearLayout
+                android:id="@+id/contact_websites_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_organization_job_position"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/contact_ims_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_ims_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
+                <include layout="@layout/item_edit_website" />
 
-        <ImageView
-            android:id="@+id/contact_events_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_events_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_cake_vector" />
+            </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/contact_events_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_ims_add_new"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/contact_websites_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_websites_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-            <include layout="@layout/item_event" />
+            <ImageView
+                android:id="@+id/contact_groups_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_groups_holder"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_people_vector" />
 
-        </LinearLayout>
+            <LinearLayout
+                android:id="@+id/contact_groups_holder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_websites_add_new"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/contact_events_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_events_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
+                <include layout="@layout/item_edit_group" />
 
-        <ImageView
-            android:id="@+id/contact_notes_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_notes"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_label_vector" />
+            </LinearLayout>
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_notes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_events_add_new"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_notes_image"
-            android:hint="@string/notes"
-            android:inputType="textCapSentences|textMultiLine"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            <ImageView
+                android:id="@+id/contact_groups_add_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_groups_holder"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/small_margin"
+                android:background="@drawable/button_background"
+                android:paddingStart="@dimen/activity_margin"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/activity_margin"
+                android:paddingBottom="@dimen/medium_margin"
+                android:src="@drawable/ic_plus_vector" />
 
-        <ImageView
-            android:id="@+id/contact_organization_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_organization_company"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_business_vector" />
+            <ImageView
+                android:id="@+id/contact_source_image"
+                android:layout_width="@dimen/contact_icons_size"
+                android:layout_height="@dimen/contact_icons_size"
+                android:layout_alignTop="@+id/contact_source"
+                android:paddingTop="@dimen/medium_margin"
+                android:paddingEnd="@dimen/small_margin"
+                android:paddingBottom="@dimen/small_margin"
+                android:src="@drawable/ic_account_box_vector" />
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_organization_company"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_notes"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_organization_image"
-            android:hint="@string/company"
-            android:inputType="textCapWords"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/contact_source"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/contact_groups_add_new"
+                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/medium_margin"
+                android:layout_toEndOf="@+id/contact_name_image"
+                android:background="?attr/selectableItemBackground"
+                android:lines="1"
+                android:maxLines="1"
+                android:paddingStart="@dimen/small_margin"
+                android:paddingTop="@dimen/normal_margin"
+                android:paddingBottom="@dimen/normal_margin"
+                android:singleLine="true"
+                android:textSize="@dimen/bigger_text_size"
+                tools:text="hello@simplemobiletools.com" />
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/contact_organization_job_position"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_organization_company"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/normal_margin"
-            android:layout_toEndOf="@+id/contact_organization_image"
-            android:hint="@string/job_position"
-            android:inputType="textCapWords"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/bigger_text_size" />
-
-        <ImageView
-            android:id="@+id/contact_websites_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_websites_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_link_vector" />
-
-        <LinearLayout
-            android:id="@+id/contact_websites_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_organization_job_position"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
-
-            <include layout="@layout/item_edit_website" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/contact_websites_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_websites_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
-
-        <ImageView
-            android:id="@+id/contact_groups_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_groups_holder"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_people_vector" />
-
-        <LinearLayout
-            android:id="@+id/contact_groups_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_websites_add_new"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:orientation="vertical">
-
-            <include layout="@layout/item_edit_group" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/contact_groups_add_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_groups_holder"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="@drawable/button_background"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/medium_margin"
-            android:src="@drawable/ic_plus_vector" />
-
-        <ImageView
-            android:id="@+id/contact_source_image"
-            android:layout_width="@dimen/contact_icons_size"
-            android:layout_height="@dimen/contact_icons_size"
-            android:layout_alignTop="@+id/contact_source"
-            android:paddingTop="@dimen/medium_margin"
-            android:paddingEnd="@dimen/small_margin"
-            android:paddingBottom="@dimen/small_margin"
-            android:src="@drawable/ic_account_box_vector" />
-
-        <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/contact_source"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contact_groups_add_new"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:layout_toEndOf="@+id/contact_name_image"
-            android:background="?attr/selectableItemBackground"
-            android:lines="1"
-            android:maxLines="1"
-            android:paddingStart="@dimen/small_margin"
-            android:paddingTop="@dimen/normal_margin"
-            android:paddingBottom="@dimen/normal_margin"
-            android:singleLine="true"
-            android:textSize="@dimen/bigger_text_size"
-            tools:text="hello@simplemobiletools.com" />
-
-    </RelativeLayout>
-</ScrollView>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml
index 6d6280de..4e130734 100644
--- a/app/src/main/res/layout/activity_view_contact.xml
+++ b/app/src/main/res/layout/activity_view_contact.xml
@@ -59,8 +59,8 @@
                     android:layout_height="@dimen/contact_actions_size"
                     android:adjustViewBounds="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
-                    android:paddingLeft="@dimen/small_margin"
-                    android:paddingRight="@dimen/small_margin"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_email_vector" />
 
@@ -71,8 +71,8 @@
                     android:layout_marginStart="@dimen/normal_margin"
                     android:adjustViewBounds="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
-                    android:paddingLeft="@dimen/small_margin"
-                    android:paddingRight="@dimen/small_margin"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_phone_vector" />
 
@@ -83,8 +83,8 @@
                     android:layout_marginStart="@dimen/normal_margin"
                     android:adjustViewBounds="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
-                    android:paddingLeft="@dimen/small_margin"
-                    android:paddingRight="@dimen/small_margin"
+                    android:paddingStart="@dimen/small_margin"
+                    android:paddingEnd="@dimen/small_margin"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_sms_vector" />