diff --git a/res/drawable/contact_add.xml b/res/drawable/contact_add_contact.xml
similarity index 100%
rename from res/drawable/contact_add.xml
rename to res/drawable/contact_add_contact.xml
diff --git a/res/drawable/new_contact.xml b/res/drawable/contacts_add_contact.xml
similarity index 100%
rename from res/drawable/new_contact.xml
rename to res/drawable/contacts_add_contact.xml
diff --git a/res/drawable/all_contacts.xml b/res/drawable/contacts_all.xml
similarity index 61%
rename from res/drawable/all_contacts.xml
rename to res/drawable/contacts_all.xml
index ed171796c..2e9d33e73 100644
--- a/res/drawable/all_contacts.xml
+++ b/res/drawable/contacts_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_all_selected" />
+        android:drawable="@drawable/contacts_all_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_all_default" />
+         android:drawable="@drawable/contacts_all_selected" />
 </selector>
 
diff --git a/res/drawable/linphone_contacts.xml b/res/drawable/contacts_sip.xml
similarity index 56%
rename from res/drawable/linphone_contacts.xml
rename to res/drawable/contacts_sip.xml
index 1b8ff0fd7..022a9eb67 100644
--- a/res/drawable/linphone_contacts.xml
+++ b/res/drawable/contacts_sip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_linphone_selected" />
+        android:drawable="@drawable/contacts_linphone_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_linphone_default" />
+         android:drawable="@drawable/contacts_linphone_selected" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/history_all.xml b/res/drawable/history_all.xml
index 2ce87fc7b..a4c887d87 100644
--- a/res/drawable/history_all.xml
+++ b/res/drawable/history_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" 
-        android:drawable="@drawable/history_all_selected" />
+        android:drawable="@drawable/history_all_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_all_default" />
+         android:drawable="@drawable/history_all_selected" />
 </selector>
 
diff --git a/res/drawable/history_missed.xml b/res/drawable/history_missed.xml
index fef83cb22..e201649fb 100644
--- a/res/drawable/history_missed.xml
+++ b/res/drawable/history_missed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" 
-        android:drawable="@drawable/history_missed_selected" />
+        android:drawable="@drawable/history_missed_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_missed_default" />
+         android:drawable="@drawable/history_missed_selected" />
 </selector>
diff --git a/res/drawable/text_switch_button_color.xml b/res/drawable/text_switch_button_color.xml
index 030d7e721..e883208d1 100644
--- a/res/drawable/text_switch_button_color.xml
+++ b/res/drawable/text_switch_button_color.xml
@@ -1,6 +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_switch" /> 
-     <item android:color="@color/text_switch_selected" />
+           android:color="@color/text_switch_selected" /> 
+     <item android:color="@color/text_switch" />
  </selector>
\ No newline at end of file
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 28ad0a4fb..6a5ae1400 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -28,7 +28,7 @@
         <TextView 
             android:contentDescription="@string/content_description_add_contact"
             android:id="@+id/newContact"
-            android:background="@drawable/contact_add"
+            android:background="@drawable/contact_add_contact"
             android:text="@string/button_add_contact"
             android:gravity="center"
             android:paddingTop="20dp"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 44e56f100..a2bf1ac83 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -23,7 +23,7 @@
         <TextView 
             android:contentDescription="@string/content_description_all_contacts"
             android:id="@+id/allContacts"
-            android:background="@drawable/all_contacts"
+            android:background="@drawable/contacts_all"
             android:text="@string/button_all_contacts"
             android:gravity="center"
             android:paddingTop="20dp"
@@ -38,7 +38,7 @@
         <TextView 
             android:contentDescription="@string/content_description_linphone_contacts"
             android:id="@+id/linphoneContacts"
-            android:background="@drawable/linphone_contacts"
+            android:background="@drawable/contacts_sip"
             android:text="@string/button_sip_contacts"
             android:gravity="center"
             android:paddingTop="20dp"
@@ -53,7 +53,7 @@
         <TextView 
             android:contentDescription="@string/content_description_add_contact"
             android:id="@+id/newContact"
-            android:background="@drawable/new_contact"
+            android:background="@drawable/contacts_add_contact"
             android:text="@string/button_add_contact"
             android:gravity="center"
             android:paddingTop="20dp"