diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
index b6ada840..6a93f748 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
@@ -62,6 +62,8 @@ class ContactActivity : SimpleActivity() {
             setupEditContact()
         }
 
+        contact_send_sms.beVisibleIf(contact!!.number.isNotEmpty())
+        contact_start_call.beVisibleIf(contact!!.number.isNotEmpty())
         contact_send_email.beVisibleIf(contact!!.email.isNotEmpty())
 
         contact_photo.background = ColorDrawable(config.primaryColor)
diff --git a/app/src/main/res/layout/activity_contact.xml b/app/src/main/res/layout/activity_contact.xml
index 39502427..2c2cbbec 100644
--- a/app/src/main/res/layout/activity_contact.xml
+++ b/app/src/main/res/layout/activity_contact.xml
@@ -16,50 +16,48 @@
             android:layout_width="@dimen/contact_photo_size"
             android:layout_height="@dimen/contact_photo_size"/>
 
-        <ImageView
-            android:id="@+id/contact_send_sms"
-            style="@style/MyBorderlessBackgroundStyle"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/contact_actions_holder"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/contact_photo"
-            android:layout_alignParentEnd="true"
             android:layout_alignTop="@+id/contact_photo"
-            android:layout_centerVertical="true"
-            android:adjustViewBounds="true"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:scaleType="center"
-            android:src="@drawable/ic_sms"/>
+            android:gravity="center_vertical|right">
 
-        <ImageView
-            android:id="@+id/contact_start_call"
-            style="@style/MyBorderlessBackgroundStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/contact_photo"
-            android:layout_alignTop="@+id/contact_photo"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/contact_send_sms"
-            android:adjustViewBounds="true"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:scaleType="center"
-            android:src="@drawable/ic_phone"/>
+            <ImageView
+                android:id="@+id/contact_send_email"
+                style="@style/MyBorderlessBackgroundStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:paddingLeft="@dimen/activity_margin"
+                android:paddingRight="@dimen/activity_margin"
+                android:scaleType="center"
+                android:src="@drawable/ic_email"/>
 
-        <ImageView
-            android:id="@+id/contact_send_email"
-            style="@style/MyBorderlessBackgroundStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/contact_photo"
-            android:layout_alignTop="@+id/contact_photo"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/contact_start_call"
-            android:adjustViewBounds="true"
-            android:paddingLeft="@dimen/activity_margin"
-            android:paddingRight="@dimen/activity_margin"
-            android:scaleType="center"
-            android:src="@drawable/ic_email"/>
+            <ImageView
+                android:id="@+id/contact_start_call"
+                style="@style/MyBorderlessBackgroundStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:paddingLeft="@dimen/activity_margin"
+                android:paddingRight="@dimen/activity_margin"
+                android:scaleType="center"
+                android:src="@drawable/ic_phone"/>
+
+            <ImageView
+                android:id="@+id/contact_send_sms"
+                style="@style/MyBorderlessBackgroundStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:paddingLeft="@dimen/activity_margin"
+                android:paddingRight="@dimen/activity_margin"
+                android:scaleType="center"
+                android:src="@drawable/ic_sms"/>
+
+        </LinearLayout>
 
         <ImageView
             android:id="@+id/contact_name_image"