diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 992fd9c6..4725c4a3 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -27,5 +27,21 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:scrollbars">none</item>
+    </style>
+
+    <style name="Divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0.5dp</item>
+        <item name="android:background">@color/dividerColor</item>
+    </style>
+
+    <style name="NoConnectionTextView">
+        <item name="background">?attr/colorError</item>
+        <item name="android:textColor">?attr/colorOnError</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c38f4cdc..ce978ab8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,6 +27,11 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
+
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:scrollbars">none</item>
     </style>
 
     <style name="Divider">
@@ -35,14 +40,8 @@
         <item name="android:background">@color/dividerColor</item>
     </style>
 
-    <style name="SearchViewStyle" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <!--This line changes the color of text in Toolbar-->
-        <item name="android:textColorPrimary">@color/titleTextColor</item>
-        <!--This line changes the color of icons in toolbar (back, overflow menu icons)-->
-        <item name="android:textColorSecondary">@color/subtitleTextColor</item>
-        <!-- Gets rid of the search icon -->
-        <item name="searchIcon">@drawable/ic_search</item>
-        <!-- Gets rid of the "underline" in the text -->
-        <item name="queryBackground">@color/white</item>
+    <style name="NoConnectionTextView">
+        <item name="background">?attr/colorError</item>
+        <item name="android:textColor">?attr/colorOnError</item>
     </style>
 </resources>
\ No newline at end of file