From 7baafe2c375f3bc2ba78c6413ad4b32b3c1ba2bc Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 22 Feb 2019 17:12:29 -0800
Subject: [PATCH] Closes #647 - Private Mode Inherit from Dark Theme

---
 .../main/java/org/mozilla/fenix/HomeActivity.kt  |  7 ++++---
 .../main/java/org/mozilla/fenix/home/HomeMenu.kt |  6 +++---
 app/src/main/res/drawable/ic_about.xml           |  2 +-
 app/src/main/res/drawable/ic_accessibility.xml   |  2 +-
 app/src/main/res/drawable/ic_archive.xml         |  2 +-
 app/src/main/res/drawable/ic_bookmark_filled.xml |  2 +-
 .../main/res/drawable/ic_bookmark_outline.xml    |  2 +-
 app/src/main/res/drawable/ic_close.xml           |  2 +-
 app/src/main/res/drawable/ic_data_collection.xml |  2 +-
 app/src/main/res/drawable/ic_download.xml        |  2 +-
 app/src/main/res/drawable/ic_feedback.xml        |  4 ++--
 app/src/main/res/drawable/ic_formfill.xml        |  8 ++++----
 app/src/main/res/drawable/ic_help.xml            |  4 ++--
 app/src/main/res/drawable/ic_history.xml         |  5 ++---
 app/src/main/res/drawable/ic_home.xml            |  2 +-
 app/src/main/res/drawable/ic_language.xml        |  2 +-
 app/src/main/res/drawable/ic_library.xml         |  2 +-
 app/src/main/res/drawable/ic_login.xml           |  2 +-
 app/src/main/res/drawable/ic_permission.xml      |  2 +-
 app/src/main/res/drawable/ic_qr.xml              |  5 ++---
 app/src/main/res/drawable/ic_report_issues.xml   |  2 +-
 app/src/main/res/drawable/ic_screenshots.xml     |  5 ++---
 app/src/main/res/drawable/ic_search.xml          |  2 +-
 app/src/main/res/drawable/ic_shortcuts.xml       |  5 ++---
 .../drawable/sign_in_preference_background.xml   |  2 +-
 app/src/main/res/layout/activity_home.xml        |  2 +-
 app/src/main/res/menu/library_menu.xml           |  4 ++--
 app/src/main/res/values/attrs.xml                |  2 ++
 app/src/main/res/values/colors.xml               |  7 ++++++-
 app/src/main/res/values/styles.xml               | 16 +++++++++++-----
 30 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 90f2d1b52..dd12c6561 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 2a33dec2c..6a159b8b8 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 3c835637e..35079cc1f 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">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:fillType="evenOdd"
         android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_accessibility.xml b/app/src/main/res/drawable/ic_accessibility.xml
index 254921bb6..b139ab8f9 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">
   <path
       android:pathData="m12,7c1.3807,0 2.5,-1.1193 2.5,-2.5s-1.1193,-2.5 -2.5,-2.5 -2.5,1.1193 -2.5,2.5 1.1193,2.5 2.5,2.5zM4,9c0,-0.5523 0.4477,-1 1,-1h14c0.5523,0 1,0.4477 1,1s-0.4477,1 -1,1h-4v6,5c0,0.5523 -0.4477,1 -1,1s-1,-0.4477 -1,-1v-5h-2v5c0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1v-5,-6h-4c-0.5523,0 -1,-0.4477 -1,-1z"
-      android:fillColor="#0c0c0d" />
+      android:fillColor="?attr/iconColor" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index 001c5806a..3538d1965 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">
   <path
       android:pathData="M13,14.623l1.277,-1.318c0.382,-0.394 1.015,-0.408 1.414,-0.032 0.4,0.377 0.413,1.002 0.032,1.396l-2.933,3.026c-0.387,0.4 -1.033,0.407 -1.43,0.016l-3.067,-3.027c-0.39,-0.385 -0.39,-1.01 0,-1.395s1.024,-0.385 1.414,0L11,14.565v-3.638c0,-0.512 0.448,-0.927 1,-0.927s1,0.415 1,0.927v3.696zM20,8L4,8v11c0,0.552 0.448,1 1,1h14c0.552,0 1,-0.448 1,-1L20,8zM18.79,6l-1.457,-1.66c-0.19,-0.216 -0.464,-0.34 -0.751,-0.34L7.828,4c-0.265,0 -0.52,0.105 -0.707,0.293L5.414,6h13.377zM2,19L2,7.828c0,-0.795 0.316,-1.558 0.879,-2.12l2.828,-2.83C6.27,2.317 7.033,2 7.828,2h8.754c0.863,0 1.684,0.372 2.254,1.02l2.418,2.754c0.48,0.547 0.746,1.251 0.746,1.98L22,19c0,1.657 -1.343,3 -3,3L5,22c-1.657,0 -3,-1.343 -3,-3z"
-      android:fillColor="#202340"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_filled.xml b/app/src/main/res/drawable/ic_bookmark_filled.xml
index 5e5cd5944..507e265ea 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 @@
   <path
       android:pathData="M6.749,21.248C6.4234,21.2471 6.1142,21.1054 5.9008,20.8595C5.6875,20.6136 5.5909,20.2874 5.636,19.965L6.414,14.4L2.674,10.38C2.3928,10.0785 2.2991,9.6474 2.4296,9.2564C2.5601,8.8654 2.8941,8.5771 3.3,8.505L8.529,7.57L10.993,2.624C11.1833,2.242 11.5733,2.0006 12,2.0006C12.4267,2.0006 12.8167,2.242 13.007,2.624L15.471,7.57L20.7,8.5C21.1057,8.5724 21.4394,8.8608 21.5697,9.2518C21.7,9.6427 21.6062,10.0737 21.325,10.375L17.586,14.4L18.364,19.968C18.4229,20.3853 18.2434,20.8005 17.8991,21.0434C17.5547,21.2864 17.1034,21.3164 16.73,21.121L12,18.654L7.269,21.119C7.1087,21.2035 6.9302,21.2478 6.749,21.248Z"
       android:strokeWidth="1"
-      android:fillColor="#202340"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml
index f29b8088a..a738d07eb 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">
   <path
       android:pathData="M12,2a1,1 0,0 1,0.87 0.507l2.768,4.884 5.536,0.977a1,1 0,0 1,0.624 1.588l-3.744,4.955 0.934,5.934a1,1 0,0 1,-1.456 1.039L12,18.955l-5.532,2.929a1,1 0,0 1,-1.456 -1.04l0.934,-5.933 -3.744,-4.955a1,1 0,0 1,0.624 -1.588l5.536,-0.977 2.768,-4.884A1,1 0,0 1,12 2zM12,5.028l-2.13,3.76a1,1 0,0 1,-0.696 0.49l-4.391,0.776 3.015,3.99a1,1 0,0 1,0.19 0.759l-0.69,4.378 4.234,-2.241a1,1 0,0 1,0.936 0l4.232,2.24 -0.689,-4.378a1,1 0,0 1,0.19 -0.759l3.015,-3.99 -4.39,-0.775a1,1 0,0 1,-0.697 -0.492L12,5.028z"
-      android:fillColor="#0C0C0D"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 67b6f4a1f..57218f9f0 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">
     <path
-        android:fillColor="@color/icons"
+        android:fillColor="?attr/iconColor"
         android:pathData="M13.326,12l4.337,-4.337a0.938,0.938 0,0 0,-1.326 -1.326L12,10.674 7.663,6.337A0.938,0.938 0,0 0,6.337 7.663L10.674,12 6.337,16.337a0.938,0.938 0,0 0,1.326 1.326L12,13.326l4.337,4.337a0.938,0.938 0,0 0,1.326 -1.326Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_data_collection.xml b/app/src/main/res/drawable/ic_data_collection.xml
index 311d2e66f..2a7b20d57 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">
   <path
       android:pathData="M22,6a2,2 0,0 1,-2.07 1.999l-3.164,5.062a2,2 0,1 1,-3.762 0.81l-3.117,-2.078A1.992,1.992 0,0 1,8.93 12l-3.164,5.06A2,2 0,1 1,4.07 16l3.164,-5.062a2,2 0,1 1,3.762 -0.81l3.117,2.078A1.992,1.992 0,0 1,15.07 12l3.164,-5.062A2,2 0,1 1,22 6z"
-      android:fillColor="#0C0C0D"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index a73aad073..f1c07fcb6 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">
     <path
-        android:fillColor="#202340"
+        android:fillColor="?attr/iconColor"
         android:fillType="evenOdd"
         android:pathData="M11.293,17.707L5.293,11.707C4.914,11.3146 4.9194,10.6909 5.3052,10.3052C5.6909,9.9194 6.3146,9.914 6.707,10.293L11,14.586L11,3C11,2.4477 11.4477,2 12,2C12.5523,2 13,2.4477 13,3L13,14.586L17.293,10.293C17.6854,9.914 18.3091,9.9194 18.6948,10.3052C19.0806,10.6909 19.086,11.3146 18.707,11.707L12.707,17.707C12.3165,18.0974 11.6835,18.0974 11.293,17.707ZM18,20C18.5523,20 19,20.4477 19,21C19,21.5523 18.5523,22 18,22L6,22C5.4477,22 5,21.5523 5,21C5,20.4477 5.4477,20 6,20L18,20Z"
         android:strokeWidth="1"
diff --git a/app/src/main/res/drawable/ic_feedback.xml b/app/src/main/res/drawable/ic_feedback.xml
index fbb51a28b..ed52f59e9 100644
--- a/app/src/main/res/drawable/ic_feedback.xml
+++ b/app/src/main/res/drawable/ic_feedback.xml
@@ -7,9 +7,9 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z" />
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_formfill.xml b/app/src/main/res/drawable/ic_formfill.xml
index ae0557b72..f0b2a3ff8 100644
--- a/app/src/main/res/drawable/ic_formfill.xml
+++ b/app/src/main/res/drawable/ic_formfill.xml
@@ -4,8 +4,8 @@
 
 <vector android:height="24dp" android:viewportHeight="16"
     android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#0C0C0D" android:pathData="M7.281,5H8.75A0.25,0.25 0,0 0,9 4.75V0.984a0.984,0.984 0,0 0,-1.969 0V4.75a0.25,0.25 0,0 0,0.25 0.25z"/>
-    <path android:fillColor="#0C0C0D" android:pathData="M13.5,2H11a1,1 0,0 0,0 2h2.5a0.5,0.5 0,0 1,0.5 0.5v7a0.5,0.5 0,0 1,-0.5 0.5h-11a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5H5a1,1 0,0 0,0 -2H2.5A2.5,2.5 0,0 0,0 4.5v7A2.5,2.5 0,0 0,2.5 14h11a2.5,2.5 0,0 0,2.5 -2.5v-7A2.5,2.5 0,0 0,13.5 2z"/>
-    <path android:fillColor="#0C0C0D" android:pathData="M3.577,6L6.423,6A0.577,0.577 0,0 1,7 6.577L7,9.423A0.577,0.577 0,0 1,6.423 10L3.577,10A0.577,0.577 0,0 1,3 9.423L3,6.577A0.577,0.577 0,0 1,3.577 6z"/>
-    <path android:fillColor="#0C0C0D" android:pathData="M9.5,7h3a0.5,0.5 0,0 0,0 -1h-3a0.5,0.5 0,0 0,0 1zM9.5,8a0.5,0.5 0,0 0,0 1h2a0.5,0.5 0,0 0,0 -1z"/>
+    <path android:fillColor="?attr/iconColor" android:pathData="M7.281,5H8.75A0.25,0.25 0,0 0,9 4.75V0.984a0.984,0.984 0,0 0,-1.969 0V4.75a0.25,0.25 0,0 0,0.25 0.25z"/>
+    <path android:fillColor="?attr/iconColor" android:pathData="M13.5,2H11a1,1 0,0 0,0 2h2.5a0.5,0.5 0,0 1,0.5 0.5v7a0.5,0.5 0,0 1,-0.5 0.5h-11a0.5,0.5 0,0 1,-0.5 -0.5v-7a0.5,0.5 0,0 1,0.5 -0.5H5a1,1 0,0 0,0 -2H2.5A2.5,2.5 0,0 0,0 4.5v7A2.5,2.5 0,0 0,2.5 14h11a2.5,2.5 0,0 0,2.5 -2.5v-7A2.5,2.5 0,0 0,13.5 2z"/>
+    <path android:fillColor="?attr/iconColor" android:pathData="M3.577,6L6.423,6A0.577,0.577 0,0 1,7 6.577L7,9.423A0.577,0.577 0,0 1,6.423 10L3.577,10A0.577,0.577 0,0 1,3 9.423L3,6.577A0.577,0.577 0,0 1,3.577 6z"/>
+    <path android:fillColor="?attr/iconColor" android:pathData="M9.5,7h3a0.5,0.5 0,0 0,0 -1h-3a0.5,0.5 0,0 0,0 1zM9.5,8a0.5,0.5 0,0 0,0 1h2a0.5,0.5 0,0 0,0 -1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index 9d605e7fb..df7b493b6 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">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:pathData="M13.15,17a1.15,1.15 0,1 1,-2.3 0,1.15 1.15,0 0,1 2.3,0zM10.5,9.5c0,-0.764 0.616,-1.5 1.5,-1.5s1.5,0.736 1.5,1.5c0,0.311 -0.144,0.635 -0.408,0.974 -0.199,0.254 -0.386,0.43 -0.57,0.6 -0.077,0.072 -0.153,0.143 -0.23,0.219a1.676,1.676 0,0 1,-0.048 0.045c-0.13,0.117 -0.466,0.42 -0.698,0.757C11.22,12.569 11,13.18 11,14a1,1 0,1 0,2 0c0,-0.431 0.106,-0.645 0.194,-0.772 0.051,-0.074 0.114,-0.144 0.197,-0.225 0.04,-0.039 0.08,-0.075 0.129,-0.12l0.003,-0.002 0.009,-0.008c0.05,-0.045 0.114,-0.104 0.175,-0.166l0.086,-0.08a8.13,8.13 0,0 0,0.876 -0.924c0.4,-0.512 0.831,-1.264 0.831,-2.203C15.5,7.764 14.116,6 12,6S8.5,7.764 8.5,9.5a1,1 0,1 0,2 0z" />
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:fillType="evenOdd"
         android:pathData="M12,22c5.523,0 10,-4.477 10,-10S17.523,2 12,2 2,6.477 2,12s4.477,10 10,10zM12,20a8,8 0,1 0,0 -16,8 8,0 0,0 0,16z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index 96dd395cf..1497645f6 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -10,7 +10,6 @@
   <path
       android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4ZM16.5,13L11.5,13C11.2239,13 11,12.7761 11,12.5L11,7.5C11,7.2239 11.2239,7 11.5,7C11.7761,7 12,7.2239 12,7.5L12,12L16.5,12C16.7761,12 17,12.2239 17,12.5C17,12.7761 16.7761,13 16.5,13Z"
       android:strokeWidth="1"
-      android:fillColor="#202340"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:fillColor="?attr/iconColor"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index f131a1970..a2088c915 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">
   <path
       android:pathData="m21.457,11.1228 l-8.75,-8.0208c-0.3905,-0.3579 -1.0235,-0.3579 -1.414,0l-8.75,8.0208c-0.379,0.3597 -0.3736,0.9314 0.0122,1.285 0.3857,0.3536 1.0094,0.3586 1.4018,0.0112l1.043,-0.9561v6.9538c0,1.5188 1.3431,2.75 3,2.75h8c1.6569,0 3,-1.2312 3,-2.75v-6.9538l1.043,0.9561c0.3924,0.3474 1.0161,0.3424 1.4018,-0.0112 0.3857,-0.3536 0.3912,-0.9253 0.0122,-1.285zM17,18.4167c0,0.5063 -0.4477,0.9167 -1,0.9167 0.6667,0 0.1667,0 -1.5,0s-3.3333,0 -5,0h-1.5c-0.5523,0 -1,-0.4104 -1,-0.9167v-8.7872l5,-4.5833 5,4.5833z"
-      android:fillColor="#202340"/>
+      android:fillColor="?attr/iconColor"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 3aac2d838..91359ed12 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">
   <path
       android:pathData="M9.894,3.553a1,1 0,1 0,-1.788 0.894L8.382,5L3,5a1,1 0,0 0,0 2h6.98a0.96,0.96 0,0 0,0.042 0h1.645c-0.715,2.136 -1.8,3.94 -2.953,5.41a7.546,7.546 0,0 1,-1.778 -2.76,1 1,0 0,0 -1.872,0.702 9.527,9.527 0,0 0,2.339 3.574,21.309 21.309,0 0,1 -2.866,2.517 15.843,15.843 0,0 1,-0.975 0.655l-0.037,0.022 -0.011,0.007 -0.01,0.006h-0.001a1,1 0,0 0,0.993 1.736L4,18c0.496,0.868 0.497,0.868 0.498,0.867L4.5,18.867l0.006,-0.005 0.02,-0.011 0.07,-0.042a17.886,17.886 0,0 0,1.117 -0.75,23.305 23.305,0 0,0 3.281,-2.907c0.393,0.24 0.747,0.417 1.03,0.543a6.994,6.994 0,0 0,0.677 0.26l0.015,0.004 0.005,0.001 0.002,0.001h0.002a1,1 0,0 0,0.554 -1.921l-0.003,-0.001 -0.012,-0.004a4.943,4.943 0,0 1,-0.429 -0.168,6.65 6.65,0 0,1 -0.519,-0.259c1.37,-1.753 2.664,-3.955 3.448,-6.608L16,7a1,1 0,1 0,0 -2h-5.382l-0.724,-1.447zM18.626,16L17,11.598 15.374,16h3.252zM19.365,18l0.89,2.412a0.9,0.9 0,0 0,1.69 -0.624l-3.632,-9.83c-0.45,-1.22 -2.176,-1.22 -2.626,0l-3.631,9.83a0.9,0.9 0,1 0,1.688 0.624L14.635,18h4.73z"
-      android:fillColor="#0C0C0D"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_library.xml b/app/src/main/res/drawable/ic_library.xml
index 33784f6a8..c6a70719f 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">
     <path
-        android:fillColor="#0C0C0D"
+        android:fillColor="?attr/iconColor"
         android:fillType="evenOdd"
         android:pathData="M5,4a1,1 0,1 0,-2 0v16a1,1 0,1 0,2 0L5,4zM9,7a1,1 0,1 0,-2 0v13a1,1 0,1 0,2 0L9,7zM12,5a1,1 0,0 1,1 1v14a1,1 0,1 1,-2 0L11,6a1,1 0,0 1,1 -1zM16.452,5.694a1,1 0,1 0,-1.904 0.612l4.5,14a1,1 0,1 0,1.904 -0.612l-4.5,-14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index 51072c173..24d3a90ad 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">
   <path
       android:pathData="M11.377,4.842c-1.045,1.18 -1.531,2.752 -1.334,4.315L9,10.2c-0.144,0.174 -0.144,0.426 0,0.6 0.115,0.206 0.26,0.393 0.429,0.557 0.216,0.19 0.408,0.406 0.571,0.643l-7,7v1.7c-0.002,0.08 0.03,0.157 0.086,0.214 0.057,0.057 0.134,0.088 0.214,0.086H7v-1h1v-1.5h1V18h1v-2h1l1.6,-1.6h0.3l0.6,0.6c0.3,0.3 0.3,0.3 0.469,0.3 0.134,-0.01 0.26,-0.068 0.354,-0.163l0.9,-1.151c0.093,0 0.185,0.014 0.279,0.014 3.038,0 5.5,-2.462 5.5,-5.5S18.54,3 15.502,3c-1.578,-0.008 -3.08,0.663 -4.125,1.842zM17.5,8c-0.828,0 -1.5,-0.672 -1.5,-1.5S16.672,5 17.5,5s1.5,0.672 1.5,1.5S18.328,8 17.5,8z"
-      android:fillColor="#0C0C0D"
+      android:fillColor="?attr/iconColor"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_permission.xml b/app/src/main/res/drawable/ic_permission.xml
index f754db17b..aa958b938 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">
   <path
       android:pathData="m12,20h5c1.6569,0 3,-1.3431 3,-3v-10c0,-1.6568 -1.3431,-3 -3,-3h-5zM7,2h10c2.7614,0 5,2.2386 5,5v10c0,2.7614 -2.2386,5 -5,5h-10c-2.7614,0 -5,-2.2386 -5,-5v-10c0,-2.7614 2.2386,-5 5,-5zM6.2143,15c0.0152,0.0001 0.0304,-0.0006 0.0455,-0.0021 0.154,-0.0135 0.2941,-0.0945 0.3827,-0.2212l3.0064,-4.9671c0.155,-0.2364 0.094,-0.5531 -0.1375,-0.7151s-0.55,-0.1107 -0.7189,0.1159l-2.6493,4.4563 -0.9971,-0.9971c-0.2052,-0.1981 -0.5313,-0.1953 -0.733,0.0064 -0.2017,0.2017 -0.2045,0.5278 -0.0064,0.7329l1.4379,1.4379c0.098,0.0981 0.231,0.1532 0.3697,0.1532zM13.1464,9.8535c-0.1952,-0.1953 -0.1952,-0.5118 0,-0.7071 0.1953,-0.1953 0.5119,-0.1953 0.7072,0l2.1464,2.1465 2.1464,-2.1465c0.1953,-0.1953 0.5119,-0.1953 0.7072,0 0.1952,0.1953 0.1952,0.5118 0,0.7071l-2.1465,2.1465 2.1465,2.1465c0.1952,0.1952 0.1952,0.5118 0,0.7071 -0.1953,0.1952 -0.5119,0.1952 -0.7072,0l-2.1464,-2.1465 -2.1464,2.1465c-0.1953,0.1952 -0.5119,0.1952 -0.7072,0 -0.1952,-0.1953 -0.1952,-0.5119 0,-0.7071l2.1465,-2.1465z"
-      android:fillColor="#0c0c0d" />
+      android:fillColor="?attr/iconColor" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index 8b774bf72..08f50938f 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -9,7 +9,6 @@
   <path
       android:pathData="M14.5,0C16.433,0 18,1.567 18,3.5L18,6C18,6.5523 17.5523,7 17,7C16.4477,7 16,6.5523 16,6L16,3.5C16,2.6716 15.3284,2 14.5,2L12,2C11.4477,2 11,1.5523 11,1C11,0.4477 11.4477,0 12,0L14.5,0ZM17,11C17.5523,11 18,11.4477 18,12L18,14.5C18,16.433 16.433,18 14.5,18L12,18C11.4477,18 11,17.5523 11,17C11,16.4477 11.4477,16 12,16L14.5,16C15.3284,16 16,15.3284 16,14.5L16,12C16,11.4477 16.4477,11 17,11ZM6,16C6.5523,16 7,16.4477 7,17C7,17.5523 6.5523,18 6,18L3.5,18C1.567,18 0,16.433 0,14.5L0,12C0,11.4477 0.4477,11 1,11C1.5523,11 2,11.4477 2,12L2,14.5C2,15.3284 2.6716,16 3.5,16L6,16ZM1,7C0.4477,7 0,6.5523 0,6L0,3.5C0,1.567 1.567,0 3.5,0L6,0C6.5523,0 7,0.4477 7,1C7,1.5523 6.5523,2 6,2L3.5,2C2.6716,2 2,2.6716 2,3.5L2,6C2,6.5523 1.5523,7 1,7ZM12,4L14,4L14,6L12,6L12,4ZM4,6L4,4L8,4L8,6L8,8L6,8L4,8L4,6ZM12,8L14,8L14,10L12,10L12,8ZM6,10L8,10L8,12L6,12L6,10ZM12,12L14,12L14,14L12,14L12,12ZM8,12L10,12L10,14L8,14L8,12ZM4,12L6,12L6,14L4,14L4,12ZM10,10L12,10L12,12L10,12L10,10ZM10,6L12,6L12,8L10,8L10,6Z"
       android:strokeWidth="1"
-      android:fillColor="#202340"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:fillColor="?attr/iconColor"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_report_issues.xml b/app/src/main/res/drawable/ic_report_issues.xml
index cc1dfe664..3fa4c681f 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">
     <path
-        android:fillColor="#000000"
+        android:fillColor="?attr/iconColor"
         android:pathData="M8,0C4.3,0 2,2.107 2,5.5c0,2.372 2.065,4.268 3,5L5,14c0,1.476 1.616,2 3,2s3,-0.524 3,-2v-3.5c0.935,-0.736 3,-2.632 3,-5C14,2.107 11.7,0 8,0zM9,12L7,12v-1h2zM8,14a3.086,3.086 0,0 1,-1 -0.172L7,13h2v0.828A3.047,3.047 0,0 1,8 14zM9.445,9.168A1,1 0,0 0,9 10L7,10a1,1 0,0 0,-0.444 -0.831C5.845,8.691 4,7.1 4,5.5 4,2.607 6.175,2 8,2s4,0.607 4,3.5c0,1.6 -1.845,3.191 -2.555,3.668z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_screenshots.xml b/app/src/main/res/drawable/ic_screenshots.xml
index ce15b6503..c71cfde60 100644
--- a/app/src/main/res/drawable/ic_screenshots.xml
+++ b/app/src/main/res/drawable/ic_screenshots.xml
@@ -10,7 +10,6 @@
   <path
       android:pathData="M6,7.1707C7.1652,7.5825 8,8.6938 8,10C8,10.2312 7.9738,10.4563 7.9243,10.6725L10.4097,12.5843L14.9445,9.4447C16.0797,8.6588 17.6371,8.942 18.423,10.0772L7.9279,17.3431C7.9751,17.5545 8,17.7743 8,18C8,19.6569 6.6569,21 5,21C3.3431,21 2,19.6569 2,18C2,16.3431 3.3431,15 5,15C5.5103,15 5.9909,15.1274 6.4116,15.3522L8.2516,14.0783L6.4,12.654C5.9821,12.8749 5.5056,13 5,13C3.3431,13 2,11.6569 2,10C2,8.6938 2.8348,7.5825 4,7.1707L4,6L6,6L6,7.1707ZM6,2L6,4L4,4C4,2.8954 4.8954,2 6,2ZM8,2L10,2L10,4L8,4L8,2ZM12,2L14,2L14,4L12,4L12,2ZM16,2L18,2L18,4L16,4L16,2ZM20,2C21.1046,2 22,2.8954 22,4L20,4L20,2ZM20,6L22,6L22,8L20,8L20,6ZM20,10L22,10L22,12L20,12L20,10ZM20,14L22,14C22,15.1046 21.1046,16 20,16L20,14ZM13.648,15.0753L18.7621,19.0092C17.9203,20.1036 16.3507,20.3083 15.2563,19.4665L11.49,16.5693L13.648,15.0753ZM5,11C5.5523,11 6,10.5523 6,10C6,9.4477 5.5523,9 5,9C4.4477,9 4,9.4477 4,10C4,10.5523 4.4477,11 5,11ZM5,19C5.5523,19 6,18.5523 6,18C6,17.4477 5.5523,17 5,17C4.4477,17 4,17.4477 4,18C4,18.5523 4.4477,19 5,19Z"
       android:strokeWidth="1"
-      android:fillColor="#202340"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:fillColor="?attr/iconColor"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index df14489d1..3838005b9 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">
     <path
-        android:fillColor="@color/icons"
+        android:fillColor="?attr/iconColor"
         android:pathData="M21.457,20.043l-6,-6a7.528,7.528 0,1 0,-1.414 1.414l6,6a1,1 0,0 0,1.414 -1.414ZM9.5,15A5.5,5.5 0,1 1,15 9.5,5.507 5.507,0 0,1 9.5,15Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
index b3a0a65f9..2390e61b8 100644
--- a/app/src/main/res/drawable/ic_shortcuts.xml
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -9,7 +9,6 @@
   <path
       android:pathData="M7.0127,9.1576C7.0127,10.7366 7.6987,11.6946 8.8427,11.6946C10.0177,11.6946 10.7477,10.7256 10.7477,9.1576C10.7477,7.5906 10.0177,6.6206 8.8527,6.6206C7.6987,6.6206 7.0127,7.5676 7.0127,9.1576M17.9997,8.0916C17.9997,11.5206 16.3777,13.7316 13.7207,13.7316C12.3697,13.7316 11.3357,13.0786 11.0957,12.0216L10.9437,12.0216C10.4967,13.1106 9.5827,13.6986 8.3197,13.6986C6.0547,13.6986 4.5407,11.8586 4.5407,9.0926C4.5407,6.4466 6.0327,4.6386 8.2107,4.6386C9.3867,4.6386 10.3667,5.2266 10.7917,6.1846L10.9437,6.1846L10.9437,4.8786L13.1547,4.8786L13.1547,10.7046C13.1547,11.4556 13.5027,11.9346 14.1887,11.9346C15.2557,11.9346 15.9967,10.5736 15.9967,8.2546C15.9967,4.2906 13.2627,1.7316 9.1367,1.7316C4.9437,1.7316 2.0037,4.7586 2.0037,9.1366C2.0037,13.7196 5.0637,16.3986 9.5497,16.3986C10.7147,16.3986 11.9017,16.2466 12.5227,16.0176L12.5227,17.7606C11.6737,18.0116 10.5627,18.1636 9.3867,18.1636C3.8767,18.1636 -0.0003,14.7116 -0.0003,9.0816C-0.0003,3.6806 3.7787,0.0006 9.2127,0.0006C14.3737,0.0006 17.9997,3.2446 17.9997,8.0916"
       android:strokeWidth="1"
-      android:fillColor="#202340"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000"/>
+      android:fillColor="?attr/iconColor"
+      android:fillType="evenOdd"/>
 </vector>
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 95ba8eeea..c415797bb 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 @@
     </item>
     <item>
         <shape>
-            <solid android:color="#FFFFFF" />
+            <solid android:color="?attr/pillWrapperBackground" />
             <corners android:radius="8dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index aebbee68e..6d3151dc7 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"/>
 
     <fragment
diff --git a/app/src/main/res/menu/library_menu.xml b/app/src/main/res/menu/library_menu.xml
index 9c82defbb..008c1d990 100644
--- a/app/src/main/res/menu/library_menu.xml
+++ b/app/src/main/res/menu/library_menu.xml
@@ -8,14 +8,14 @@
     <item
         android:id="@+id/librarySearch"
         android:icon="@drawable/ic_search"
-        android:iconTint="@color/icons"
+        android:iconTint="?attr/iconColor"
         android:title="@string/library_search"
         app:showAsAction="always"
         tools:targetApi="o" />
     <item
         android:id="@+id/libraryClose"
         android:icon="@drawable/ic_close"
-        android:iconTint="@color/icons"
+        android:iconTint="?attr/iconColor"
         android:title="@string/mozac_close_button_description"
         app:showAsAction="always"
         tools:targetApi="o" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0996454ae..41b75ddc3 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,6 +10,8 @@
 
     <attr name="searchBarColor" format="reference"/>
     <attr name="fenixPrimary" format="reference"/>
+    <attr name="iconColor" format="reference"/>
+    <attr name="toolbarColor" format="reference"/>
 
     <!-- Home fragment -->
     <attr name="homeBackgroundTopGradient" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cffcbabcf..ebf95abcb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,9 +22,14 @@
     <color name="search_text">#0C0C0D</color>
     <color name="off_white">#f9f9fa</color>
     <color name="url_box_view">#E9E9ED</color>
-    <color name="icons">#20233E</color>
     <color name="session_border_color">#2f26c1</color>
 
+    <color name="icons_light_mode">#20233E</color>
+    <color name="icons_dark_mode">@color/off_white</color>
+
+    <color name="toolbar_light_mode">@color/off_white</color>
+    <color name="toolbar_dark_mode">@color/private_browsing_top_gradient</color>
+
     <color name="session_list_empty_bg">#1A665BFD</color>
     <color name="session_list_empty_fg">#544CD9</color>
     <color name="session_list_header">#6D6D6E</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cd47664dc..f8d7ee39e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,9 @@
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:colorPrimary">@color/off_white</item>
+        <item name="android:windowBackground">@color/off_white</item>
+        <item name="iconColor">@color/icons_light_mode</item>
+        <item name="toolbarColor">@color/toolbar_light_mode</item>
 
         <!-- Style the navigation bar -->
         <item name="navigationBarColorHome">@android:color/transparent</item>
@@ -36,19 +39,22 @@
         <!-- Browser fragment colors -->
         <item name="browserUrlBarBackground">@drawable/home_search_background_dark</item>
         <item name="browserToolbarBackground">@color/off_white</item>
-        <item name="browserToolbarIcons">@color/icons</item>
-        <item name="browserToolbarMenuIcons">@color/icons</item>
+        <item name="browserToolbarIcons">@color/icons_light_mode</item>
+        <item name="browserToolbarMenuIcons">@color/icons_light_mode</item>
     </style>
 
     <style name="LightTheme" parent="LightThemeBase">
 
     </style>
 
-    <style name="PrivateThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="PrivateThemeBase" parent="Theme.AppCompat.NoActionBar">
         <item name="android:statusBarColor">@color/private_browsing_top_gradient</item>
         <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
         <item name="android:textColorHighlight">@color/private_browsing_primary</item>
         <item name="android:colorPrimary">@color/private_browsing_primary</item>
+        <item name="android:windowBackground">@color/private_browsing_top_gradient</item>
+        <item name="iconColor">@color/icons_dark_mode</item>
+        <item name="toolbarColor">@color/toolbar_dark_mode</item>
 
         <!-- Style the navigation bar -->
         <item name="navigationBarColorHome">@color/private_browsing_bottom_gradient</item>
@@ -77,8 +83,8 @@
         <!-- Browser fragment colors -->
         <item name="browserUrlBarBackground">@drawable/home_search_background_private_dark</item>
         <item name="browserToolbarBackground">@color/private_browsing_top_gradient</item>
-        <item name="browserToolbarIcons">@color/off_white</item>
-        <item name="browserToolbarMenuIcons">@color/icons</item>
+        <item name="browserToolbarIcons">@color/icons_dark_mode</item>
+        <item name="browserToolbarMenuIcons">@color/icons_dark_mode</item>
     </style>
 
     <style name="PrivateTheme" parent="PrivateThemeBase">