diff --git a/res/values-notnight/colors.xml b/res/values-notnight-v28/colors.xml
similarity index 100%
rename from res/values-notnight/colors.xml
rename to res/values-notnight-v28/colors.xml
diff --git a/res/values-notnight/styles.xml b/res/values-notnight-v28/styles.xml
similarity index 100%
rename from res/values-notnight/styles.xml
rename to res/values-notnight-v28/styles.xml
diff --git a/res/values-notnight/themes.xml b/res/values-notnight-v28/themes.xml
similarity index 96%
rename from res/values-notnight/themes.xml
rename to res/values-notnight-v28/themes.xml
index 55401a2382..570246a1b5 100644
--- a/res/values-notnight/themes.xml
+++ b/res/values-notnight-v28/themes.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--  TODO: AC These values should not be hardcoded here or use any "notnight" color resources.
-            The light theme should be defined in the main "themes.xml" file. -->
     <style name="Theme.Session.DayNight">
-        <item name="android:navigationBarColor">@color/gray65</item>
-        <item name="android:statusBarColor">@color/accent</item>
+        <item name="android:navigationBarColor">?android:navigationBarColor</item>
+        <item name="android:statusBarColor">@color/transparent</item>
+<!--        <item name="android:statusBarColor">?colorAccent</item>-->
+        <item name="android:windowLightStatusBar">true</item>
         <item name="android:textColorHint">@color/gray50</item>
 
         <item name="home_gradient_start">#00FFFFFF</item>
@@ -17,7 +17,7 @@
 
     <style name="Theme.TextSecure.DayNight">
 
-        <item name="android:navigationBarColor">@color/gray78</item>
+        <item name="android:navigationBarColor">?android:navigationBarColor</item>
 
         <item name="theme_type">light</item>
 <!--        <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>-->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 92c48872f1..52504709b3 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -88,7 +88,7 @@
         <item name="android:colorBackground">#121212</item>
         <item name="android:windowBackground">?android:colorBackground</item>
         <item name="android:navigationBarColor">?android:colorBackground</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
+        <item name="android:statusBarColor">?colorPrimary</item>
     </style>
     <style name="Theme.Session.ForceDark.NoActionBar">
         <item name="windowActionBar">false</item>
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index 7e1b98470c..219252d6ef 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -129,8 +129,6 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
 
   @Override
   public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-//    return ThemeUtil.getThemedInflater(requireActivity(), inflater, R.style.TextSecure_DarkTheme)
-//                    .inflate(R.layout.mediasend_fragment, container, false);
     return inflater.inflate(R.layout.mediasend_fragment, container, false);
   }