diff --git a/generate_themes.sh b/generate_themes.sh
index b5e11fc67a..6795ec341d 100755
--- a/generate_themes.sh
+++ b/generate_themes.sh
@@ -61,7 +61,7 @@ function generate_accent_common() {
     local name="$1"
     local name_str="$2"
     local name_lc=`echo "$name" | tr '[:upper:]' '[:lower:]'`
-    insert_above_xml_comment "vector/src/main/res/values/strings_sc.xml" "do not change this comment for accent generation" "<string name=\"sc_accent_$name_lc\">$name_str</string>" "    "
+    insert_above_xml_comment "library/ui-strings/src/main/res/values/strings_sc.xml" "do not change this comment for accent generation" "<string name=\"sc_accent_$name_lc\">$name_str</string>" "    "
 }
 
 function generate_accent_light() {
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc.xml b/library/ui-styles/src/main/res/values-v23/theme_sc.xml
index 1b0602230f..ded333097a 100644
--- a/library/ui-styles/src/main/res/values-v23/theme_sc.xml
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc.xml
@@ -17,11 +17,6 @@
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
-        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
     <style name="AppTheme.SC" parent="AppTheme.SC.v23"/>
 
     <style name="AppTheme.SC.Dark" parent="AppTheme.SC.Dark.v23"/>
@@ -30,6 +25,4 @@
 
     <style name="AppTheme.SC.Dark.Colored" parent="AppTheme.SC.Dark.Colored.v23"/>
 
-    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v23"/>
-
 </resources>
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light.xml
new file mode 100644
index 0000000000..a07053d09b
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
+        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v23"/>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc.xml b/library/ui-styles/src/main/res/values-v27/theme_sc.xml
index a95954aa50..b0b5dd3435 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc.xml
@@ -17,10 +17,6 @@
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.SC.Light.v27" parent="AppTheme.SC.Light.v23">
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-
     <style name="AppTheme.SC" parent="AppTheme.SC.v27" />
 
     <style name="AppTheme.SC.Dark" parent="AppTheme.SC.Dark.v27" />
@@ -29,6 +25,4 @@
 
     <style name="AppTheme.SC.Dark.Colored" parent="AppTheme.SC.Dark.Colored.v27" />
 
-    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v27" />
-
 </resources>
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light.xml
new file mode 100644
index 0000000000..59fd4e0445
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.v27" parent="AppTheme.SC.Light.v23">
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v27" />
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_amber.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_amber.xml
index 089e3d04cd..0cc97e41f6 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_amber.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_amber.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Amber.v27" parent="AppTheme.SC.Light.Amber.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Amber" parent="AppTheme.SC.Light.Amber.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
index 6ce7aa6a16..e51fdc5f15 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Blue.v27" parent="AppTheme.SC.Light.Blue.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Blue" parent="AppTheme.SC.Light.Blue.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_bluelight.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_bluelight.xml
index 43108703ab..7d2edae48b 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_bluelight.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_bluelight.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.BlueLight.v27" parent="AppTheme.SC.Light.BlueLight.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.BlueLight" parent="AppTheme.SC.Light.BlueLight.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml
index 3c3cf5258b..3f472623ba 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Carnation.v27" parent="AppTheme.SC.Light.Carnation.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Carnation" parent="AppTheme.SC.Light.Carnation.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_cyan.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_cyan.xml
index dc3e45c802..fc6dba5f08 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_cyan.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_cyan.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Cyan.v27" parent="AppTheme.SC.Light.Cyan.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Cyan" parent="AppTheme.SC.Light.Cyan.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml
index 35679d9bb8..61f531efa8 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Denim.v27" parent="AppTheme.SC.Light.Denim.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Denim" parent="AppTheme.SC.Light.Denim.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_gold.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_gold.xml
index 78772d2210..58eabc9ec0 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_gold.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_gold.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Gold.v27" parent="AppTheme.SC.Light.Gold.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Gold" parent="AppTheme.SC.Light.Gold.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
index 069c7d0cae..1a14330772 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.GreenDark.v27" parent="AppTheme.SC.Light.GreenDark.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.GreenDark" parent="AppTheme.SC.Light.GreenDark.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml
index af910e715b..aa0de1d11b 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Indigo.v27" parent="AppTheme.SC.Light.Indigo.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Indigo" parent="AppTheme.SC.Light.Indigo.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml
index 59fe166804..48933152f0 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Lava.v27" parent="AppTheme.SC.Light.Lava.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Lava" parent="AppTheme.SC.Light.Lava.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lime.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lime.xml
index 8bc84d6979..d957ec6e9f 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lime.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lime.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Lime.v27" parent="AppTheme.SC.Light.Lime.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Lime" parent="AppTheme.SC.Light.Lime.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_orange.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_orange.xml
index 579c142c52..06d678999f 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_orange.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_orange.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Orange.v27" parent="AppTheme.SC.Light.Orange.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Orange" parent="AppTheme.SC.Light.Orange.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_pink.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_pink.xml
index 9c9dd3d1ca..6888052b7a 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_pink.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_pink.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Pink.v27" parent="AppTheme.SC.Light.Pink.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Pink" parent="AppTheme.SC.Light.Pink.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_purple.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_purple.xml
index 00cfc921d0..bd9bc36ea8 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_purple.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_purple.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Purple.v27" parent="AppTheme.SC.Light.Purple.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Purple" parent="AppTheme.SC.Light.Purple.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_red.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_red.xml
index 4003b71363..fbc7397abb 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_red.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_red.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Red.v27" parent="AppTheme.SC.Light.Red.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Red" parent="AppTheme.SC.Light.Red.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_teal.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_teal.xml
index 47bc54902b..cba3d9ca94 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_teal.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_teal.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Teal.v27" parent="AppTheme.SC.Light.Teal.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Teal" parent="AppTheme.SC.Light.Teal.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_turquoise.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_turquoise.xml
index b8c4122fda..c505e4e5b3 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_turquoise.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_turquoise.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Turquoise.v27" parent="AppTheme.SC.Light.Turquoise.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Turquoise" parent="AppTheme.SC.Light.Turquoise.v27" />
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_yellow.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_yellow.xml
index 2d3e846cbd..2b7ffaecd7 100644
--- a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_yellow.xml
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_yellow.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Yellow.v27" parent="AppTheme.SC.Light.Yellow.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Yellow" parent="AppTheme.SC.Light.Yellow.v27" />