diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 9efa1cc17..3e2f49cec 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"/>
+ android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
@@ -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"/>
+ android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+ android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+ android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index df39741d5..db0f0d4bc 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -7,7 +7,5 @@
+ android:layout_height="wrap_content"/>
\ 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 4c4c7ce9a..583544c74 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"/>
+ android:layout_height="wrap_content"/>
\ No newline at end of file