diff --git a/res/drawable/text_color.xml b/res/drawable/text_color.xml
index e58dadddb..fb75a7ce9 100644
--- a/res/drawable/text_color.xml
+++ b/res/drawable/text_color.xml
@@ -3,6 +3,6 @@
      <item android:state_pressed="true"
            android:color="@color/text_over" />
      <item android:state_selected="true"
-           android:color="@color/text_selected" /> 
+           android:color="@color/text_selected" />
      <item android:color="@color/text_default" />
  </selector>
\ No newline at end of file
diff --git a/res/drawable/text_incall_button_color.xml b/res/drawable/text_incall_button_color.xml
new file mode 100644
index 000000000..9431c27e4
--- /dev/null
+++ b/res/drawable/text_incall_button_color.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+     <item android:state_pressed="true"
+           android:color="@color/text_button_over" />
+     <item android:state_selected="true"
+           android:color="@color/text_button_selected" />
+     <item android:state_enabled="false"
+		   android:color="@color/text_button_disabled" />
+     <item android:color="@color/text_button" />
+ </selector>
\ No newline at end of file
diff --git a/res/drawable/switch_button_text_color.xml b/res/drawable/text_switch_button_color.xml
similarity index 53%
rename from res/drawable/switch_button_text_color.xml
rename to res/drawable/text_switch_button_color.xml
index a849928bc..030d7e721 100644
--- a/res/drawable/switch_button_text_color.xml
+++ b/res/drawable/text_switch_button_color.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
  <selector xmlns:android="http://schemas.android.com/apk/res/android">
      <item android:state_enabled="false"
-           android:color="@color/text_button" /> 
-           
-     <item android:color="@color/text_button_selected" />
+           android:color="@color/text_switch" /> 
+     <item android:color="@color/text_switch_selected" />
  </selector>
\ No newline at end of file
diff --git a/res/layout-land/incall.xml b/res/layout-land/incall.xml
index 0d7272a95..30402fe3d 100644
--- a/res/layout-land/incall.xml
+++ b/res/layout-land/incall.xml
@@ -96,7 +96,7 @@
 	            android:text="@string/button_transfer"
 	            android:gravity="center"
 	            android:paddingTop="50dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -151,7 +151,7 @@
 	            android:text="@string/button_add_call"
 	            android:gravity="center"
 	            android:paddingTop="50dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -195,7 +195,7 @@
 	            android:text="@string/button_video"
 	            android:gravity="center"
 	            android:paddingTop="35dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
@@ -206,7 +206,7 @@
 	            android:text="@string/button_micro"
 	            android:gravity="center"
 	            android:paddingTop="35dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
@@ -226,7 +226,7 @@
 	            android:text="@string/button_speaker"
 	            android:gravity="center"
 	            android:paddingTop="35dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
@@ -237,7 +237,7 @@
 	            android:text="@string/button_options"
 	            android:gravity="center"
 	            android:paddingTop="35dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 14f5c727b..8d6c4bac0 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -17,7 +17,7 @@
             android:text="@string/button_all_contacts"
             android:gravity="center"
             android:paddingTop="25dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
@@ -31,7 +31,7 @@
             android:text="@string/button_sip_contacts"
             android:gravity="center"
             android:paddingTop="25dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index ecb0ae536..8933dc0da 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -32,7 +32,7 @@
             android:text="@string/button_all_call"
             android:gravity="center"
             android:paddingTop="20dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
@@ -46,7 +46,7 @@
             android:text="@string/button_missed_call"
             android:gravity="center"
             android:paddingTop="20dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
diff --git a/res/layout/history_simple.xml b/res/layout/history_simple.xml
index 7854c7e3e..1b1b04be7 100644
--- a/res/layout/history_simple.xml
+++ b/res/layout/history_simple.xml
@@ -32,7 +32,7 @@
             android:text="@string/button_all_call"
             android:gravity="center"
             android:paddingTop="20dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
@@ -46,7 +46,7 @@
             android:text="@string/button_missed_call"
             android:gravity="center"
             android:paddingTop="20dp"
-            android:textColor="@drawable/switch_button_text_color"
+            android:textColor="@drawable/text_switch_button_color"
 		    android:layout_width="match_parent"
 		    android:layout_height="match_parent"
 		    android:scaleType="centerCrop"
diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index fc44e13e1..ac58a3d44 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -83,7 +83,7 @@
 	            android:text="@string/button_transfer"
 	            android:gravity="center"
 	            android:paddingTop="50dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1"
@@ -120,7 +120,7 @@
 	            android:text="@string/button_add_call"
 	            android:gravity="center"
 	            android:paddingTop="50dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1"
@@ -140,7 +140,7 @@
 	            android:text="@string/button_video"
 	            android:gravity="center"
 	            android:paddingTop="45dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1" />
@@ -151,7 +151,7 @@
 	            android:text="@string/button_micro"
 	            android:gravity="center"
 	            android:paddingTop="45dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1" />
@@ -162,7 +162,7 @@
 	            android:text="@string/button_speaker"
 	            android:gravity="center"
 	            android:paddingTop="45dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1" />
@@ -173,7 +173,7 @@
 	            android:text="@string/button_options"
 	            android:gravity="center"
 	            android:paddingTop="45dp"
-	            android:textColor="@color/text_button"
+	            android:textColor="@drawable/text_incall_button_color"
                 android:layout_width="match_parent"
                 android:layout_height="75dp"
                 android:layout_weight="1" />
diff --git a/res/values/color.xml b/res/values/color.xml
index 7b151b1af..815c5347a 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -7,8 +7,13 @@
     <color name="text_default">#ff5b656f</color>
     <color name="text_header">#ff7e8e9e</color>
     
+    <color name="text_switch_selected">#ffffff</color>
+    <color name="text_switch">#ff41484f</color>
+    
     <color name="text_button">#ff41484f</color>
-    <color name="text_button_selected">#ffffff</color>
+    <color name="text_button_disabled">#ffa6b3bf</color>
+    <color name="text_button_selected">#ff41484f</color>
+    <color name="text_button_over">#ffcf4c29</color>
     
     <color name="numpad_background_bottom">#ffe4edf2</color>
     <color name="numpad_background_dialer">#ffd8d8d8</color>