diff --git a/res/drawable-xhdpi/chat_default.png b/res/drawable-xhdpi/chat_default.png
index e9c671361..bcd5e9621 100644
Binary files a/res/drawable-xhdpi/chat_default.png and b/res/drawable-xhdpi/chat_default.png differ
diff --git a/res/drawable-xhdpi/chat_over.png b/res/drawable-xhdpi/chat_over.png
index 415b33a84..08bbb3345 100644
Binary files a/res/drawable-xhdpi/chat_over.png and b/res/drawable-xhdpi/chat_over.png differ
diff --git a/res/drawable-xhdpi/chat_selected.png b/res/drawable-xhdpi/chat_selected.png
index a7fff16a8..9b1eed184 100644
Binary files a/res/drawable-xhdpi/chat_selected.png and b/res/drawable-xhdpi/chat_selected.png differ
diff --git a/res/drawable-xhdpi/contacts_default.png b/res/drawable-xhdpi/contacts_default.png
index fb2146a91..a6d96b10d 100644
Binary files a/res/drawable-xhdpi/contacts_default.png and b/res/drawable-xhdpi/contacts_default.png differ
diff --git a/res/drawable-xhdpi/contacts_over.png b/res/drawable-xhdpi/contacts_over.png
index 7e0f661ba..e6a8994ff 100644
Binary files a/res/drawable-xhdpi/contacts_over.png and b/res/drawable-xhdpi/contacts_over.png differ
diff --git a/res/drawable-xhdpi/contacts_selected.png b/res/drawable-xhdpi/contacts_selected.png
index 04f579806..a304e6edb 100644
Binary files a/res/drawable-xhdpi/contacts_selected.png and b/res/drawable-xhdpi/contacts_selected.png differ
diff --git a/res/drawable-xhdpi/dialer_default.png b/res/drawable-xhdpi/dialer_default.png
index 2fc61b3af..6d1957b1a 100644
Binary files a/res/drawable-xhdpi/dialer_default.png and b/res/drawable-xhdpi/dialer_default.png differ
diff --git a/res/drawable-xhdpi/dialer_over.png b/res/drawable-xhdpi/dialer_over.png
index 7b718469f..13b5f34ab 100644
Binary files a/res/drawable-xhdpi/dialer_over.png and b/res/drawable-xhdpi/dialer_over.png differ
diff --git a/res/drawable-xhdpi/dialer_selected.png b/res/drawable-xhdpi/dialer_selected.png
index 80cd520f5..47b0c03b6 100644
Binary files a/res/drawable-xhdpi/dialer_selected.png and b/res/drawable-xhdpi/dialer_selected.png differ
diff --git a/res/drawable-xhdpi/history_default.png b/res/drawable-xhdpi/history_default.png
index 92a298d2f..0442b1472 100644
Binary files a/res/drawable-xhdpi/history_default.png and b/res/drawable-xhdpi/history_default.png differ
diff --git a/res/drawable-xhdpi/history_over.png b/res/drawable-xhdpi/history_over.png
index 1d2ddf91c..f2f973f84 100644
Binary files a/res/drawable-xhdpi/history_over.png and b/res/drawable-xhdpi/history_over.png differ
diff --git a/res/drawable-xhdpi/history_selected.png b/res/drawable-xhdpi/history_selected.png
index bf1a0867c..dd14c83dc 100644
Binary files a/res/drawable-xhdpi/history_selected.png and b/res/drawable-xhdpi/history_selected.png differ
diff --git a/res/drawable-xhdpi/mark.png b/res/drawable-xhdpi/mark.png
index 38aa8a2c5..1d6bf7550 100644
Binary files a/res/drawable-xhdpi/mark.png and b/res/drawable-xhdpi/mark.png differ
diff --git a/res/drawable-xhdpi/settings_default.png b/res/drawable-xhdpi/settings_default.png
index 8acb31e7c..97b0ba031 100644
Binary files a/res/drawable-xhdpi/settings_default.png and b/res/drawable-xhdpi/settings_default.png differ
diff --git a/res/drawable-xhdpi/settings_over.png b/res/drawable-xhdpi/settings_over.png
index c73168440..0cabe2002 100644
Binary files a/res/drawable-xhdpi/settings_over.png and b/res/drawable-xhdpi/settings_over.png differ
diff --git a/res/drawable-xhdpi/settings_selected.png b/res/drawable-xhdpi/settings_selected.png
index 6070b2c09..790153366 100644
Binary files a/res/drawable-xhdpi/settings_selected.png and b/res/drawable-xhdpi/settings_selected.png differ
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 5d2482705..7767b807e 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -118,11 +118,11 @@
         <ImageView
             android:id="@+id/dialer"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="0.2"
 			android:adjustViewBounds="true"
+			android:scaleType="fitCenter"
             android:contentDescription="@string/content_description_dialer"
-            android:scaleType="fitXY"
             android:src="@drawable/dialer" />
         
         <include layout="@layout/menu_about_chat_button" />
diff --git a/res/layout/menu_chat_button.xml b/res/layout/menu_chat_button.xml
index 135cd8c14..52d67795e 100644
--- a/res/layout/menu_chat_button.xml
+++ b/res/layout/menu_chat_button.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
 	android:id="@+id/chat"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     
     <ImageView
@@ -11,7 +11,6 @@
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:contentDescription="@string/content_description_chat"
-		android:scaleType="fitXY"
 		android:src="@drawable/chat" />
 
     <TextView
diff --git a/res/layout/menu_contact_button.xml b/res/layout/menu_contact_button.xml
index def2a4161..59f337e4b 100644
--- a/res/layout/menu_contact_button.xml
+++ b/res/layout/menu_contact_button.xml
@@ -3,7 +3,7 @@
 	android:id="@+id/contacts"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_weight="0.2"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     
     <ImageView
@@ -12,7 +12,6 @@
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:contentDescription="@string/content_description_contacts"
-		android:scaleType="fitXY"
 		android:src="@drawable/contacts" />
 
     <TextView
diff --git a/res/layout/menu_history_button.xml b/res/layout/menu_history_button.xml
index 7e1652ef0..9a612edb9 100644
--- a/res/layout/menu_history_button.xml
+++ b/res/layout/menu_history_button.xml
@@ -2,7 +2,7 @@
 <RelativeLayout
 	android:id="@+id/history"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     
     <ImageView
@@ -11,7 +11,6 @@
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:contentDescription="@string/content_description_history"
-		android:scaleType="fitXY"
 		android:src="@drawable/history" />
     
     <TextView
diff --git a/res/layout/menu_settings_button.xml b/res/layout/menu_settings_button.xml
index 379b96605..1f95d8715 100644
--- a/res/layout/menu_settings_button.xml
+++ b/res/layout/menu_settings_button.xml
@@ -3,7 +3,7 @@
 	android:id="@+id/settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_weight="0.2"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     
     <ImageView
@@ -12,7 +12,6 @@
 		android:layout_height="wrap_content"
 		android:adjustViewBounds="true"
 		android:contentDescription="@string/content_description_about"
- 		android:scaleType="fitXY"
 		android:src="@drawable/settings" />
 
     <TextView