diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 90f2d1b525..dd12c65615 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -33,13 +33,14 @@ open class HomeActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- browsingModeManager = DefaultBrowsingModeManager(this)
-
- setContentView(R.layout.activity_home)
setTheme(themeManager.currentTheme)
DefaultThemeManager.applyStatusBarTheme(window, themeManager, this)
+ browsingModeManager = DefaultBrowsingModeManager(this)
+
+ setContentView(R.layout.activity_home)
+
if (intent?.extras?.getBoolean(OPEN_TO_BROWSER) == true) {
openToBrowser()
}
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index 2a33dec2c2..6a159b8b8c 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -29,7 +29,7 @@ class HomeMenu(
context.getString(R.string.browser_menu_settings),
R.drawable.ic_settings,
context.getString(R.string.browser_menu_settings),
- DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
+ DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
) {
onItemTapped.invoke(HomeMenu.Item.Settings)
},
@@ -38,7 +38,7 @@ class HomeMenu(
context.getString(R.string.browser_menu_library),
R.drawable.ic_library,
context.getString(R.string.browser_menu_library),
- DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
+ DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
) {
onItemTapped.invoke(HomeMenu.Item.Library)
},
@@ -48,7 +48,7 @@ class HomeMenu(
context.getString(R.string.browser_menu_help),
R.drawable.ic_help,
context.getString(R.string.browser_menu_help),
- DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context)
+ DefaultThemeManager.resolveAttribute(R.attr.iconColor, context)
) {
onItemTapped.invoke(HomeMenu.Item.Help)
})
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
index 3c835637ee..35079cc1f8 100644
--- a/app/src/main/res/drawable/ic_about.xml
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -7,7 +7,7 @@
android:viewportWidth="16"
android:viewportHeight="16">
diff --git a/app/src/main/res/drawable/ic_accessibility.xml b/app/src/main/res/drawable/ic_accessibility.xml
index 254921bb6d..b139ab8f92 100644
--- a/app/src/main/res/drawable/ic_accessibility.xml
+++ b/app/src/main/res/drawable/ic_accessibility.xml
@@ -9,5 +9,5 @@
android:viewportHeight="24">
+ android:fillColor="?attr/iconColor" />
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index 001c5806ad..3538d19653 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -5,6 +5,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_bookmark_filled.xml b/app/src/main/res/drawable/ic_bookmark_filled.xml
index 5e5cd5944e..507e265eac 100644
--- a/app/src/main/res/drawable/ic_bookmark_filled.xml
+++ b/app/src/main/res/drawable/ic_bookmark_filled.xml
@@ -10,7 +10,7 @@
diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml
index f29b8088a5..a738d07eb8 100644
--- a/app/src/main/res/drawable/ic_bookmark_outline.xml
+++ b/app/src/main/res/drawable/ic_bookmark_outline.xml
@@ -9,6 +9,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 67b6f4a1ff..57218f9f0a 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -8,6 +8,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_data_collection.xml b/app/src/main/res/drawable/ic_data_collection.xml
index 311d2e66fc..2a7b20d57a 100644
--- a/app/src/main/res/drawable/ic_data_collection.xml
+++ b/app/src/main/res/drawable/ic_data_collection.xml
@@ -9,6 +9,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index a73aad073e..f1c07fcb6e 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -8,7 +8,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_formfill.xml b/app/src/main/res/drawable/ic_formfill.xml
index ae0557b72d..f0b2a3ff82 100644
--- a/app/src/main/res/drawable/ic_formfill.xml
+++ b/app/src/main/res/drawable/ic_formfill.xml
@@ -4,8 +4,8 @@
-
-
-
-
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index 9d605e7fbc..df7b493b68 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -7,10 +7,10 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index 96dd395cf8..1497645f63 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -10,7 +10,6 @@
+ android:fillColor="?attr/iconColor"
+ android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index f131a19705..a2088c9158 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -9,5 +9,5 @@
android:viewportHeight="24">
+ android:fillColor="?attr/iconColor"/>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 3aac2d8380..91359ed129 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -9,6 +9,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index 33784f6a87..c6a70719fb 100644
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@@ -7,7 +7,7 @@
android:viewportWidth="24"
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index 51072c1732..24d3a90adc 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -9,6 +9,6 @@
android:viewportHeight="24">
diff --git a/app/src/main/res/drawable/ic_permission.xml b/app/src/main/res/drawable/ic_permission.xml
index f754db17b7..aa958b9387 100644
--- a/app/src/main/res/drawable/ic_permission.xml
+++ b/app/src/main/res/drawable/ic_permission.xml
@@ -9,5 +9,5 @@
android:viewportHeight="24">
+ android:fillColor="?attr/iconColor" />
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index 8b774bf72e..08f50938fa 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -9,7 +9,6 @@
+ android:fillColor="?attr/iconColor"
+ android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable/ic_report_issues.xml b/app/src/main/res/drawable/ic_report_issues.xml
index cc1dfe6649..3fa4c681f3 100644
--- a/app/src/main/res/drawable/ic_report_issues.xml
+++ b/app/src/main/res/drawable/ic_report_issues.xml
@@ -7,6 +7,6 @@
android:viewportWidth="16"
android:viewportHeight="16">
diff --git a/app/src/main/res/drawable/ic_screenshots.xml b/app/src/main/res/drawable/ic_screenshots.xml
index ce15b65030..c71cfde600 100644
--- a/app/src/main/res/drawable/ic_screenshots.xml
+++ b/app/src/main/res/drawable/ic_screenshots.xml
@@ -10,7 +10,6 @@
+ android:fillColor="?attr/iconColor"
+ android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index df14489d14..3838005b92 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -8,6 +8,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
index b3a0a65f98..2390e61b81 100644
--- a/app/src/main/res/drawable/ic_shortcuts.xml
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -9,7 +9,6 @@
+ android:fillColor="?attr/iconColor"
+ android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable/sign_in_preference_background.xml b/app/src/main/res/drawable/sign_in_preference_background.xml
index 95ba8eeea4..c415797bb8 100644
--- a/app/src/main/res/drawable/sign_in_preference_background.xml
+++ b/app/src/main/res/drawable/sign_in_preference_background.xml
@@ -12,7 +12,7 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index aebbee68e3..6d3151dc76 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -13,7 +13,7 @@
android:id="@+id/navigationToolbar"
android:layout_width="match_parent"
android:layout_height="56dp"
- android:background="@color/off_white"
+ android:background="?attr/toolbarColor"
android:elevation="8dp"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0996454ae1..41b75ddc36 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,6 +10,8 @@
+
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cffcbabcfa..ebf95abcb9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,9 +22,14 @@
#0C0C0D
#f9f9fa
#E9E9ED
- #20233E
#2f26c1
+ #20233E
+ @color/off_white
+
+ @color/off_white
+ @color/private_browsing_top_gradient
+
#1A665BFD
#544CD9
#6D6D6E
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cd47664dc2..f8d7ee39ec 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,9 @@
- @android:color/black
- @style/WindowAnimationTransition
- @color/off_white
+ - @color/off_white
+ - @color/icons_light_mode
+ - @color/toolbar_light_mode
- @android:color/transparent
@@ -36,19 +39,22 @@
- @drawable/home_search_background_dark
- @color/off_white
- - @color/icons
- - @color/icons
+ - @color/icons_light_mode
+ - @color/icons_light_mode
-