From be9174b246adef1ac53b82b6952b717b918f0e6b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Mar 2019 11:59:37 +0100
Subject: [PATCH] Finished renaming font_xx fonts to know what they are used
 for...

---
 .../linphone/chat/ChatMessagesOldAdapter.java |  3 +-
 .../org/linphone/chat/ImdnOldFragment.java    |  2 +-
 app/src/main/res/layout-land/about.xml        | 13 ++-
 .../assistant_codec_downloader.xml            | 14 +--
 app/src/main/res/layout-land/call.xml         |  4 +-
 .../assistant_account_creation.xml            | 30 +++---
 .../assistant_codec_downloader.xml            | 14 +--
 .../assistant_linphone_login.xml              | 16 ++--
 .../layout-sw533dp-land/assistant_login.xml   | 18 ++--
 .../layout-sw533dp-land/assistant_welcome.xml | 12 +--
 app/src/main/res/layout-sw533dp-land/main.xml |  2 +-
 .../assistant_codec_downloader.xml            | 14 +--
 app/src/main/res/layout-sw533dp/main.xml      |  2 +-
 .../assistant_codec_downloader.xml            | 14 +--
 app/src/main/res/layout/about.xml             | 22 ++---
 .../res/layout/assistant_account_creation.xml | 31 +++---
 ...stant_account_creation_code_activation.xml | 10 +-
 ...tant_account_creation_email_activation.xml | 10 +-
 .../res/layout/assistant_codec_downloader.xml | 14 +--
 .../res/layout/assistant_country_list.xml     |  2 +-
 .../res/layout/assistant_ec_calibration.xml   |  2 +-
 .../res/layout/assistant_linphone_login.xml   | 18 ++--
 app/src/main/res/layout/assistant_login.xml   | 18 ++--
 .../layout/assistant_remote_provisioning.xml  | 10 +-
 .../assistant_remote_provisioning_login.xml   | 12 +--
 app/src/main/res/layout/assistant_topbar.xml  |  2 +-
 app/src/main/res/layout/assistant_welcome.xml | 13 ++-
 app/src/main/res/layout/call.xml              |  4 +-
 app/src/main/res/layout/call_inactive_row.xml |  3 +-
 app/src/main/res/layout/chat.xml              |  2 +-
 .../main/res/layout/chat_bubble_content.xml   |  2 +-
 app/src/main/res/layout/chat_bubble_old.xml   |  6 +-
 app/src/main/res/layout/chat_create.xml       |  4 +-
 app/src/main/res/layout/chatlist_cell.xml     |  5 +-
 .../main/res/layout/conf_call_control_row.xml |  2 +-
 app/src/main/res/layout/conference_header.xml |  4 +-
 app/src/main/res/layout/contact_cell.xml      |  2 +-
 app/src/main/res/layout/country_cell.xml      |  4 +-
 app/src/main/res/layout/file_upload_cell.xml  |  4 +-
 app/src/main/res/layout/history_cell.xml      |  2 +-
 app/src/main/res/layout/history_detail.xml    |  2 +-
 app/src/main/res/layout/in_app.xml            |  2 +-
 .../main/res/layout/in_app_purchase_item.xml  |  4 +-
 app/src/main/res/layout/in_app_store.xml      |  9 +-
 app/src/main/res/layout/main.xml              |  1 +
 app/src/main/res/layout/new_password.xml      |  4 +-
 app/src/main/res/layout/recording_cell.xml    |  4 +-
 app/src/main/res/layout/recordings_list.xml   |  2 +-
 .../res/layout/side_menu_account_cell.xml     |  2 +-
 .../main/res/layout/side_menu_item_cell.xml   |  2 +-
 app/src/main/res/values/styles.xml            | 96 ++++++-------------
 51 files changed, 228 insertions(+), 266 deletions(-)

diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
index 465e37cfd..a43ba0fae 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java
@@ -287,7 +287,8 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                 holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
                 Compatibility.setTextAppearance(
                         holder.contactName, mContext, R.style.contact_organization_font);
-                Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
+                Compatibility.setTextAppearance(
+                        holder.fileTransferAction, mContext, R.style.button_font);
                 holder.fileTransferAction.setBackgroundResource(
                         R.drawable.resizable_assistant_button);
             }
diff --git a/app/src/main/java/org/linphone/chat/ImdnOldFragment.java b/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
index ae31f3acf..ae38309d9 100644
--- a/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
+++ b/app/src/main/java/org/linphone/chat/ImdnOldFragment.java
@@ -153,7 +153,7 @@ public class ImdnOldFragment extends Fragment {
             Compatibility.setTextAppearance(
                     mBubble.contactName, getActivity(), R.style.contact_organization_font);
             Compatibility.setTextAppearance(
-                    mBubble.fileTransferAction, getActivity(), R.style.font8);
+                    mBubble.fileTransferAction, getActivity(), R.style.button_font);
             mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
         }
 
diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index d5f66f9a1..fd2722636 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -29,7 +29,9 @@
                 android:src="@drawable/splashscreen" />
 
             <TextView
-                style="@style/font15"
+                android:textColor="?attr/secondaryTextColor"
+                android:textAllCaps="true"
+                android:textSize="16sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -38,7 +40,8 @@
                 android:visibility="gone" />
 
             <TextView
-                style="@style/font3"
+                android:textSize="13sp"
+                android:textColor="?accentColor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -55,7 +58,7 @@
 
             <TextView
                 android:id="@+id/about_android_version"
-                style="@style/font12"
+                style="@style/about_version_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
@@ -63,7 +66,7 @@
 
             <TextView
                 android:id="@+id/about_liblinphone_sdk_version"
-                style="@style/font12"
+                style="@style/about_version_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
@@ -83,7 +86,7 @@
 
         <TextView
             android:id="@+id/about_link"
-            style="@style/font2"
+            style="@style/link_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout-land/assistant_codec_downloader.xml b/app/src/main/res/layout-land/assistant_codec_downloader.xml
index 00f29fc76..1d28702ba 100644
--- a/app/src/main/res/layout-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-land/assistant_codec_downloader.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/question"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/downloading"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
@@ -42,7 +42,7 @@
 
     <Button
         android:id="@+id/answerNo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -55,7 +55,7 @@
 
     <Button
         android:id="@+id/answerYes"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/progressBar"
@@ -67,7 +67,7 @@
 
     <Button
         android:id="@+id/answerOk"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerYes"
@@ -78,7 +78,7 @@
 
     <TextView
         android:id="@+id/downloaded"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
@@ -89,7 +89,7 @@
 
     <TextView
         android:id="@+id/downloadingInfo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/progressBar"
diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index 255e4b9c7..e2db164c5 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -102,7 +102,7 @@
                             android:src="@drawable/waiting_time" />
 
                         <TextView
-                            style="@style/font16"
+                            style="@style/call_status_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
@@ -159,7 +159,7 @@
                         android:src="@drawable/waiting_time" />
 
                     <TextView
-                        style="@style/font16"
+                        style="@style/call_status_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
index b667e7a1a..b4671409b 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -12,7 +12,7 @@
 
         <TextView
             android:id="@+id/assistant_title"
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -21,7 +21,7 @@
 
         <TextView
             android:id="@+id/message_create_account"
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -55,7 +55,7 @@
 
                         <TextView
                             android:id="@+id/phone_number_label"
-                            style="@style/font13"
+                            style="@style/assistant_input_field_header_font"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/phone_number"
@@ -80,7 +80,7 @@
 
                         <Button
                             android:id="@+id/select_country"
-                            style="@style/font8"
+                            style="@style/button_font"
                             android:layout_width="0dp"
                             android:layout_height="40dp"
                             android:layout_weight="1"
@@ -126,7 +126,7 @@
 
                             <TextView
                                 android:id="@+id/phone_number_error"
-                                style="@style/font20"
+                                style="@style/assistant_input_field_error_font"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="@string/error"
@@ -164,7 +164,7 @@
 
                     <TextView
                         android:id="@+id/username_label"
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/username"
@@ -182,7 +182,7 @@
 
                     <TextView
                         android:id="@+id/username_error"
-                        style="@style/font20"
+                        style="@style/assistant_input_field_error_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/error"
@@ -202,7 +202,7 @@
 
                     <TextView
                         android:id="@+id/password_label"
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/password"
@@ -222,7 +222,7 @@
 
                     <TextView
                         android:id="@+id/password_error"
-                        style="@style/font20"
+                        style="@style/assistant_input_field_error_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/error"
@@ -249,7 +249,7 @@
 
                     <TextView
                         android:id="@+id/email_label"
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/email"
@@ -270,7 +270,7 @@
 
                     <TextView
                         android:id="@+id/email_error"
-                        style="@style/font20"
+                        style="@style/assistant_input_field_error_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/error"
@@ -290,7 +290,7 @@
 
                     <TextView
                         android:id="@+id/confirm_password_label"
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/confirm_password"
@@ -311,7 +311,7 @@
 
                     <TextView
                         android:id="@+id/confirm_password_error"
-                        style="@style/font20"
+                        style="@style/assistant_input_field_error_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/error"
@@ -364,7 +364,7 @@
 
         <Button
             android:id="@+id/assistant_create"
-            style="@style/font8"
+            style="@style/button_font"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:layout_gravity="center"
@@ -377,7 +377,7 @@
 
         <TextView
             android:id="@+id/assistant_skip"
-            style="@style/font10"
+            android:textSize="18sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml b/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
index 8abe9a35b..fb7df5620 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_codec_downloader.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/question"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/downloading"
@@ -39,7 +39,7 @@
 
     <TextView
         android:id="@+id/downloading"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@+id/question"
@@ -51,7 +51,7 @@
 
     <Button
         android:id="@+id/answerNo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -64,7 +64,7 @@
 
     <Button
         android:id="@+id/answerYes"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerOk"
@@ -76,7 +76,7 @@
 
     <Button
         android:id="@+id/answerOk"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerNo"
@@ -87,7 +87,7 @@
 
     <TextView
         android:id="@+id/downloaded"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -99,7 +99,7 @@
 
     <TextView
         android:id="@+id/downloadingInfo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_above="@+id/answerOk"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
index 47f7441e9..bfb4aad45 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -7,7 +7,7 @@
     android:padding="30dp">
 
     <TextView
-        style="@style/font6"
+        style="@style/standard_text_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/message_phone_number"
-        style="@style/font11"
+        style="@style/standard_small_text_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -46,7 +46,7 @@
 
                 <Button
                     android:id="@+id/select_country"
-                    style="@style/font8"
+                    style="@style/button_font"
                     android:layout_width="0dp"
                     android:layout_height="40dp"
                     android:layout_marginTop="15dp"
@@ -67,7 +67,7 @@
 
                         <TextView
                             android:id="@+id/phone_number_label"
-                            style="@style/font13"
+                            style="@style/assistant_input_field_header_font"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/phone_number"
@@ -113,7 +113,7 @@
 
                     <TextView
                         android:id="@+id/phone_number_error_2"
-                        style="@style/font20"
+                        style="@style/assistant_input_field_error_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/error"
@@ -140,7 +140,7 @@
                 android:visibility="gone">
 
                 <TextView
-                    style="@style/font13"
+                    style="@style/assistant_input_field_header_font"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/username"
@@ -169,7 +169,7 @@
                 android:visibility="gone">
 
                 <TextView
-                    style="@style/font13"
+                    style="@style/assistant_input_field_header_font"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/password"
@@ -227,7 +227,7 @@
 
     <Button
         android:id="@+id/assistant_apply"
-        style="@style/font8"
+        style="@style/button_font"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
index f6a50dca4..e2cccbf0f 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
@@ -10,7 +10,7 @@
         android:padding="30dp">
 
         <TextView
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -18,7 +18,7 @@
             android:textAllCaps="true" />
 
         <TextView
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -43,7 +43,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/username"
@@ -68,7 +68,7 @@
                     android:paddingLeft="30dp">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/password"
@@ -97,7 +97,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/assistant_display_name_optional"
@@ -122,7 +122,7 @@
                     android:paddingLeft="30dp">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/domain"
@@ -153,7 +153,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/userid"
@@ -178,7 +178,7 @@
                     android:orientation="vertical">
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
@@ -226,7 +226,7 @@
 
         <Button
             android:id="@+id/assistant_apply"
-            style="@style/font8"
+            style="@style/button_font"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml b/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
index bc7cfbe5c..a55a6c95e 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_welcome.xml
@@ -11,7 +11,7 @@
         android:padding="30dp">
 
         <TextView
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -19,7 +19,7 @@
             android:textAllCaps="true" />
 
         <TextView
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -39,7 +39,7 @@
 
                 <Button
                     android:id="@+id/create_account"
-                    style="@style/font8"
+                    style="@style/button_font"
                     android:layout_width="0dp"
                     android:layout_height="40dp"
                     android:layout_weight="1"
@@ -50,7 +50,7 @@
 
                 <Button
                     android:id="@+id/login_linphone"
-                    style="@style/font8"
+                    style="@style/button_font"
                     android:layout_width="0dp"
                     android:layout_height="40dp"
                     android:layout_marginLeft="30dp"
@@ -68,7 +68,7 @@
 
                 <Button
                     android:id="@+id/login_generic"
-                    style="@style/font8"
+                    style="@style/button_font"
                     android:layout_width="0dp"
                     android:layout_height="40dp"
                     android:layout_weight="1"
@@ -79,7 +79,7 @@
 
                 <Button
                     android:id="@+id/remote_provisioning"
-                    style="@style/font8"
+                    style="@style/button_font"
                     android:layout_width="0dp"
                     android:layout_height="40dp"
                     android:layout_marginLeft="30dp"
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index 33eb2508f..be5d084ab 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -41,7 +41,7 @@
 
                 <TextView
                     android:id="@+id/top_bar_title"
-                    style="@style/font1"
+                    style="@style/accent_colored_title_font"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
diff --git a/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml b/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
index effba2971..179a9860b 100644
--- a/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw533dp/assistant_codec_downloader.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/question"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
@@ -41,7 +41,7 @@
 
     <TextView
         android:id="@+id/downloading"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/downloaded"
@@ -53,7 +53,7 @@
 
     <Button
         android:id="@+id/answerNo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -66,7 +66,7 @@
 
     <Button
         android:id="@+id/answerYes"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerOk"
@@ -78,7 +78,7 @@
 
     <Button
         android:id="@+id/answerOk"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerNo"
@@ -89,7 +89,7 @@
 
     <TextView
         android:id="@+id/downloaded"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/question"
@@ -101,7 +101,7 @@
 
     <TextView
         android:id="@+id/downloadingInfo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/progressBar"
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 91bc29544..46a45b32d 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -41,7 +41,7 @@
 
                 <TextView
                     android:id="@+id/top_bar_title"
-                    style="@style/font1"
+                    style="@style/accent_colored_title_font"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="0.6"
diff --git a/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml b/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
index c270e26b6..5b0b9d6da 100644
--- a/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout-sw720dp-land/assistant_codec_downloader.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/question"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/downloading"
@@ -40,7 +40,7 @@
 
     <TextView
         android:id="@+id/downloading"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignStart="@+id/question"
@@ -52,7 +52,7 @@
 
     <Button
         android:id="@+id/answerNo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -65,7 +65,7 @@
 
     <Button
         android:id="@+id/answerYes"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerOk"
@@ -77,7 +77,7 @@
 
     <Button
         android:id="@+id/answerOk"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/answerNo"
@@ -88,7 +88,7 @@
 
     <TextView
         android:id="@+id/downloaded"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
@@ -100,7 +100,7 @@
 
     <TextView
         android:id="@+id/downloadingInfo"
-        style="@style/font7"
+        style="@style/assistant_codec_downloader_font"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/progressBar"
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 48dccba7e..2ee851511 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -22,16 +22,8 @@
             android:src="@drawable/splashscreen" />
 
         <TextView
-            style="@style/font22"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:text="@string/app_name"
-            android:visibility="gone" />
-
-        <TextView
-            style="@style/font2"
+            android:textSize="13sp"
+            android:textColor="?accentColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -39,7 +31,7 @@
 
         <TextView
             android:id="@+id/about_android_version"
-            style="@style/font12"
+            style="@style/about_version_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -49,7 +41,7 @@
 
         <TextView
             android:id="@+id/about_liblinphone_sdk_version"
-            style="@style/font12"
+            style="@style/about_version_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -69,7 +61,7 @@
 
         <TextView
             android:id="@+id/about_link"
-            style="@style/font2"
+            style="@style/link_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -110,7 +102,7 @@
                 android:layout_margin="5dp"
                 android:background="@drawable/assistant_button"
                 android:textColor="@drawable/assistant_button_text_color"
-                style="@style/font8"
+                style="@style/button_font"
                 android:padding="10dp"
                 android:text="@string/menu_send_log" />
 
@@ -121,7 +113,7 @@
                 android:layout_margin="5dp"
                 android:background="@drawable/assistant_button"
                 android:textColor="@drawable/assistant_button_text_color"
-                style="@style/font8"
+                style="@style/button_font"
                 android:padding="10dp"
                 android:text="@string/menu_reset_log" />
 
diff --git a/app/src/main/res/layout/assistant_account_creation.xml b/app/src/main/res/layout/assistant_account_creation.xml
index 61f416bc2..de04c9a1a 100644
--- a/app/src/main/res/layout/assistant_account_creation.xml
+++ b/app/src/main/res/layout/assistant_account_creation.xml
@@ -13,7 +13,7 @@
 		<TextView
 			android:id="@+id/assistant_title"
 			android:text="@string/assistant_create_account"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:textAllCaps="true"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account_part_1"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
 					<TextView
 						android:id="@+id/phone_number_label"
 						android:text="@string/phone_number"
-						style="@style/font13"
+						style="@style/assistant_input_field_header_font"
 						android:textAllCaps="true"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
@@ -63,9 +63,10 @@
 						android:layout_height="20dp"/>
 
 				</RelativeLayout>
+
 				<Button
 					android:id="@+id/select_country"
-					style="@style/font8"
+					style="@style/button_font"
 					android:text="@string/select_your_country"
 					android:background="@drawable/resizable_assistant_button"
 					android:layout_width="match_parent"
@@ -109,7 +110,7 @@
 					<TextView
 						android:id="@+id/phone_number_error"
 						android:text="@string/error"
-						style="@style/font20"
+						style="@style/assistant_input_field_error_font"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:visibility="invisible"/>
@@ -133,7 +134,7 @@
 				<TextView
 					android:id="@+id/username_label"
 					android:text="@string/username"
-					style="@style/font13"
+					style="@style/assistant_input_field_header_font"
 					android:textAllCaps="true"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
@@ -151,7 +152,7 @@
 				<TextView
 					android:id="@+id/username_error"
 					android:text="@string/error"
-					style="@style/font20"
+					style="@style/assistant_input_field_error_font"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:visibility="invisible"/>
@@ -173,7 +174,7 @@
 					<TextView
 						android:id="@+id/email_label"
 						android:text="@string/email"
-						style="@style/font13"
+						style="@style/assistant_input_field_header_font"
 						android:textAllCaps="true"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
@@ -194,7 +195,7 @@
 					<TextView
 						android:id="@+id/email_error"
 						android:text="@string/error"
-						style="@style/font20"
+						style="@style/assistant_input_field_error_font"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:visibility="invisible"/>
@@ -215,7 +216,7 @@
 
 						<TextView
 							android:id="@+id/password_label"
-							style="@style/font13"
+							style="@style/assistant_input_field_header_font"
 							android:text="@string/password"
 							android:textAllCaps="true"
 							android:layout_width="match_parent"
@@ -236,7 +237,7 @@
 						<TextView
 							android:id="@+id/password_error"
 							android:text="@string/error"
-							style="@style/font20"
+							style="@style/assistant_input_field_error_font"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:visibility="invisible"/>
@@ -252,7 +253,7 @@
 						<TextView
 							android:id="@+id/confirm_password_label"
 							android:text="@string/confirm_password"
-							style="@style/font13"
+							style="@style/assistant_input_field_header_font"
 							android:textAllCaps="true"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"/>
@@ -273,7 +274,7 @@
 						<TextView
 							android:id="@+id/confirm_password_error"
 							android:text="@string/error"
-							style="@style/font20"
+							style="@style/assistant_input_field_error_font"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:visibility="invisible"/>
@@ -309,7 +310,7 @@
 				android:text="@string/assistant_create_account"
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
-				style="@style/font8"
+				style="@style/button_font"
 				android:layout_width="wrap_content"
 				android:layout_height="40dp"
 				android:paddingLeft="10dp"
@@ -321,7 +322,7 @@
 				android:visibility="gone"
 				android:text="@string/maybe_later"
 				android:textColor="?attr/primaryTextColor"
-				style="@style/font10"
+				android:textSize="18sp"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:paddingLeft="10dp"
diff --git a/app/src/main/res/layout/assistant_account_creation_code_activation.xml b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
index f0cb1f63d..1230aa1f8 100644
--- a/app/src/main/res/layout/assistant_account_creation_code_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
@@ -13,7 +13,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:textAllCaps="true"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -22,7 +22,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account_part_2"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
 
 		<TextView
 			android:id="@+id/send_phone_number"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -38,7 +38,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account_part_3"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -60,7 +60,7 @@
 			android:text="@string/assistant_activate"
 			android:background="@drawable/assistant_button"
 			android:textColor="@drawable/assistant_button_text_color"
-			style="@style/font8"
+			style="@style/button_font"
 			android:layout_width="wrap_content"
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
diff --git a/app/src/main/res/layout/assistant_account_creation_email_activation.xml b/app/src/main/res/layout/assistant_account_creation_email_activation.xml
index 8bc1a7ddc..a05ec741a 100644
--- a/app/src/main/res/layout/assistant_account_creation_email_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_email_activation.xml
@@ -13,7 +13,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:textAllCaps="true"
 			android:gravity="center_horizontal"
 			android:layout_width="wrap_content"
@@ -21,7 +21,7 @@
 
 		<TextView
 			android:text="@string/assistant_validate_account_1"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_gravity="center"
@@ -30,7 +30,7 @@
 
 		<TextView
 			android:id="@+id/send_email"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center_horizontal"
 			android:layout_gravity="center"
@@ -39,7 +39,7 @@
 
 		<TextView
 			android:text="@string/assistant_validate_account_2"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:paddingTop="10dp"
 			android:gravity="center"
 			android:layout_gravity="center"
@@ -51,7 +51,7 @@
 			android:text="@string/assistant_finish"
 			android:background="@drawable/assistant_button"
 			android:textColor="@drawable/assistant_button_text_color"
-			style="@style/font8"
+			style="@style/button_font"
 			android:layout_width="wrap_content"
 			android:layout_height="40dp"
 			android:layout_margin="10dp"
diff --git a/app/src/main/res/layout/assistant_codec_downloader.xml b/app/src/main/res/layout/assistant_codec_downloader.xml
index b675553e2..2b5b48c8c 100644
--- a/app/src/main/res/layout/assistant_codec_downloader.xml
+++ b/app/src/main/res/layout/assistant_codec_downloader.xml
@@ -8,7 +8,7 @@
 
 	<TextView
 		android:text="@string/assistant_codec_down_question"
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 		android:layout_alignParentEnd="true"/>
 
 	<TextView
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:text="@string/assistant_codec_downloading"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
@@ -52,7 +52,7 @@
 		android:layout_alignParentStart="true"/>
 
 	<Button
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:text="No"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
@@ -64,7 +64,7 @@
 		android:layout_toStartOf="@+id/imageView" />
 
 	<Button
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:text="Yes"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
 		android:layout_toEndOf="@+id/imageView"/>
 
 	<Button
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:text="Ok"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
 		android:layout_alignTop="@+id/answerYes" />
 
 	<TextView
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:text="@string/assistant_codec_downloaded"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
@@ -99,7 +99,7 @@
 		android:layout_alignParentStart="true"/>
 
 	<TextView
-		style="@style/font7"
+		style="@style/assistant_codec_downloader_font"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/assistant_country_list.xml b/app/src/main/res/layout/assistant_country_list.xml
index b36dbe533..f9152b2b6 100644
--- a/app/src/main/res/layout/assistant_country_list.xml
+++ b/app/src/main/res/layout/assistant_country_list.xml
@@ -11,7 +11,7 @@
         android:padding="10dp">
 
         <TextView
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical|center"
diff --git a/app/src/main/res/layout/assistant_ec_calibration.xml b/app/src/main/res/layout/assistant_ec_calibration.xml
index bf87be6b6..7abdd0e3c 100644
--- a/app/src/main/res/layout/assistant_ec_calibration.xml
+++ b/app/src/main/res/layout/assistant_ec_calibration.xml
@@ -8,7 +8,7 @@
 
 	<TextView
 		android:text="@string/assistant_ec_calibration"
-		style="@style/font6"
+		style="@style/standard_text_font"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/assistant_linphone_login.xml b/app/src/main/res/layout/assistant_linphone_login.xml
index c0af92a12..bee22dd40 100644
--- a/app/src/main/res/layout/assistant_linphone_login.xml
+++ b/app/src/main/res/layout/assistant_linphone_login.xml
@@ -12,7 +12,7 @@
 
 		<TextView
 			android:text="@string/assistant_linphone_account"
-			style="@style/font6"
+			style="@style/standard_text_font"
 			android:textAllCaps="true"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
 
 		<TextView
 			android:text="@string/assistant_create_account_part_1"
-			style="@style/font11"
+			style="@style/standard_small_text_font"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:paddingTop="10dp"
@@ -51,7 +51,7 @@
 					<TextView
 						android:id="@+id/phone_number_label"
 						android:text="@string/phone_number"
-						style="@style/font13"
+						style="@style/assistant_input_field_header_font"
 						android:textAllCaps="true"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
@@ -73,7 +73,7 @@
 
 					<Button
 						android:id="@+id/select_country"
-						style="@style/font8"
+						style="@style/button_font"
 						android:text="@string/select_your_country"
 						android:background="@drawable/resizable_assistant_button"
 						android:layout_width="match_parent"
@@ -119,7 +119,7 @@
 					<TextView
 						android:id="@+id/phone_number_error_2"
 						android:text="@string/error"
-						style="@style/font20"
+						style="@style/assistant_input_field_error_font"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:visibility="invisible"/>
@@ -136,7 +136,7 @@
 
 				<TextView
 					android:text="@string/username"
-					style="@style/font13"
+					style="@style/assistant_input_field_header_font"
 					android:textAllCaps="true"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
@@ -161,7 +161,7 @@
 
 				<TextView
 					android:text="@string/password"
-					style="@style/font13"
+					style="@style/assistant_input_field_header_font"
 					android:textAllCaps="true"
 					android:paddingTop="20dp"
 					android:layout_width="match_parent"
@@ -201,7 +201,7 @@
 				android:text="@string/assistant_login"
 				android:background="@drawable/assistant_button"
 				android:textColor="@drawable/assistant_button_text_color"
-				style="@style/font8"
+				style="@style/button_font"
 				android:layout_width="wrap_content"
 				android:layout_height="40dp"
 				android:paddingLeft="10dp"
@@ -209,5 +209,7 @@
 				android:layout_marginTop="20dp"/>
 
 		</LinearLayout>
+
 	</LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_login.xml b/app/src/main/res/layout/assistant_login.xml
index f3ca4a7d3..4c49549f7 100644
--- a/app/src/main/res/layout/assistant_login.xml
+++ b/app/src/main/res/layout/assistant_login.xml
@@ -10,7 +10,7 @@
         android:padding="30dp">
 
         <TextView
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -19,7 +19,7 @@
             android:textAllCaps="true" />
 
         <TextView
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -35,7 +35,7 @@
             android:orientation="vertical">
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/username"
@@ -52,7 +52,7 @@
                 android:textColor="@color/colorB" />
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dp"
@@ -70,7 +70,7 @@
                 android:textColor="@color/colorB" />
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dp"
@@ -87,7 +87,7 @@
                 android:textColor="@color/colorB" />
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dp"
@@ -105,7 +105,7 @@
                 android:textColor="@color/colorB" />
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dp"
@@ -123,7 +123,7 @@
                 android:textColor="@color/colorB" />
 
             <TextView
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dp"
@@ -165,7 +165,7 @@
 
             <Button
                 android:id="@+id/assistant_apply"
-                style="@style/font8"
+                style="@style/button_font"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning.xml b/app/src/main/res/layout/assistant_remote_provisioning.xml
index 54c90ced2..95f270d22 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning.xml
@@ -8,7 +8,7 @@
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_title"
-		style="@style/font6"
+		style="@style/standard_text_font"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_desc"
-		style="@style/font11"
+		style="@style/standard_small_text_font"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:paddingTop="10dp"
@@ -33,7 +33,7 @@
 
 		<TextView
 			android:text="@string/remote_provisioning_url"
-			style="@style/font13"
+			style="@style/assistant_input_field_header_font"
 			android:textAllCaps="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
@@ -53,7 +53,7 @@
 			android:text="@string/assistant_fetch_apply"
 			android:background="@drawable/assistant_button"
 			android:textColor="@drawable/assistant_button_text_color"
-			style="@style/font8"
+			style="@style/button_font"
 			android:layout_width="wrap_content"
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
@@ -65,7 +65,7 @@
 			android:text="@string/assistant_launch_qrcode"
 			android:background="@drawable/assistant_button"
 			android:textColor="@drawable/assistant_button_text_color"
-			style="@style/font8"
+			style="@style/button_font"
 			android:layout_width="wrap_content"
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_login.xml b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
index 328b58089..7f41790aa 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning_login.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
@@ -7,7 +7,7 @@
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_title"
-		style="@style/font6"
+		style="@style/standard_text_font"
 		android:textAllCaps="true"
 		android:paddingTop="20dp"
 		android:layout_gravity="center"
@@ -17,7 +17,7 @@
 
 	<TextView
 		android:text="@string/assistant_remote_provisioning_login"
-		style="@style/font11"
+		style="@style/standard_small_text_font"
 		android:layout_gravity="center"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"/>
@@ -32,7 +32,7 @@
 
 		<TextView
 			android:text="@string/username"
-			style="@style/font13"
+			style="@style/assistant_input_field_header_font"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
@@ -52,7 +52,7 @@
 
 		<TextView
 			android:text="@string/password"
-			style="@style/font13"
+			style="@style/assistant_input_field_header_font"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
@@ -73,7 +73,7 @@
 
 		<TextView
 			android:text="@string/domain"
-			style="@style/font13"
+			style="@style/assistant_input_field_header_font"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
@@ -96,7 +96,7 @@
 			android:id="@+id/assistant_connect"
 			android:text="@string/connect"
 			android:background="@drawable/assistant_button"
-			style="@style/font8"
+			style="@style/button_font"
 			android:contentDescription="@string/content_description_valid"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/assistant_topbar.xml b/app/src/main/res/layout/assistant_topbar.xml
index c89e30c28..e6e4b2de0 100644
--- a/app/src/main/res/layout/assistant_topbar.xml
+++ b/app/src/main/res/layout/assistant_topbar.xml
@@ -18,7 +18,7 @@
         android:src="@drawable/back" />
 
     <TextView
-        style="@style/font1"
+        style="@style/accent_colored_title_font"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/assistant_welcome.xml b/app/src/main/res/layout/assistant_welcome.xml
index 810669493..06363e8e6 100644
--- a/app/src/main/res/layout/assistant_welcome.xml
+++ b/app/src/main/res/layout/assistant_welcome.xml
@@ -11,7 +11,7 @@
         android:padding="30dp">
 
         <TextView
-            style="@style/font6"
+            style="@style/standard_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -19,7 +19,7 @@
             android:textAllCaps="true" />
 
         <TextView
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -37,7 +37,7 @@
 
             <Button
                 android:id="@+id/create_account"
-                style="@style/font8"
+                style="@style/button_font"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
@@ -46,10 +46,9 @@
                 android:contentDescription="@string/assistant_create_account"
                 android:text="@string/assistant_create_account" />
 
-
             <Button
                 android:id="@+id/login_linphone"
-                style="@style/font8"
+                style="@style/button_font"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
@@ -60,7 +59,7 @@
 
             <Button
                 android:id="@+id/login_generic"
-                style="@style/font8"
+                style="@style/button_font"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
@@ -71,7 +70,7 @@
 
             <Button
                 android:id="@+id/remote_provisioning"
-                style="@style/font8"
+                style="@style/button_font"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
                 android:layout_marginTop="30dp"
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index e25c933a6..1af34b193 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -102,7 +102,7 @@
                             android:src="@drawable/waiting_time" />
 
                         <TextView
-                            style="@style/font16"
+                            style="@style/call_status_font"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center"
@@ -159,7 +159,7 @@
                         android:src="@drawable/waiting_time" />
 
                     <TextView
-                        style="@style/font16"
+                        style="@style/call_status_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/call_inactive_row.xml b/app/src/main/res/layout/call_inactive_row.xml
index 15194030c..b27a6c699 100644
--- a/app/src/main/res/layout/call_inactive_row.xml
+++ b/app/src/main/res/layout/call_inactive_row.xml
@@ -30,7 +30,8 @@
 
     <Chronometer
         android:id="@+id/call_timer"
-        style="@style/font16"
+        android:textColor="?attr/secondaryTextColor"
+        android:textSize="15sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical|right"
diff --git a/app/src/main/res/layout/chat.xml b/app/src/main/res/layout/chat.xml
index e2e927cf9..7fba1822f 100644
--- a/app/src/main/res/layout/chat.xml
+++ b/app/src/main/res/layout/chat.xml
@@ -177,7 +177,7 @@
 
     <TextView
         android:id="@+id/remote_composing"
-        style="@style/font11"
+        style="@style/standard_small_text_font"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/footer"
diff --git a/app/src/main/res/layout/chat_bubble_content.xml b/app/src/main/res/layout/chat_bubble_content.xml
index c9c7f672f..0d5615149 100644
--- a/app/src/main/res/layout/chat_bubble_content.xml
+++ b/app/src/main/res/layout/chat_bubble_content.xml
@@ -33,7 +33,7 @@
 
     <Button
         android:id="@+id/download"
-        style="@style/font8"
+        style="@style/button_font"
         android:layout_width="137dp"
         android:layout_height="40dp"
         android:layout_margin="5dp"
diff --git a/app/src/main/res/layout/chat_bubble_old.xml b/app/src/main/res/layout/chat_bubble_old.xml
index fc00244fa..3ce3c980d 100644
--- a/app/src/main/res/layout/chat_bubble_old.xml
+++ b/app/src/main/res/layout/chat_bubble_old.xml
@@ -104,14 +104,14 @@
                         android:layout_centerVertical="true"
                         android:background="@drawable/resizable_assistant_button"
                         android:text="@string/open"
-                        android:textAppearance="@style/font8"
+                        android:textAppearance="@style/button_font"
                         android:visibility="gone" />
 
                 </RelativeLayout>
 
                 <TextView
                     android:id="@+id/message"
-                    style="@style/font11"
+                    style="@style/standard_small_text_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:autoLink="web"
@@ -138,7 +138,7 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/progress_bar"
                         android:background="@drawable/resizable_assistant_button"
-                        android:textAppearance="@style/font8" />
+                        android:textAppearance="@style/button_font" />
 
                 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index d4b60389b..3d250e5c0 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -192,7 +192,7 @@
 
             <TextView
                 android:id="@+id/noSipContact"
-                style="@style/font6"
+                style="@style/standard_text_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
@@ -202,7 +202,7 @@
 
             <TextView
                 android:id="@+id/noContact"
-                style="@style/font6"
+                style="@style/standard_text_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/chatlist_cell.xml b/app/src/main/res/layout/chatlist_cell.xml
index f4eaa29ff..dc3dbf219 100644
--- a/app/src/main/res/layout/chatlist_cell.xml
+++ b/app/src/main/res/layout/chatlist_cell.xml
@@ -36,7 +36,8 @@
 
             <TextView
                 android:id="@+id/date"
-                style="@style/font2"
+                android:textColor="?attr/accentColor"
+                android:textSize="16sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/avatar_layout"
@@ -83,7 +84,7 @@
 
                 <TextView
                     android:id="@+id/lastMessage"
-                    style="@style/font11"
+                    style="@style/standard_small_text_font"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/conf_call_control_row.xml b/app/src/main/res/layout/conf_call_control_row.xml
index de9fd537f..7449f3d2b 100644
--- a/app/src/main/res/layout/conf_call_control_row.xml
+++ b/app/src/main/res/layout/conf_call_control_row.xml
@@ -36,7 +36,7 @@
 
         <Chronometer
             android:id="@+id/call_timer"
-            style="@style/font2"
+            style="@style/call_timer_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical|right"
diff --git a/app/src/main/res/layout/conference_header.xml b/app/src/main/res/layout/conference_header.xml
index 834117046..4e5cc4768 100644
--- a/app/src/main/res/layout/conference_header.xml
+++ b/app/src/main/res/layout/conference_header.xml
@@ -13,14 +13,14 @@
         android:paddingLeft="10dp">
 
         <TextView
-            style="@style/font5"
+            style="@style/header_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/conference" />
 
         <Chronometer
             android:id="@+id/callTimer"
-            style="@style/font2"
+            style="@style/call_timer_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone" />
diff --git a/app/src/main/res/layout/contact_cell.xml b/app/src/main/res/layout/contact_cell.xml
index a1cb61720..ea87d0ed6 100644
--- a/app/src/main/res/layout/contact_cell.xml
+++ b/app/src/main/res/layout/contact_cell.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/separator_text"
-            style="@style/font1"
+            style="@style/accent_colored_title_font"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:gravity="center" />
diff --git a/app/src/main/res/layout/country_cell.xml b/app/src/main/res/layout/country_cell.xml
index 76c937df0..ccc3d74d9 100644
--- a/app/src/main/res/layout/country_cell.xml
+++ b/app/src/main/res/layout/country_cell.xml
@@ -8,13 +8,13 @@
 
     <TextView
         android:id="@+id/country_name"
-        style="@style/font6"
+        style="@style/standard_text_font"
         android:layout_width="wrap_content"
         android:layout_height="match_parent" />
 
     <TextView
         android:id="@+id/country_prefix"
-        style="@style/font6"
+        style="@style/standard_text_font"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:paddingLeft="5dp" />
diff --git a/app/src/main/res/layout/file_upload_cell.xml b/app/src/main/res/layout/file_upload_cell.xml
index f34ca9d7f..4469c6a95 100644
--- a/app/src/main/res/layout/file_upload_cell.xml
+++ b/app/src/main/res/layout/file_upload_cell.xml
@@ -8,7 +8,9 @@
 
     <TextView
         android:id="@+id/pendingFileForUpload"
-        style="@style/font25"
+        android:textColor="?attr/secondaryTextColor"
+        android:textSize="21sp"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
diff --git a/app/src/main/res/layout/history_cell.xml b/app/src/main/res/layout/history_cell.xml
index 61993cef7..3dd784908 100644
--- a/app/src/main/res/layout/history_cell.xml
+++ b/app/src/main/res/layout/history_cell.xml
@@ -14,7 +14,7 @@
 
         <TextView
             android:id="@+id/separator_text"
-            style="@style/font1"
+            style="@style/accent_colored_title_font"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:gravity="center" />
diff --git a/app/src/main/res/layout/history_detail.xml b/app/src/main/res/layout/history_detail.xml
index a9d4c1192..c22016d2a 100644
--- a/app/src/main/res/layout/history_detail.xml
+++ b/app/src/main/res/layout/history_detail.xml
@@ -126,7 +126,7 @@
                         android:background="?attr/dividerColor" />
 
                     <TextView
-                        style="@style/font13"
+                        style="@style/assistant_input_field_header_font"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/in_app.xml b/app/src/main/res/layout/in_app.xml
index 724a71628..d04c6f9c5 100644
--- a/app/src/main/res/layout/in_app.xml
+++ b/app/src/main/res/layout/in_app.xml
@@ -33,7 +33,7 @@
             android:src="@drawable/back" />
 
         <TextView
-            style="@style/font1"
+            style="@style/accent_colored_title_font"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/in_app_purchase_item.xml b/app/src/main/res/layout/in_app_purchase_item.xml
index 0e026a0d1..ab4e45322 100644
--- a/app/src/main/res/layout/in_app_purchase_item.xml
+++ b/app/src/main/res/layout/in_app_purchase_item.xml
@@ -24,14 +24,14 @@
 
         <TextView
             android:id="@+id/purchase_title"
-            style="@style/font7"
+            style="@style/assistant_codec_downloader_font"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:textSize="15sp" />
 
         <TextView
             android:id="@+id/purchase_description"
-            style="@style/font11"
+            style="@style/standard_small_text_font"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/app/src/main/res/layout/in_app_store.xml b/app/src/main/res/layout/in_app_store.xml
index c66108b48..9a480be93 100644
--- a/app/src/main/res/layout/in_app_store.xml
+++ b/app/src/main/res/layout/in_app_store.xml
@@ -20,7 +20,7 @@
 
             <TextView
                 android:id="@+id/username_label"
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/username"
@@ -38,7 +38,7 @@
 
             <TextView
                 android:id="@+id/username_error"
-                style="@style/font20"
+                style="@style/assistant_input_field_error_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/error"
@@ -53,7 +53,7 @@
 
             <TextView
                 android:id="@+id/email_label"
-                style="@style/font13"
+                style="@style/assistant_input_field_header_font"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/email"
@@ -73,11 +73,12 @@
                 android:textCursorDrawable="@null" />
 
         </LinearLayout>
+
     </LinearLayout>
 
     <Button
         android:id="@+id/inapp_button"
-        style="@style/font8"
+        style="@style/button_font"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 213dc3596..f1282f3d4 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -249,6 +249,7 @@
                     android:layout_toRightOf="@id/quit_button"
                     android:gravity="center_vertical"
                     android:text="@string/quit" />
+
             </RelativeLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/new_password.xml b/app/src/main/res/layout/new_password.xml
index d2eeedf8c..c03d54a0d 100644
--- a/app/src/main/res/layout/new_password.xml
+++ b/app/src/main/res/layout/new_password.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/textView"
-        style="@style/font5"
+        style="@style/header_font"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/customText"
-        style="@style/font5"
+        style="@style/header_font"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/app/src/main/res/layout/recording_cell.xml b/app/src/main/res/layout/recording_cell.xml
index eac9dbabc..cf3d888da 100644
--- a/app/src/main/res/layout/recording_cell.xml
+++ b/app/src/main/res/layout/recording_cell.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/separator_text"
-            style="@style/font1"
+            style="@style/accent_colored_title_font"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:gravity="center" />
@@ -94,7 +94,7 @@
 
             <LinearLayout
                 android:id="@+id/record_time"
-                style="@style/font6"
+                style="@style/standard_text_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index e03db8188..db857d5c9 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -24,7 +24,7 @@
 
         <TextView
             android:id="@+id/top_bar_title"
-            style="@style/font1"
+            style="@style/accent_colored_title_font"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.6"
diff --git a/app/src/main/res/layout/side_menu_account_cell.xml b/app/src/main/res/layout/side_menu_account_cell.xml
index 2e818ae7d..cf95151a4 100644
--- a/app/src/main/res/layout/side_menu_account_cell.xml
+++ b/app/src/main/res/layout/side_menu_account_cell.xml
@@ -7,7 +7,7 @@
 
     <TextView
         android:id="@+id/account_address"
-        style="@style/font13"
+        style="@style/assistant_input_field_header_font"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/side_menu_item_cell.xml b/app/src/main/res/layout/side_menu_item_cell.xml
index a4392d4db..b528d3b36 100644
--- a/app/src/main/res/layout/side_menu_item_cell.xml
+++ b/app/src/main/res/layout/side_menu_item_cell.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/item_name"
-        style="@style/font6"
+        style="@style/standard_text_font"
         android:layout_width="match_parent"
         android:layout_height="45dp"
         android:gravity="center_vertical"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e77591e2..dcfd985f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -90,7 +90,7 @@
         <item name="android:textSize">24sp</item>
     </style>
 
-    <style name="font1" parent="@android:style/TextAppearance.Medium">
+    <style name="accent_colored_title_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
@@ -102,7 +102,12 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="font2" parent="@android:style/TextAppearance.Medium">
+    <style name="call_timer_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">?attr/accentColor</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="link_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/accentColor</item>
         <item name="android:textSize">16sp</item>
     </style>
@@ -112,17 +117,12 @@
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="font3" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/accentColor</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
     <style name="big_contact_name_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">30sp</item>
     </style>
 
-    <style name="font5" parent="@android:style/TextAppearance.Medium">
+    <style name="header_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">30sp</item>
     </style>
@@ -147,18 +147,18 @@
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="font6" parent="@android:style/TextAppearance.Medium">
+    <style name="standard_text_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="font7" parent="@android:style/TextAppearance.Medium">
+    <style name="assistant_codec_downloader_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="font8" parent="@android:style/TextAppearance.Medium">
+    <style name="button_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">16sp</item>
@@ -174,17 +174,12 @@
         <item name="android:textSize">18sp</item>
     </style>
 
-    <style name="font10" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
-        <item name="android:textSize">18sp</item>
-    </style>
-
-    <style name="font11" parent="@android:style/TextAppearance.Medium">
+    <style name="standard_small_text_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primarySubtextDarkColor</item>
         <item name="android:textSize">15sp</item>
     </style>
 
-    <style name="font12" parent="@android:style/TextAppearance.Small">
+    <style name="about_version_font" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/colorE</item>
         <item name="android:textSize">16sp</item>
     </style>
@@ -194,7 +189,7 @@
         <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="font13" parent="@android:style/TextAppearance.Medium">
+    <style name="assistant_input_field_header_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primarySubtextLightColor</item>
         <item name="android:textSize">13sp</item>
     </style>
@@ -204,41 +199,17 @@
         <item name="android:textSize">21sp</item>
     </style>
 
-    <style name="font15" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/secondaryTextColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="font16" parent="@android:style/TextAppearance.Small">
+    <style name="call_status_font" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">15sp</item>
     </style>
 
-    <style name="font17" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/secondaryTextColor</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
     <style name="unread_count_font" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/colorH</item>
         <item name="android:textSize">10sp</item>
     </style>
 
-    <style name="font18" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/secondaryTextColor</item>
-        <item name="android:textSize">10sp</item>
-    </style>
-
-    <style name="font19" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="font20" parent="@android:style/TextAppearance.Small">
+    <style name="assistant_input_field_error_font" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">@color/colorI</item>
         <item name="android:textSize">14sp</item>
     </style>
@@ -254,42 +225,18 @@
         <item name="android:textSize">28sp</item>
     </style>
 
-    <style name="font22" parent="@android:style/TextAppearance.Large">
-        <item name="android:textColor">?attr/secondaryTextColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">25sp</item>
-    </style>
-
     <style name="about_license_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">italic</item>
     </style>
 
-    <style name="font23" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textStyle">italic</item>
-    </style>
-
-    <style name="font24" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
     <style name="generated_contact_avatar_font" parent="@android:style/TextAppearance.Small">
         <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">21sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="font25" parent="@android:style/TextAppearance.Small">
-        <item name="android:textColor">?attr/secondaryTextColor</item>
-        <item name="android:textSize">21sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="generated_contact_avatar_100_font" parent="@android:style/TextAppearance.Large">
         <item name="android:textColor">?attr/secondaryTextColor</item>
         <item name="android:textSize">70sp</item>
@@ -431,4 +378,15 @@
         <item name="android:textSize">12sp</item>
     </style>
 
+    <style name="font3" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/accentColor</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
+    <style name="font15" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/secondaryTextColor</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
 </resources>
\ No newline at end of file