diff --git a/res/layout/main.xml b/res/layout/main.xml
index 5eb79e93f..5505806df 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -15,7 +15,7 @@
     
 		<ImageView
 		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
+		    android:layout_width="0dp"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
 		    android:adjustViewBounds="true"
@@ -25,7 +25,7 @@
 		
 		<ImageView
 		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
+		    android:layout_width="0dp"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
 		    android:adjustViewBounds="true"
@@ -35,7 +35,7 @@
 		
 		<ImageView
 		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
+		    android:layout_width="0dp"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
 		    android:adjustViewBounds="true"
@@ -45,7 +45,7 @@
 		
 		<ImageView
 		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
+		    android:layout_width="0dp"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
 		    android:adjustViewBounds="true"
@@ -55,7 +55,7 @@
 		
 		<ImageView
 		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
+		    android:layout_width="0dp"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
 		    android:adjustViewBounds="true"
@@ -95,9 +95,10 @@
         android:orientation="horizontal">
 
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2">
+            android:layout_weight="1"
+			android:adjustViewBounds="true">
 
             <include layout="@layout/menu_history_button" />
 
@@ -117,9 +118,9 @@
         
         <ImageView
             android:id="@+id/dialer"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2"
+            android:layout_weight="1"
 			android:adjustViewBounds="true"
 			android:scaleType="fitCenter"
             android:contentDescription="@string/content_description_dialer"
@@ -129,9 +130,10 @@
 
         <RelativeLayout
             android:id="@+id/completeChat"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2">
+            android:layout_weight="1"
+			android:adjustViewBounds="true">
 
             <include layout="@layout/menu_chat_button" />
 
diff --git a/res/layout/menu_about_chat_button.xml b/res/layout/menu_about_chat_button.xml
index 13c061450..f2cd20b3c 100644
--- a/res/layout/menu_about_chat_button.xml
+++ b/res/layout/menu_about_chat_button.xml
@@ -4,7 +4,7 @@
 	android:visibility="gone"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_weight="0.2"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content">
     
     <ImageView
diff --git a/res/layout/menu_about_settings_button.xml b/res/layout/menu_about_settings_button.xml
index 573299c3f..c2023a14e 100644
--- a/res/layout/menu_about_settings_button.xml
+++ b/res/layout/menu_about_settings_button.xml
@@ -4,7 +4,7 @@
 	android:visibility="gone"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_weight="0.2"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content">
     
     <ImageView
diff --git a/res/layout/menu_contact_button.xml b/res/layout/menu_contact_button.xml
index 59f337e4b..195691262 100644
--- a/res/layout/menu_contact_button.xml
+++ b/res/layout/menu_contact_button.xml
@@ -2,9 +2,10 @@
 <RelativeLayout
 	android:id="@+id/contacts"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_weight="0.2"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_weight="1"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+	android:adjustViewBounds="true">
     
     <ImageView
         android:id="@+id/image"
diff --git a/res/layout/menu_settings_button.xml b/res/layout/menu_settings_button.xml
index 1f95d8715..388191f67 100644
--- a/res/layout/menu_settings_button.xml
+++ b/res/layout/menu_settings_button.xml
@@ -2,9 +2,10 @@
 <RelativeLayout
 	android:id="@+id/settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_weight="0.2"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_weight="1"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+	android:adjustViewBounds="true">
     
     <ImageView
         android:id="@+id/image"