diff --git a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
index 6deb347ce6791113774a76fa36a3858aca870d7f..e3246d8dd4a83de83327136bc0ce40bc3dcc9222 100644
--- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
+++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
@@ -25,6 +25,7 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.media.projection.MediaProjectionManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -329,6 +330,8 @@ public class RecorderActivity extends AppCompatActivity implements
             mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic);
             mScreenFab.setSelected(false);
             mSoundFab.setSelected(false);
+            mScreenFab.setColorFilter(Color.argb(255, 255, 255, 255));
+            mSoundFab.setColorFilter(Color.argb(255, 255, 255, 255));
             mRecordingVisualizer.setVisibility(View.GONE);
             set.clone(this, R.layout.constraint_default);
         }
diff --git a/app/src/main/res/drawable/background_screen_recorder_overlay_main.xml b/app/src/main/res/drawable/background_screen_recorder_overlay_main.xml
index aef239eeadd7052e3d7b4b8edd4fd9197f37d1f3..6f5adaff023f8bdccb445d27c7cce5c35f4ba8d5 100644
--- a/app/src/main/res/drawable/background_screen_recorder_overlay_main.xml
+++ b/app/src/main/res/drawable/background_screen_recorder_overlay_main.xml
@@ -15,5 +15,5 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/icon" />
+    <solid android:color="@color/color_default_foreground" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 61a0de8bf239883013eeb18c7148609c042ecc0a..8b2a187e178abf33e4416c9cb4fa53b789f67cdd 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/icon"
         android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag.xml b/app/src/main/res/drawable/ic_drag.xml
index 0423984ae6310c136c270d866b71a3802b82d1b9..c742db92164accbd25efabebf328f9650ffb224f 100644
--- a/app/src/main/res/drawable/ic_drag.xml
+++ b/app/src/main/res/drawable/ic_drag.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/icon"
         android:pathData="M10.5,9h3C13.78,9 14,8.78 14,8.5V6h1.79c0.45,0 0.67,-0.54 0.35,-0.85l-3.79,-3.79c-0.2,-0.2 -0.51,-0.2 -0.71,0L7.85,5.15C7.54,5.46 7.76,6 8.21,6H10v2.5C10,8.78 10.22,9 10.5,9zM8.5,10H6V8.21c0,-0.45 -0.54,-0.67 -0.85,-0.35l-3.79,3.79c-0.2,0.2 -0.2,0.51 0,0.71l3.79,3.79C5.46,16.46 6,16.24 6,15.79V14h2.5C8.78,14 9,13.78 9,13.5v-3C9,10.22 8.78,10 8.5,10zM22.65,11.65l-3.79,-3.79C18.54,7.54 18,7.76 18,8.21V10h-2.5c-0.28,0 -0.5,0.22 -0.5,0.5v3c0,0.28 0.22,0.5 0.5,0.5H18v1.79c0,0.45 0.54,0.67 0.85,0.35l3.79,-3.79C22.84,12.16 22.84,11.84 22.65,11.65zM13.5,15h-3c-0.28,0 -0.5,0.22 -0.5,0.5V18H8.21c-0.45,0 -0.67,0.54 -0.35,0.85l3.79,3.79c0.2,0.2 0.51,0.2 0.71,0l3.79,-3.79c0.31,-0.31 0.09,-0.85 -0.35,-0.85H14v-2.5C14,15.22 13.78,15 13.5,15z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification_screen.xml b/app/src/main/res/drawable/ic_notification_screen.xml
index 218cf05b894e2258a15333694331344653b3259a..eb241e69bac56ed07c4320d283b4737f9138ba44 100644
--- a/app/src/main/res/drawable/ic_notification_screen.xml
+++ b/app/src/main/res/drawable/ic_notification_screen.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="@color/icon"
       android:pathData="M15,8v8H5V8h10m1,-2H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4V7c0,-0.55 -0.45,-1 -1,-1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notification_sound.xml b/app/src/main/res/drawable/ic_notification_sound.xml
index e4a673fb132dfa9d1704b7fe994f1de009476dc6..fcbae55122508e8a97a2dc53d4de42b16464a7a2 100644
--- a/app/src/main/res/drawable/ic_notification_sound.xml
+++ b/app/src/main/res/drawable/ic_notification_sound.xml
@@ -19,6 +19,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/black"
+      android:fillColor="@color/icon"
       android:pathData="M12,14c1.66,0 3,-1.34 3,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v6c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L11,5zM17,11c0,2.76 -2.24,5 -5,5s-5,-2.24 -5,-5L5,11c0,3.53 2.61,6.43 6,6.92L11,21h2v-3.08c3.39,-0.49 6,-3.39 6,-6.92h-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index e8e6355f31cf99d57cb7fe236baed5951153ef44..9ca12ed8e82b8222231df51ae6c1be98963fd87b 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/icon"
         android:pathData="M10,8.64L15.27,12 10,15.36V8.64M8,5v14l11,-7L8,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index e413d3c7e96a4f607c25e9920e936a2eec3ee931..ad1fab7f9e88ed5ef798993b36160afe3a2a4072 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/icon"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml
index 186d91e2b266d3182392bc3a499950ee9d8063c1..553680ff5d41ca93cb7d4be0bc3577dfaec6f349 100644
--- a/app/src/main/res/drawable/ic_stop.xml
+++ b/app/src/main/res/drawable/ic_stop.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/black"
+        android:fillColor="@color/icon"
         android:pathData="M8,6h8c1.1,0 2,0.9 2,2v8c0,1.1 -0.9,2 -2,2H8c-1.1,0 -2,-0.9 -2,-2V8C6,6.9 6.9,6 8,6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stop_screen.xml b/app/src/main/res/drawable/ic_stop_screen.xml
index 9106c42f5266b7f9c35e355669d7309173463440..96cbdfcfc75fb5b45402634f8c9e174e1875543c 100644
--- a/app/src/main/res/drawable/ic_stop_screen.xml
+++ b/app/src/main/res/drawable/ic_stop_screen.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/screen"
+        android:fillColor="@android:color/white"
         android:pathData="M8,6h8c1.1,0 2,0.9 2,2v8c0,1.1 -0.9,2 -2,2H8c-1.1,0 -2,-0.9 -2,-2V8C6,6.9 6.9,6 8,6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_stop_sound.xml b/app/src/main/res/drawable/ic_stop_sound.xml
index e46a579aac99e3e6979820eb47c6b1492342512e..96cbdfcfc75fb5b45402634f8c9e174e1875543c 100644
--- a/app/src/main/res/drawable/ic_stop_sound.xml
+++ b/app/src/main/res/drawable/ic_stop_sound.xml
@@ -19,6 +19,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="@color/sound"
+        android:fillColor="@android:color/white"
         android:pathData="M8,6h8c1.1,0 2,0.9 2,2v8c0,1.1 -0.9,2 -2,2H8c-1.1,0 -2,-0.9 -2,-2V8C6,6.9 6.9,6 8,6z"/>
 </vector>
diff --git a/app/src/main/res/layout/activty_constraint.xml b/app/src/main/res/layout/activty_constraint.xml
index 16a609548396e2cc1024cbd0c9006432b121a8e4..df922a5478ae8e9a61c4798201bfb2bac00bb8fc 100644
--- a/app/src/main/res/layout/activty_constraint.xml
+++ b/app/src/main/res/layout/activty_constraint.xml
@@ -69,7 +69,7 @@
             android:id="@+id/sound_fab"
             style="@style/AppTheme.RecordFab"
             android:src="@lineageos.platform:drawable/ic_mic"
-            app:tint="@color/color_default_foreground"/>
+            app:tint="@android:color/white"/>
 
         <TextView
             style="@style/AppTheme.RecordTitle"
@@ -101,7 +101,7 @@
             android:id="@+id/screen_fab"
             style="@style/AppTheme.RecordFab"
             android:src="@lineageos.platform:drawable/ic_camera_video"
-            app:tint="@color/color_default_foreground"/>
+            app:tint="@android:color/white"/>
 
         <TextView
             style="@style/AppTheme.RecordTitle"
diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml
index 2e0a2d4a6e0529afab1abfcd6c5b1a163da693a9..b78a1f8f451dce7b31bd651bdbd139617daa98d7 100644
--- a/app/src/main/res/layout/dialog_base.xml
+++ b/app/src/main/res/layout/dialog_base.xml
@@ -18,6 +18,7 @@
     android:layout_height="wrap_content"
     android:layout_marginEnd="16dp"
     android:layout_marginStart="16dp"
+    android:background="@color/color_default_background"
     android:transitionName="@string/transition_dialog_name">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/dialog_content_last_item.xml b/app/src/main/res/layout/dialog_content_last_item.xml
index 9fa95714c8c28e3a3dc6e6c6a36c4b734584b6d7..7594653c09c40299e97602f50a5eb74375fb4a21 100644
--- a/app/src/main/res/layout/dialog_content_last_item.xml
+++ b/app/src/main/res/layout/dialog_content_last_item.xml
@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="8dp"
-        android:textColor="@color/black"
+        android:textColor="@color/color_default_primary_text"
         android:textSize="14sp" />
 
     <LinearLayout style="@style/AppTheme.ActionsLayout">
diff --git a/app/src/main/res/layout/window_screen_recorder_overlay.xml b/app/src/main/res/layout/window_screen_recorder_overlay.xml
index afb9f0ec359f656e590550b609e1ff3d43acddbc..0c12705a4d4c1f2ca6dde2f12704850ab643a956 100644
--- a/app/src/main/res/layout/window_screen_recorder_overlay.xml
+++ b/app/src/main/res/layout/window_screen_recorder_overlay.xml
@@ -30,7 +30,7 @@
         android:contentDescription="@string/main_screen_action"
         android:padding="12dp"
         android:src="@drawable/ic_action_screen_record"
-        android:tint="@color/white" />
+        android:tint="@color/icon" />
 
     <org.lineageos.recorder.ui.DragView
         android:id="@+id/overlay_drag"
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..134dfe0bba5b411efd25c12912da909b02ebf2fc
--- /dev/null
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2017 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <style name="AppTheme" parent="AppTheme.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..18f91d4dacface3524379d448b9c66938c5a4cfd
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2017 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <style name="AppTheme" parent="AppTheme.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 15c64e07c1dd6bf6b666d7bceb2b390b6aa67310..d5a55f48fc6d8a7563b4e9419452c340807d6599 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,16 +17,12 @@
     <color name="colorPrimary">@lineageos.platform:color/color_default_primary</color>
     <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
-
+    <color name="color_default_background">@lineageos.platform:color/color_default_background</color>
     <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
-
-    <color name="white">#fafafa</color>
-    <color name="black">#333333</color>
-
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
 
     <color name="screen">@lineageos.platform:color/color_default_background</color>
     <color name="sound">@lineageos.platform:color/color_default_background</color>
-    <color name="icon">#56000000</color>
+    <color name="icon">@color/colorAccent</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 462d73c1d00ae70f72fa523b45544382482cbb6e..e6ec49078ca72a74572447caa177498d9508a1e4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,11 +15,18 @@
 -->
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+    <style name="AppTheme" parent="AppTheme.Base">
+    </style>
+
+    <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight" >
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
         <item name="android:windowContentTransitions">true</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 
     <style name="AppTheme.NoActionBar">