diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index a87362008f..da7d0eead1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -299,7 +299,7 @@ public class FragmentAccount extends FragmentBase {
             @Override
             public void onClick(View v) {
                 FragmentDialogColor fragment = new FragmentDialogColor();
-                fragment.initialize(R.string.title_account_color, color, new Bundle(), getContext());
+                fragment.initialize(R.string.title_color, color, new Bundle(), getContext());
                 fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR);
                 fragment.show(getFragmentManager(), "account:color");
             }
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 32bbb0a58c..c478a61a52 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -288,18 +288,27 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />
 
+            <TextView
+                android:id="@+id/tvColor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/title_color"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/etName" />
+
             <Button
                 android:id="@+id/btnColor"
                 style="@style/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:tag="disable"
-                android:text="@string/title_account_color"
+                android:text="@string/title_select"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/etName" />
+                app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
             <View
                 android:id="@+id/vwColor"
@@ -750,7 +759,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
                 tvUser,etUser,tvPassword,tilPassword,tvRealm,etRealm,
-                tvName,tvNameRemark,etName,btnColor,vwColor,ibColorDefault,tvColorPro" />
+                tvName,tvNameRemark,etName,tvColor,btnColor,vwColor,ibColorDefault,tvColorPro" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpAdvanced"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 9da7f1a611..82b70cc4f5 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -106,18 +106,27 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
 
+            <TextView
+                android:id="@+id/tvColor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/title_color"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/etDisplay" />
+
             <Button
                 android:id="@+id/btnColor"
                 style="@style/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:tag="disable"
-                android:text="@string/title_account_color"
+                android:text="@string/title_select"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/etDisplay" />
+                app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
             <View
                 android:id="@+id/vwColor"
@@ -652,7 +661,7 @@
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
             tvName,etName,tvEmail,etEmail,tvDisplay,etDisplay,
-            btnColor,vwColor,ibColorDefault,tvColorPro,
+            tvColor,btnColor,vwColor,ibColorDefault,tvColorPro,
             tvSignature,etSignature,btnHtml,
             btnAdvanced,btnSave" />
 
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index ee2976c836..0709795a4c 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -386,18 +386,27 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvHours" />
 
+            <TextView
+                android:id="@+id/tvColor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/title_color"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/npDuration" />
+
             <Button
                 android:id="@+id/btnColor"
                 style="@style/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:tag="disable"
-                android:text="@string/title_account_color"
+                android:text="@string/title_select"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/npDuration" />
+                app:layout_constraintTop_toBottomOf="@id/tvColor" />
 
             <View
                 android:id="@+id/vwColor"
@@ -538,7 +547,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 app:constraint_referenced_ids="
-                btnColor,vwColor,ibColorDefault" />
+                tvColor,btnColor,vwColor,ibColorDefault" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpMove"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91df860742..8704f27468 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -311,7 +311,7 @@
     <string name="title_account_interval_hint">Frequency of refreshing the connection for push messages or frequency of checking for new messages</string>
     <string name="title_account_partial_fetch_hint">Disable this only in case of empty messages or corrupt attachments</string>
     <string name="title_account_signature">Signature text</string>
-    <string name="title_account_color">Color</string>
+    <string name="title_color">Color</string>
     <string name="title_account_notify">Separate notifications</string>
     <string name="title_account_left">Swipe left</string>
     <string name="title_account_right">Swipe right</string>