diff --git a/res/drawable/call_redirection_button_ripple_effect.xml b/res/drawable/call_redirection_button_ripple_effect.xml
index 7fa7e709449172136341f9f75fb68832556811be..2dff241d0e3360eedd61a067f4f3b6c14f8e651e 100644
--- a/res/drawable/call_redirection_button_ripple_effect.xml
+++ b/res/drawable/call_redirection_button_ripple_effect.xml
@@ -18,7 +18,7 @@
         android:color="?android:attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape>
-            <solid android:color="@android:color/white"/>
+            <solid android:color="@color/background_color"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/res/drawable/call_redirection_dialog_background.xml b/res/drawable/call_redirection_dialog_background.xml
index 71277fd475bebaacfc017ba0743462c4e96d7bc9..91768a2cfd06eaf2711e729689e29d315107ce6f 100644
--- a/res/drawable/call_redirection_dialog_background.xml
+++ b/res/drawable/call_redirection_dialog_background.xml
@@ -15,6 +15,6 @@
   ~ limitations under the License
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white"/>
+    <solid android:color="@color/background_color"/>
     <corners android:radius="15dp" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml
index 07b3cb0b022244c10d814e6cfb8f5d49f49f3785..668365de89f967905ae363fbb09d47fb2aa6621f 100644
--- a/res/drawable/ic_back_arrow.xml
+++ b/res/drawable/ic_back_arrow.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_arrow_back_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/drawable/ic_message.xml b/res/drawable/ic_message.xml
index ae32073cd6080c14006f41b6513793d63d8cf244..b5b0d89e86596788118f300c479d1fa75d0e90d5 100644
--- a/res/drawable/ic_message.xml
+++ b/res/drawable/ic_message.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_message_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/drawable/ic_phone.xml b/res/drawable/ic_phone.xml
index 15c2a486c3a07e09797a1a5d5078dd969d74e640..7144230fcdea0235f7ca58581ffb1d2997c551d5 100644
--- a/res/drawable/ic_phone.xml
+++ b/res/drawable/ic_phone.xml
@@ -16,4 +16,5 @@
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
         android:src="@drawable/ic_phone_24dp"
+        android:tint="@color/theme_color"
         android:autoMirrored="true" />
diff --git a/res/values-night-v27/styles.xml b/res/values-night-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af670fad6506aa890989fc021c67caba7b0d2d5b
--- /dev/null
+++ b/res/values-night-v27/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source 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="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index da313048474cbd0943d6f08f37ed8ba720f4e685..2d90d7e99109c5afd4952926874f00dd03f984eb 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
+<!-- Copyright (C) 2014 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,27 +15,6 @@
 -->
 
 <resources>
-
-    <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.Material.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
-        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.Material.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:windowBackground">@color/background_color</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:colorAccent">@color/theme_color</item>
-        <item name="android:listDivider">@null</item>
+    <style name="BaseAppTheme" parent="@android:style/Theme.DeviceDefault">
     </style>
-
 </resources>
diff --git a/res/values-v27/styles.xml b/res/values-v27/styles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..29a50c56ea3d11a853b9625b74e6ce9f81b51637
--- /dev/null
+++ b/res/values-v27/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source 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="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3986d4882eca84d31cd7c71bcef3a60b33cb9000..29198ee9526acb1638bccc7c0c26a4131c901603 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,19 +17,20 @@
 <resources>
     <!--follows the dialer theme color-->
     <color name="theme_color">@lineageos.platform:color/color_default_accent</color>
-    <color name="background_color">#fafafa</color>
+    <color name="background_color">@lineageos.platform:color/color_default_background</color>
+    <color name="primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
 
     <!--Use the one consistence with dialer-->
-    <color name="blocked_numbers_divider_color">#d8d8d8</color>
-    <color name="blocked_numbers_primary_text_color">#202124</color>
-    <color name="blocked_numbers_secondary_text_color">#5f6368</color>
+    <color name="blocked_numbers_divider_color">@lineageos.platform:color/color_default_divider</color>
+    <color name="blocked_numbers_primary_text_color">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="blocked_numbers_secondary_text_color">@lineageos.platform:color/color_default_secondary_text</color>
 
     <!--follows dialer color-->
-    <color name="notification_action_answer">#097138</color>
-    <color name="notification_action_decline">#A52714</color>
+    <color name="notification_action_answer">@lineageos.platform:color/color_default_green1</color>
+    <color name="notification_action_decline">@lineageos.platform:color/color_default_red1</color>
 
-    <color name="call_redirection_dialog_icon_tint_color">#4089F4</color>
-    <color name="call_redirection_dialog_text_color">#212121</color>
-    <color name="call_redirection_dialog_view_divider_color">#B8B8B8</color>
+    <color name="call_redirection_dialog_icon_tint_color">@color/theme_color</color>
+    <color name="call_redirection_dialog_text_color">@color/blocked_numbers_primary_text_color</color>
+    <color name="call_redirection_dialog_view_divider_color">@color/blocked_numbers_divider_color</color>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 187086b081795a0ddb980ba8c2e6a2d5cf38d984..645af068367dc2d5258ffaea42574358d543b2fc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,8 +15,13 @@
 -->
 
 <resources>
-     <style name="Theme.Telecomm.Transparent" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
+    <style name="BaseAppTheme" parent="@android:style/Theme.DeviceDefault.Light">
+    </style>
+
+    <style name="Theme.Telecomm.Transparent" parent="Theme.Telecomm.Transparent.Base">
+    </style>
+
+    <style name="Theme.Telecomm.Transparent.Base" parent="BaseAppTheme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -24,37 +29,58 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="colorAccent">@color/theme_color</item>
+        <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
     </style>
 
-   <style name="Theme.Telecom.DialerSettings" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
+    <style name="Theme.Telecom.DialerSettings" parent="Theme.Telecom.DialerSettings.Base">
+    </style>
+
+    <style name="Theme.Telecom.DialerSettings.Base" parent="BaseAppTheme">
+        <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
         <item name="android:actionOverflowButtonStyle">@style/TelecomDialerSettingsActionOverflowButtonStyle</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="colorAccent">@color/theme_color</item>
+        <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
+    </style>
+
+    <style name="Theme.Telecom.BlockedNumbers" parent="Theme.Telecom.BlockedNumbers.Base">
     </style>
 
-    <style name="Theme.Telecom.BlockedNumbers" parent="@android:style/Theme.DeviceDefault.Light">
-        <item name="android:forceDarkAllowed">true</item>
-        <item name="android:tint">@color/blocked_numbers_secondary_text_color</item>
+    <style name="Theme.Telecom.BlockedNumbers.Base" parent="BaseAppTheme">
+        <item name="android:tint">@color/theme_color</item>
         <item name="android:actionBarStyle">@style/TelecomDialerSettingsActionBarStyle</item>
-        <item name="android:colorPrimaryDark">@color/background_color</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:navigationBarColor">@color/background_color</item>
-        <item name="android:navigationBarDividerColor">@color/blocked_numbers_divider_color</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:navigationBarColor">@color/primary_dark</item>
+        <item name="android:navigationBarDividerColor">@color/primary_dark</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
         <item name="android:windowContentOverlay">@null</item>
+        <item name="colorAccent">@color/theme_color</item>
         <item name="android:colorAccent">@color/theme_color</item>
+        <item name="colorControlNormal">@color/theme_color</item>
+        <item name="android:colorControlNormal">@color/theme_color</item>
         <item name="android:listDivider">@null</item>
+        <item name="android:textColorPrimary">@color/blocked_numbers_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/blocked_numbers_secondary_text_color</item>
     </style>
 
     <style name="TelecomDialerSettingsActionBarStyle" parent="android:Widget.DeviceDefault.ActionBar">
-        <item name="android:background">@color/background_color</item>
+        <item name="android:background">@color/primary_dark</item>
         <item name="android:titleTextStyle">@style/BlockedNumbersTextHead1</item>
         <item name="android:elevation">@dimen/dialer_settings_actionbar_elevation</item>
         <!-- Empty icon -->
@@ -64,6 +90,8 @@
     <style name="TelecomDialerSettingsActionOverflowButtonStyle"
             parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">
         <item name="android:src">@drawable/ic_more_vert_24dp</item>
+        <item name="tint">@color/theme_color</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="BlockedNumbersButton" parent="BlockedNumbersTextPrimary2">