diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
index 0918366d2d3..1825b31ad49 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveShieldsMenuAdapter.java
@@ -89,7 +89,6 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
private static final float ENTER_STANDARD_ITEM_OFFSET_X_DP = 10.f;
private static final String BRAVE_SHIELDS_GREY = "#F2F2F2";
- private static final String BRAVE_SHIELDS_BLACK = "#000000";
private static final String BRAVE_SHIELDS_WHITE = "#FFFFFF";
private static final String BRAVE_GROUP_TITLE_COLOR = "#6B6B6B";
private static final String ADS_AND_TRACKERS_COLOR = "#FB542B";
@@ -210,7 +209,6 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
if (0 == position) {
convertView = mInflater.inflate(R.layout.brave_shields_switcher, parent, false);
setupSwitchClick((Switch)convertView.findViewById(R.id.brave_shields_switch));
- convertView.setBackgroundColor(Color.parseColor(BRAVE_SHIELDS_GREY));
// We should set layouts for switch rows
} else if (1 == position || 2 == position || 8 == position || 14 == position) {
convertView = mInflater.inflate(R.layout.brave_shields_text_item, parent, false);
@@ -221,7 +219,8 @@ class BraveShieldsMenuAdapter extends BaseAdapter {
} else if (8 == position) {
text.setText(R.string.brave_shields_second_group_title);
} else if (1 == position) {
- text.setTextColor(Color.parseColor(BRAVE_SHIELDS_BLACK));
+ text.setTextColor(convertView.getContext().getResources().getColor(
+ R.color.standard_mode_tint));
text.setTextSize(20);
text.setText(mTitle);
} else {
diff --git a/android/java/res/layout/brave_rewards_panel.xml b/android/java/res/layout/brave_rewards_panel.xml
index f18a29baa81..eee6c472176 100644
--- a/android/java/res/layout/brave_rewards_panel.xml
+++ b/android/java/res/layout/brave_rewards_panel.xml
@@ -523,10 +523,10 @@
android:layout_marginTop="2dp"
android:padding="5dp"
android:text="@string/brave_ui_not_verified_publisher_description"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="12sp"
- android:textColor="@color/modern_grey_700"
android:background="@drawable/brave_rewards_not_verified_rectangle"
android:visibility="gone"/>
@@ -614,6 +614,7 @@
android:layout_gravity="start|center"
android:layout_marginStart="10dp"
android:text="@string/brave_ui_token_grant_claimed"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="14sp"
@@ -640,6 +641,7 @@
android:layout_gravity="end"
android:layout_marginStart="10dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="end"
android:textSize="12sp"
@@ -655,6 +657,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@string/brave_ui_earnings_ads"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="14sp"
@@ -683,6 +686,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="end"
android:textSize="12sp"
@@ -697,6 +701,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@string/brave_ui_rewards_contribute"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="14sp"
@@ -725,6 +730,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="end"
android:textSize="12sp"
@@ -740,6 +746,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@string/brave_ui_one_time_donation"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="14sp"
@@ -768,6 +775,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="end"
android:textSize="12sp"
@@ -783,6 +791,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@string/brave_ui_recurring_donation"
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="14sp"
@@ -811,6 +820,7 @@
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="end"
android:textSize="12sp"
@@ -826,6 +836,7 @@
android:layout_marginStart="10dp"
android:padding="5dp"
android:text=""
+ android:textColor="@color/modern_grey_700"
android:fontFamily="sans-serif"
android:gravity="start"
android:textSize="12sp"
diff --git a/android/java/res/layout/brave_rewards_panel_grant.xml b/android/java/res/layout/brave_rewards_panel_grant.xml
index f81a8f46d64..ed2052bcad8 100644
--- a/android/java/res/layout/brave_rewards_panel_grant.xml
+++ b/android/java/res/layout/brave_rewards_panel_grant.xml
@@ -45,6 +45,7 @@
android:text=""
android:gravity="center"
android:layout_gravity="center_horizontal"
+ android:textColor="@color/modern_grey_700"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"/>
@@ -83,4 +84,4 @@
android:visibility="gone"/>
-
\ No newline at end of file
+
diff --git a/android/java/res/layout/brave_set_default_browser_dialog.xml b/android/java/res/layout/brave_set_default_browser_dialog.xml
index a1390759315..710ab793371 100644
--- a/android/java/res/layout/brave_set_default_browser_dialog.xml
+++ b/android/java/res/layout/brave_set_default_browser_dialog.xml
@@ -7,16 +7,18 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="8dp"
- android:background="#FFF">
+ android:background="@drawable/brave_sync_top_rounded">
+ android:layout_gravity="center_vertical"
+ android:textColor="@color/brave_set_default_dialog_text_color"/>
diff --git a/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml b/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
index 38a299519de..0865066f3b5 100644
--- a/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brave_shields_block_3rd_party_cookies_switch"
+ android:textColor="@color/standard_mode_tint"
android:orientation="horizontal"
android:paddingStart="10dp"
android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_ads_tracking_switcher.xml b/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
index ded1b511da7..a336a4a4fb5 100644
--- a/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
+++ b/android/java/res/layout/brave_shields_ads_tracking_switcher.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brave_shields_ads_tracking_switch"
+ android:textColor="@color/standard_mode_tint"
android:orientation="horizontal"
android:paddingStart="10dp"
android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml b/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
index 0c4237ba6bb..7b2524036b8 100644
--- a/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_fingerprints_blocked_switcher.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brave_shields_block_fingerprints_switch"
+ android:textColor="@color/standard_mode_tint"
android:orientation="horizontal"
android:paddingStart="10dp"
android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_https_upgrade_switcher.xml b/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
index 703a4bd98ed..ead43f3043c 100644
--- a/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
+++ b/android/java/res/layout/brave_shields_https_upgrade_switcher.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brave_shields_https_everywhere_switch"
+ android:textColor="@color/standard_mode_tint"
android:orientation="horizontal"
android:paddingStart="10dp"
android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_menu_item.xml b/android/java/res/layout/brave_shields_menu_item.xml
index 3bb76c2e6da..23bf4d7ef5a 100644
--- a/android/java/res/layout/brave_shields_menu_item.xml
+++ b/android/java/res/layout/brave_shields_menu_item.xml
@@ -22,7 +22,7 @@
android:textSize="16sp"
android:fontFamily="sans-serif"
android:textStyle="normal"
- android:textColor="#696969"
+ android:textColor="@color/standard_mode_tint"
android:gravity="start|center_vertical"
android:layout_gravity="center_vertical"
android:paddingStart="10dp" />
diff --git a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
index f45edb359f3..982ce19051a 100644
--- a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
+++ b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brave_shields_blocks_scripts_switch"
+ android:textColor="@color/standard_mode_tint"
android:orientation="horizontal"
android:paddingStart="10dp"
android:gravity="start|center_vertical"
diff --git a/android/java/res/layout/brave_shields_switcher.xml b/android/java/res/layout/brave_shields_switcher.xml
index 1b9b6a77f18..a58b101e799 100644
--- a/android/java/res/layout/brave_shields_switcher.xml
+++ b/android/java/res/layout/brave_shields_switcher.xml
@@ -1,27 +1,33 @@
-
-
-
-
+ android:orientation="horizontal"
+ android:background="@color/brave_shield_bg_color" >
+
+
+
+
+
diff --git a/android/java/res/layout/brave_shields_text_item.xml b/android/java/res/layout/brave_shields_text_item.xml
index 20ee218449c..715ff846865 100644
--- a/android/java/res/layout/brave_shields_text_item.xml
+++ b/android/java/res/layout/brave_shields_text_item.xml
@@ -13,5 +13,5 @@
android:textSize="14sp"
android:fontFamily="sans-serif"
android:textStyle="normal"
- android:textColor="#6b6b6b" />
+ android:textColor="@color/standard_mode_tint" />
diff --git a/android/java/res/layout/brave_stats_layout.xml b/android/java/res/layout/brave_stats_layout.xml
index 91c7e9a31be..4e070ee6b37 100644
--- a/android/java/res/layout/brave_stats_layout.xml
+++ b/android/java/res/layout/brave_stats_layout.xml
@@ -80,7 +80,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:textColor="#222326"
+ android:textColor="@color/brave_state_time_count_color"
android:textStyle="bold"
android:textSize="24sp" />
#FF1893
#4F30AB
+ @color/default_primary_color
+ #222326
+
@color/modern_grey_50
@color/modern_grey_50
@android:color/white
+ @color/modern_grey_700
+
#fb542b
+ #392DD1
diff --git a/android/java/res/values/brave_styles.xml b/android/java/res/values/brave_styles.xml
index 6dc14e95911..79c6922506d 100644
--- a/android/java/res/values/brave_styles.xml
+++ b/android/java/res/values/brave_styles.xml
@@ -14,7 +14,9 @@
- true
diff --git a/android/java/res_night/values-night/brave_colors.xml b/android/java/res_night/values-night/brave_colors.xml
new file mode 100644
index 00000000000..b604a44b61c
--- /dev/null
+++ b/android/java/res_night/values-night/brave_colors.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ @android:color/white
+ #343A40
+ #478AFF
+
+ #FA7250
+ #FF1893
+ #A78AFF
+
+ #495057
+
+ #212529
+
+ @color/modern_grey_800
+ @android:color/white
+
+
+ @color/modern_grey_800
+ @color/modern_grey_800
+ #212529
+
+ @android:color/white
+
+