diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 9efa1cc17e86a7cb4cc7ddce0887390c6539627a..3e2f49cecbb64a696916c9bb1e928a585bd7ab38 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -223,8 +223,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_session_established"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/session_est"
@@ -232,9 +231,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
-                                    tools:ignore="RtlHardcoded"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                             </TableRow>
 
                         </TableLayout>
@@ -257,8 +254,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_pep"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_pep"
@@ -266,8 +262,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -281,8 +276,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_blocking"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_blocking"
@@ -290,8 +284,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -305,8 +298,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_stream_management"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_sm"
@@ -314,8 +306,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -329,8 +320,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_roster_version"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_roster_version"
@@ -338,8 +328,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -353,8 +342,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_carbon_messages"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_carbons"
@@ -362,8 +350,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -377,8 +364,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_mam"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_mam"
@@ -386,8 +372,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -401,8 +386,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_csi"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_csi"
@@ -410,8 +394,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"
                                     tools:ignore="RtlHardcoded"/>
                             </TableRow>
 
@@ -426,8 +409,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_push"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_push"
@@ -435,8 +417,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                             </TableRow>
 
                             <TableRow
@@ -449,8 +430,7 @@
                                     android:ellipsize="end"
                                     android:singleLine="true"
                                     android:text="@string/server_info_http_upload"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
                                 <TextView
                                     android:id="@+id/server_info_http_upload"
@@ -458,8 +438,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="right"
                                     android:paddingLeft="4dp"
-                                    android:textColor="?attr/color_text_primary"
-                                    android:textSize="?attr/TextSizeBody"/>
+                                    android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                             </TableRow>
                         </TableLayout>
 
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index df39741d56a30eb8ff1848048cb59c838da72f77..db0f0d4bc7280b4510ca169ebf90ecb000cbfcfe 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -7,7 +7,5 @@
     <CheckBox
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?attr/color_text_primary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index 4c4c7ce9a99b220135ea768d123f3ee0e272a0f4..583544c74a5e660c75ef7712d3720a37defdb675 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -8,14 +8,10 @@
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="?attr/color_text_primary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
 
     <EditText
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textColor="?attr/color_text_primary"
-        android:textColorHint="?attr/color_text_secondary"
-        android:textSize="?attr/TextSizeBody"/>
+        android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file