diff --git a/app/src/main/res/layout/account_preference.xml b/app/src/main/res/layout/account_preference.xml
index d125df395..1a6f0af47 100644
--- a/app/src/main/res/layout/account_preference.xml
+++ b/app/src/main/res/layout/account_preference.xml
@@ -46,10 +46,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/displayName"
android:layout_alignStart="@id/displayName"
+ android:textColor="?secondaryText"
android:maxLines="4"
- android:text="@string/preferences_account_default_name"
- android:textColor="?primaryText"
- app:fontFamily="@font/metropolis_bold" />
+ android:text="@string/preferences_account_default_name" />
diff --git a/app/src/main/res/layout/collections_list_item.xml b/app/src/main/res/layout/collections_list_item.xml
index ccf81e587..99fb2b038 100644
--- a/app/src/main/res/layout/collections_list_item.xml
+++ b/app/src/main/res/layout/collections_list_item.xml
@@ -56,7 +56,7 @@
android:ellipsize="end"
android:maxLines="2"
android:minLines="2"
- android:textAppearance="@style/SubtitleTextStyle"
+ android:textColor="?secondaryText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/collection_item"
app:layout_constraintStart_toStartOf="@+id/collection_item"
diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index 10d9e3cb6..88e156ef4 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -47,6 +47,7 @@
android:textAllCaps="false"
android:textColor="@color/neutral_text"
android:textSize="16sp"
+ android:fontFamily="@font/metropolis_bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@+id/guideline"
@@ -163,7 +164,7 @@
android:text="@string/create_collection_save_to_collection_empty"
android:textColor="?neutral"
android:textSize="16sp"
- android:textStyle="bold"
+ android:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/save_button"
app:layout_constraintStart_toEndOf="@id/bottom_bar_icon_button"
@@ -176,7 +177,8 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:text="@string/create_collection_save"
- android:textColor="?neutral"
+ android:textColor="@color/photonWhite"
+ app:fontFamily="@font/metropolis_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index 5e396d4a2..f08e5937b 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -140,6 +140,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/create_collection_add_new_collection"
+ android:fontFamily="@font/metropolis"
android:textColor="?neutral"
android:textSize="16sp"
android:textStyle="bold"
diff --git a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
index 0fe88a045..cf63025bb 100644
--- a/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
+++ b/app/src/main/res/layout/fragment_tracking_protection_blocking.xml
@@ -14,14 +14,14 @@
+ android:text="@string/enhanced_tracking_protection_blocked" />
+ android:textAlignment="viewStart" />
12dp
8dp
8dp
- 8dp
+ 18dp
18dp
40dp
20dp
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 961374f94..e84b80112 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -450,7 +450,7 @@