diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5be7ca1..bae0341 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,6 +64,7 @@
         <activity android:name=".activities.PeopleActivity"
             android:label="@string/people"
             android:theme="@style/PeopleTheme"
+            android:uiOptions="splitActionBarWhenNarrow"
             android:clearTaskOnLaunch="true"
             android:launchMode="singleTop"
         >
diff --git a/res/drawable/action_bar_tab.xml b/res/drawable/action_bar_tab.xml
new file mode 100644
index 0000000..2fc5c2b
--- /dev/null
+++ b/res/drawable/action_bar_tab.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tab_selected_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/tab_selected_focused" android:state_focused="true"/>
+    <item android:drawable="@drawable/tab_selected" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/tab_selected.xml b/res/drawable/tab_selected.xml
new file mode 100644
index 0000000..36a4175
--- /dev/null
+++ b/res/drawable/tab_selected.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/action_bar_background" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_selected_focused.xml b/res/drawable/tab_selected_focused.xml
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_selected_focused.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/action_bar_background_highlight" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_selected_pressed.xml b/res/drawable/tab_selected_pressed.xml
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_selected_pressed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/action_bar_background_highlight" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_unselected_focused.xml b/res/drawable/tab_unselected_focused.xml
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_unselected_focused.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/action_bar_background_highlight" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/tab_unselected_pressed.xml b/res/drawable/tab_unselected_pressed.xml
new file mode 100644
index 0000000..13aeb4ce
--- /dev/null
+++ b/res/drawable/tab_unselected_pressed.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/action_bar_background_highlight" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 70a2880..96c47b8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 gevind"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gevind"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alle kontakte"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groepe"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Bel terug"</string>
     <string name="callAgain" msgid="3197312117049874778">"Bel weer"</string>
     <string name="returnCall" msgid="8171961914203617813">"Bel terug"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c40080a..f9094bd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 ተገኝቷል"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ተገኝቷል"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"ሁሉም እውቂያዎች"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"ቡድኖች"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"የኋላ ጥሪ"</string>
     <string name="callAgain" msgid="3197312117049874778">"እንደገና ደውል"</string>
     <string name="returnCall" msgid="8171961914203617813">"ጥሪ መልስ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ad73ae0..94cc82c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"تم العثور على جهة اتصال واحدة"</item>
     <item quantity="other" msgid="7988132539476575389">"تم العثور على <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"جميع جهات الاتصال"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"المجموعات"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"معاودة الاتصال"</string>
     <string name="callAgain" msgid="3197312117049874778">"الاتصال مرة أخرى"</string>
     <string name="returnCall" msgid="8171961914203617813">"معاودة اتصال بمكالمة فائتة"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7257b65..63aef0c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 намерен"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> намерени"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Всички контакти"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Групи"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Обратно обаждане"</string>
     <string name="callAgain" msgid="3197312117049874778">"Повторно обаждане"</string>
     <string name="returnCall" msgid="8171961914203617813">"Отговаряне на обаждане"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 985668b..2ddb01b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 contacte"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contactes"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tots els contactes"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grups"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Torna la trucada"</string>
     <string name="callAgain" msgid="3197312117049874778">"Torna a trucar"</string>
     <string name="returnCall" msgid="8171961914203617813">"Retorna la trucada"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a30e8d2..b184550 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Nalezeno: 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Nalezeno: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Všechny kontakty"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupiny"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Zavolat zpět"</string>
     <string name="callAgain" msgid="3197312117049874778">"Zavolat znovu"</string>
     <string name="returnCall" msgid="8171961914203617813">"Zpětné volání"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 20d0ae4..0220035 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 fundet"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> fundet"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alle kontaktpersoner"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Ring tilbage"</string>
     <string name="callAgain" msgid="3197312117049874778">"Ring op igen"</string>
     <string name="returnCall" msgid="8171961914203617813">"Ring tilbage"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bcb8fdd..73dee0c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 gefunden"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gefunden"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alle Kontakte"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruppen"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Rückruf"</string>
     <string name="callAgain" msgid="3197312117049874778">"Erneut anrufen"</string>
     <string name="returnCall" msgid="8171961914203617813">"Zurückrufen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index bdea30e..81d9c7d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Βρέθηκε 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Βρέθηκαν <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Όλες οι επαφές"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Ομάδες"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Επανάκληση"</string>
     <string name="callAgain" msgid="3197312117049874778">"Επανάληψη κλήσης"</string>
     <string name="returnCall" msgid="8171961914203617813">"Επιστροφή κλήσης"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 44135c3..89c3b47 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 found"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> found"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"All contacts"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groups"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Call back"</string>
     <string name="callAgain" msgid="3197312117049874778">"Call again"</string>
     <string name="returnCall" msgid="8171961914203617813">"Return call"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 44135c3..89c3b47 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 found"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> found"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"All contacts"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groups"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Call back"</string>
     <string name="callAgain" msgid="3197312117049874778">"Call again"</string>
     <string name="returnCall" msgid="8171961914203617813">"Return call"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3b42096..5c38ef7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Se encontró uno (1)"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrado(s)"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Todos los contactos"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Volver a llamar"</string>
     <string name="callAgain" msgid="3197312117049874778">"Llamar nuevamente"</string>
     <string name="returnCall" msgid="8171961914203617813">"Regresar llamada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4fa8b50..ec7f983 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Todos los contactos"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Llamar"</string>
     <string name="callAgain" msgid="3197312117049874778">"Volver a llamar"</string>
     <string name="returnCall" msgid="8171961914203617813">"Devolver llamada"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 695060e..aeda968 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 leitud"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> leitud"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Kõik kontaktid"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupid"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Helista tagasi"</string>
     <string name="callAgain" msgid="3197312117049874778">"Helista uuesti"</string>
     <string name="returnCall" msgid="8171961914203617813">"Tagasihelistamine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 42a1067..4482164 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 مورد پیدا شد"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> یافت شد"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"همه مخاطبین"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"گروه‌ها"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"بازگرداندن تماس"</string>
     <string name="callAgain" msgid="3197312117049874778">"تماس مجدد"</string>
     <string name="returnCall" msgid="8171961914203617813">"برگشت تماس"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 94b6af3..83ef687 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Löytyi 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Löytyi <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Kaikki kontaktit"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Ryhmät"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Soita takaisin"</string>
     <string name="callAgain" msgid="3197312117049874778">"Soita uudelleen"</string>
     <string name="returnCall" msgid="8171961914203617813">"Soita takaisin"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a7c9a00..1f4f60b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 contact trouvé"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contacts trouvés"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tous les contacts"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groupes"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Rappeler"</string>
     <string name="callAgain" msgid="3197312117049874778">"Renouveler l\'appel"</string>
     <string name="returnCall" msgid="8171961914203617813">"Rappeler"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fff196e..418bffa 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 contact trouvé"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contact(s) trouvé(s)"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tous les contacts"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groupes"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Rappeler"</string>
     <string name="callAgain" msgid="3197312117049874778">"Renouveler l\'appel"</string>
     <string name="returnCall" msgid="8171961914203617813">"Rappeler"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e989b87..403b65a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 मिला"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> मिले"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"सभी संपर्क"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"समूह"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"कॉल बैक करें"</string>
     <string name="callAgain" msgid="3197312117049874778">"फिर से कॉल करें"</string>
     <string name="returnCall" msgid="8171961914203617813">"रिटर्न कॉल"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 72e8ced..3f58133 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 pronađen"</item>
     <item quantity="other" msgid="7988132539476575389">"Pronađeno kontakata: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Svi kontakti"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupe"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Povratni poziv"</string>
     <string name="callAgain" msgid="3197312117049874778">"Zovi ponovo"</string>
     <string name="returnCall" msgid="8171961914203617813">"Povratni poziv"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a683e21..fc5dfc2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 találat"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> találat"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Az összes névjegy"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Csoportok"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Visszahívás"</string>
     <string name="callAgain" msgid="3197312117049874778">"Hívásismétlés"</string>
     <string name="returnCall" msgid="8171961914203617813">"Visszahívás"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 3e5c85f..077ebd0 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"գտնվել է 1-ը"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> գտնված"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Բոլոր կոնտակտները"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Խմբեր"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Հետ զանգել"</string>
     <string name="callAgain" msgid="3197312117049874778">"Կրկին զանգել"</string>
     <string name="returnCall" msgid="8171961914203617813">"Հետ զանգել"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c2201f0..132d4aa 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Ada 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Ada <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Semua kontak"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grup"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Hubungi kembali"</string>
     <string name="callAgain" msgid="3197312117049874778">"Hubungi sekali lagi"</string>
     <string name="returnCall" msgid="8171961914203617813">"Panggilan kembali"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index dd5a590..56ab669 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 trovato"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> trovati"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tutti i contatti"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruppi"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Richiama"</string>
     <string name="callAgain" msgid="3197312117049874778">"Richiama"</string>
     <string name="returnCall" msgid="8171961914203617813">"Chiama numero"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 994c2b7..4165090 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"נמצא אחד"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> נמצאו"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"כל אנשי הקשר"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"קבוצות"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"התקשר חזרה"</string>
     <string name="callAgain" msgid="3197312117049874778">"התקשר שוב"</string>
     <string name="returnCall" msgid="8171961914203617813">"התקשר בחזרה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8db0f97..6f9b0d2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1件見つかりました"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g>件見つかりました"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"すべての連絡先"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"グループ"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"コールバック"</string>
     <string name="callAgain" msgid="3197312117049874778">"再発信"</string>
     <string name="returnCall" msgid="8171961914203617813">"発信"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 1b95760..b40ec62 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"მოიძებნა 1"</item>
     <item quantity="other" msgid="7988132539476575389">"მოიძებნა <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"ყველა კონტატი"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"ჯგუფები"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"გადარეკვა"</string>
     <string name="callAgain" msgid="3197312117049874778">"დარეკვა ხელახლა"</string>
     <string name="returnCall" msgid="8171961914203617813">"გადარეკვა"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index b02ced7..1812c70 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"បាន​រក​ឃើញ ១"</item>
     <item quantity="other" msgid="7988132539476575389">"បាន​រក​ឃើញ <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"ទំនាក់ទំនង​ទាំងអស់"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"ក្រុម"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"ហៅ​ទៅវិញ"</string>
     <string name="callAgain" msgid="3197312117049874778">"ហៅ​ម្ដងទៀត"</string>
     <string name="returnCall" msgid="8171961914203617813">"ហៅ​ទៅវិញ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2259517..bb53ed6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1개를 찾았습니다."</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g>개를 찾았습니다."</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"모든 연락처"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"그룹"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"전화 걸기"</string>
     <string name="callAgain" msgid="3197312117049874778">"다시 걸기"</string>
     <string name="returnCall" msgid="8171961914203617813">"전화 걸기"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 4e30abb..137efd9 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"ພົບ 1 ລາຍຊື່"</item>
     <item quantity="other" msgid="7988132539476575389">"ພົບ <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"ກຸ່ມ"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"ໂທກັບ"</string>
     <string name="callAgain" msgid="3197312117049874778">"ໂທອີກເທື່ອນຶ່ງ"</string>
     <string name="returnCall" msgid="8171961914203617813">"ໂທກັບ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f33a59e..18f5e58 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"rastas 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Rasta <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Visi kontaktai"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupės"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Perskambinti"</string>
     <string name="callAgain" msgid="3197312117049874778">"Skambinti dar kartą"</string>
     <string name="returnCall" msgid="8171961914203617813">"Grįžtamasis skambutis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8563ecf..d4d39f7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Atrasta 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Atrastas <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Visas kontaktpersonas"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupas"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Atzvanīt"</string>
     <string name="callAgain" msgid="3197312117049874778">"Zvanīt vēlreiz"</string>
     <string name="returnCall" msgid="8171961914203617813">"Atzvanīt"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 3623e32..c86cd5e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 олдсон"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> олдсон"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Бүх харилцагчид"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Бүлгэмүүд"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Буцааж залгах"</string>
     <string name="callAgain" msgid="3197312117049874778">"Дахин залгана уу"</string>
     <string name="returnCall" msgid="8171961914203617813">"Буцааж залгах"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2e1e685..eaf1ecb 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 ditemui"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ditemui"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Semua kenalan"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Kumpulan"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Panggil balik"</string>
     <string name="callAgain" msgid="3197312117049874778">"Panggil semula"</string>
     <string name="returnCall" msgid="8171961914203617813">"Balas panggilan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 758f5ba..70aa076 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 funnet"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> funnet"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alle kontakter"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Ring tilbake"</string>
     <string name="callAgain" msgid="3197312117049874778">"Ring på nytt"</string>
     <string name="returnCall" msgid="8171961914203617813">"Ring tilbake"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f237149..1b570a4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 gevonden"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gevonden"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alle contacten"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Groepen"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Terugbellen"</string>
     <string name="callAgain" msgid="3197312117049874778">"Opnieuw bellen"</string>
     <string name="returnCall" msgid="8171961914203617813">"Terugbellen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5666721..5f8cba6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Znaleziono: 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Znaleziono: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Wszystkie kontakty"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupy"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Oddzwoń"</string>
     <string name="callAgain" msgid="3197312117049874778">"Zadzwoń ponownie"</string>
     <string name="returnCall" msgid="8171961914203617813">"Połączenie zwrotne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f2a1012..a2e6609 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrado(s)"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Todos os contactos"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Chamada de retorno"</string>
     <string name="callAgain" msgid="3197312117049874778">"Ligar novamente"</string>
     <string name="returnCall" msgid="8171961914203617813">"Devolver chamada"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index da5c68c..db402f8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Um encontrado"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Todos os contatos"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Retornar chamada"</string>
     <string name="callAgain" msgid="3197312117049874778">"Chamar novamente"</string>
     <string name="returnCall" msgid="8171961914203617813">"Retornar chamada"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 5da350b..15b6e0e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -137,9 +137,9 @@
     <item quantity="one" msgid="4826918429708286628">"chattà 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Chattà <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
     <skip />
-    <!-- no translation found for contactsGroupsLabel (2841971472518003524) -->
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
     <skip />
     <string name="callBack" msgid="5498224409038809224">"Telefonar enavos"</string>
     <string name="callAgain" msgid="3197312117049874778">"Telefonar anc ina giada"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d95fa53..8e61383 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"A fost găsită 1 persoană din agendă"</item>
     <item quantity="other" msgid="7988132539476575389">"Au fost găsite <xliff:g id="COUNT">%d</xliff:g> (de) persoane din agendă"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Toată Agenda"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupuri"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Apelaţi din nou"</string>
     <string name="callAgain" msgid="3197312117049874778">"Apelaţi din nou"</string>
     <string name="returnCall" msgid="8171961914203617813">"Apelaţi înapoi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3fe1958..0e92c0b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Найдено: 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Найдено: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Все контакты"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Группы"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Перезвонить"</string>
     <string name="callAgain" msgid="3197312117049874778">"Позвонить снова"</string>
     <string name="returnCall" msgid="8171961914203617813">"Перезвонить"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8907fba..33439ff 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Počet nájdených položiek: 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Počet nájdených položiek: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Všetky kontakty"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupiny"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Zavolať späť"</string>
     <string name="callAgain" msgid="3197312117049874778">"Zavolať znova"</string>
     <string name="returnCall" msgid="8171961914203617813">"Zavolať späť"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a4e2a0d..d65ca2c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 najden"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> najdenih"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Vsi stiki"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupine"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Povratni klic"</string>
     <string name="callAgain" msgid="3197312117049874778">"Ponovi klic"</string>
     <string name="returnCall" msgid="8171961914203617813">"Povratni klic"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9b84cdb..12f5f51 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 пронађен"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> пронађено"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Сви контакти"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Групе"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Узврати позив"</string>
     <string name="callAgain" msgid="3197312117049874778">"Позови поново"</string>
     <string name="returnCall" msgid="8171961914203617813">"Узврати позив"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c1d284c..42b34ae 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 hittades"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> hittades"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Alla kontakter"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Ring upp"</string>
     <string name="callAgain" msgid="3197312117049874778">"Ring igen"</string>
     <string name="returnCall" msgid="8171961914203617813">"Ring upp"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d7ab013..79f858b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Patikana 1"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> zimepatikana"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Anwani zote"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Vikundi"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Mpigie"</string>
     <string name="callAgain" msgid="3197312117049874778">"Piga simu tena"</string>
     <string name="returnCall" msgid="8171961914203617813">"Mpigie"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f6c15bd..de8bd1d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"พบ 1 รายการ"</item>
     <item quantity="other" msgid="7988132539476575389">"พบ <xliff:g id="COUNT">%d</xliff:g> รายการ"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"ที่อยู่ติดต่อทั้งหมด"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"กลุ่ม"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"ติดต่อกลับ"</string>
     <string name="callAgain" msgid="3197312117049874778">"โทรอีกครั้ง"</string>
     <string name="returnCall" msgid="8171961914203617813">"โทรกลับ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4251c51..1c3763a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 ang nakita"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ang nakita"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Lahat ng contact"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Mga Pangkat"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Tumawag pabalik"</string>
     <string name="callAgain" msgid="3197312117049874778">"Tawagan muli"</string>
     <string name="returnCall" msgid="8171961914203617813">"Pabalik na tawag"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ea9c4dc..6cf3540 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"1 kişi bulundu"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> kişi bulundu"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tüm kişiler"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruplar"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Geri ara"</string>
     <string name="callAgain" msgid="3197312117049874778">"Tekrar çağrı yap"</string>
     <string name="returnCall" msgid="8171961914203617813">"Geri ara"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 02bea9f..a9233fb 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Знайдено 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Знайдено <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Усі контакти"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Групи"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Передзвонити"</string>
     <string name="callAgain" msgid="3197312117049874778">"Набрати знову"</string>
     <string name="returnCall" msgid="8171961914203617813">"Зворот. виклик"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 6fcc36e..30d35f8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"Đã tìm thấy 1"</item>
     <item quantity="other" msgid="7988132539476575389">"Đã tìm thấy <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Tất cả liên hệ"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Nhóm"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Gọi lại"</string>
     <string name="callAgain" msgid="3197312117049874778">"Gọi lại"</string>
     <string name="returnCall" msgid="8171961914203617813">"Gọi lại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7a98e46..ec0c3a5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"找到 1 个联系人"</item>
     <item quantity="other" msgid="7988132539476575389">"找到 <xliff:g id="COUNT">%d</xliff:g> 个联系人"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"所有联系人"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"群组"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"回电"</string>
     <string name="callAgain" msgid="3197312117049874778">"重拨"</string>
     <string name="returnCall" msgid="8171961914203617813">"回拨"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index afdd5fa..4b8ed26 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"找到 1 位聯絡人"</item>
     <item quantity="other" msgid="7988132539476575389">"找到 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"全部聯絡人"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"群組"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"回撥電話"</string>
     <string name="callAgain" msgid="3197312117049874778">"重撥"</string>
     <string name="returnCall" msgid="8171961914203617813">"回覆來電"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 131aac7..1342577 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"找到 1 位聯絡人"</item>
     <item quantity="other" msgid="7988132539476575389">"找到 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"所有聯絡人"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"群組"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"回播電話"</string>
     <string name="callAgain" msgid="3197312117049874778">"重撥"</string>
     <string name="returnCall" msgid="8171961914203617813">"回電"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d72c8e6..c5822dd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -104,8 +104,10 @@
     <item quantity="one" msgid="4826918429708286628">"otholakele ongu-1"</item>
     <item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> tholakele"</item>
   </plurals>
-    <string name="contactsAllLabel" msgid="6479708629170672169">"Bonke oxhumana nabo"</string>
-    <string name="contactsGroupsLabel" msgid="2841971472518003524">"Amaqembu"</string>
+    <!-- no translation found for all_contacts_tab_label (6250372293594147703) -->
+    <skip />
+    <!-- no translation found for favorites_tab_label (1524869648904016414) -->
+    <skip />
     <string name="callBack" msgid="5498224409038809224">"Phinda ushayele"</string>
     <string name="callAgain" msgid="3197312117049874778">"Shayela futhi"</string>
     <string name="returnCall" msgid="8171961914203617813">"Buyisela ikholi"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fc5674b..e3fab85 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,6 +36,4 @@
     <!-- Color of the text for buttons in the action bar  -->
     <color name="action_bar_button_text_color">#FFFFFF</color>
 
-    <!-- Color of the selected tab underline (overriding value in ContactsCommon) -->
-    <color name="tab_selected_color">#ffeeff41</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4c59480..971bfc2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -273,11 +273,13 @@
         <item quantity="other"><xliff:g id="count">%d</xliff:g> found</item>
     </plurals>
 
-    <!-- The title of "all contacts" tab. [CHAR LIMIT=14] -->
-    <string name="all_contacts_tab_label">All contacts</string>
+    <!-- The content description for the "all contacts" tab.
 
-    <!-- The title of "favorites" tab. [CHAR LIMIT=14] -->
-    <string name="favorites_tab_label">Favorites</string>
+         Note: AccessibilityServices use this attribute to announce what the view represents.
+         This is especially valuable for views without textual representation like ImageView.
+
+         [CHAR LIMIT=NONE] -->
+    <string name="contactsAllLabel">All contacts</string>
 
     <!-- Action string for calling back a number in the call log -->
     <string name="callBack">Call back</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f171bb4..3129189 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,18 +53,14 @@
         <item name="android:listViewStyle">@style/ListViewStyle</item>
     </style>
 
-    <style name="PeopleTheme" parent="@android:style/Theme.Quantum.Light">
+    <style name="PeopleTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
-        <!-- Style for the tabs -->
-        <item name="android:actionBarTabStyle">@style/ContactsActionBarTabStyle</item>
-        <!-- Style for the tab bar (for the divider between tabs) -->
-        <item name="android:actionBarTabBarStyle">@style/ContactsActionBarTabBarStyle</item>
-        <!-- Style for the tab bar text (for text on tabs) -->
-        <item name="android:actionBarTabTextStyle">@style/ContactsActionBarTabTextStyle</item>
-        <!-- Style for the overflow button in the actionbar. -->
-        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflowQP</item>
-        <!-- Color of action bar button text -->
-        <item name="android:actionMenuTextColor">@color/actionbar_text_color</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_menu_back</item>
+        <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item>
+        <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
+        <item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
+        <item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
+        <item name="android:actionDropDownStyle">@style/ContactsActionBarDropDownStyle</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
@@ -103,46 +99,11 @@
         <item name="android:src">@drawable/ic_overflow_menu</item>
     </style>
 
-    <style name="ContactsActionBarStyle" parent="@android:style/Widget.Quantum.Light.ActionBar">
-        <item name="android:background">@color/actionbar_background_color</item>
-        <item name="android:titleTextStyle">@style/ContactsActionBarTitleText</item>
-        <item name="android:backgroundStacked">@color/actionbar_background_color</item>
-        <item name="android:backgroundSplit">@color/actionbar_background_color</item>
-        <!-- Empty icon -->
-        <item name="android:icon">@android:color/transparent</item>
-    </style>
-
-    <!-- Styling for tabs. -->
-    <style name="ContactsActionBarTabStyle" parent="@android:style/Widget.Quantum.Light.ActionBar.TabView">
+    <style name="ContactsActionBarStyle" parent="@android:Widget.Holo.Light.ActionBar">
         <item name="android:background">@drawable/action_bar_tab</item>
-        <item name="android:showDividers">none</item>
-    </style>
-
-    <!-- Text in the action bar at the top of the screen -->
-    <style name="ContactsActionBarTitleText"
-           parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title">
-        <item name="android:textColor">@color/actionbar_text_color</item>
-    </style>
-
-    <!-- Styling for the tab bar; handles styling of the divider line. -->
-    <style name="ContactsActionBarTabBarStyle"
-           parent="@android:style/Widget.Quantum.ActionBar.TabBar">
-        <item name="android:showDividers">none</item>
-    </style>
-
-    <!-- Text style for tabs. -->
-    <style name="ContactsActionBarTabTextStyle"
-           parent="android:style/Widget.Quantum.Light.ActionBar.TabText">
-        <item name="android:textColor">@color/tab_text_color</item>
-        <item name="android:textSize">@dimen/tab_text_size</item>
-        <item name="android:fontFamily">@string/tab_font_family</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <!-- Action bar overflow menu icon. -->
-    <style name="ContactsActionBarOverflowQP"
-           parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_menu_overflow_lt</item>
+        <item name="android:backgroundSplit">@drawable/action_bar_tab</item>
+        <item name="android:backgroundStacked">@drawable/action_bar_tab</item>
+        <item name="android:displayOptions"></item>
     </style>
 
     <style name="ContactsActionBarDropDownStyle" parent="@android:style/Widget.Holo.Light.Spinner">
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index b8cd32e..efad12f 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -82,6 +82,7 @@
     private final MyNavigationListener mNavigationListener;
 
     private boolean mShowHomeIcon;
+    private boolean mShowTabsAsText;
 
     public interface TabState {
         public static int FAVORITES = 0;
@@ -131,6 +132,7 @@
         mShowHomeIcon = mContext.getResources().getBoolean(R.bool.show_home_icon);
 
         // On wide screens, show the tabs as text (instead of icons)
+        mShowTabsAsText = isUsingTwoPanes;
         if (isUsingTwoPanes) {
             mActionBarNavigationMode = ActionBar.NAVIGATION_MODE_LIST;
             mTabListener = null;
@@ -175,15 +177,15 @@
     }
 
     private void setupTabs() {
-        addTab(TabState.FAVORITES, R.string.favorites_tab_label);
-        addTab(TabState.ALL, R.string.all_contacts_tab_label);
+        addTab(TabState.FAVORITES, R.drawable.ic_tab_starred, R.string.contactsFavoritesLabel);
+        addTab(TabState.ALL, R.drawable.ic_tab_all, R.string.contactsAllLabel);
     }
 
     private void setupNavigationList() {
         ArrayAdapter<String> navAdapter = new CustomArrayAdapter(mContext,
                 R.layout.people_navigation_item);
-        navAdapter.add(mContext.getString(R.string.favorites_tab_label));
-        navAdapter.add(mContext.getString(R.string.all_contacts_tab_label));
+        navAdapter.add(mContext.getString(R.string.contactsFavoritesLabel));
+        navAdapter.add(mContext.getString(R.string.contactsAllLabel));
         mActionBar.setListNavigationCallbacks(navAdapter, mNavigationListener);
     }
 
@@ -248,10 +250,15 @@
         mListener = listener;
     }
 
-    private void addTab(int expectedTabIndex, int description) {
+    private void addTab(int expectedTabIndex, int icon, int description) {
         final Tab tab = mActionBar.newTab();
         tab.setTabListener(mTabListener);
-        tab.setText(description);
+        if (mShowTabsAsText) {
+            tab.setText(description);
+        } else {
+            tab.setIcon(icon);
+            tab.setContentDescription(description);
+        }
         mActionBar.addTab(tab);
         if (expectedTabIndex != tab.getPosition()) {
             throw new IllegalStateException("Tabs must be created in the right order");
@@ -392,8 +399,6 @@
         }
         mActionBar.setHomeButtonEnabled(mSearchMode);
 
-
-
         if (current != newFlags) {
             // Pass the mask here to preserve other flags that we're not interested here.
             mActionBar.setDisplayOptions(newFlags, MASK);
@@ -444,6 +449,7 @@
                         getNavigationItemPositionFromTabPosition(mCurrentTab));
                 mNavigationListener.mIgnoreNavigationItemSelected = false;
             }
+            mActionBar.setTitle(null);
             // Since we have the {@link SearchView} in a custom action bar, we must manually handle
             // collapsing the {@link SearchView} when search mode is exited.
             if (isIconifiedChanging) {