diff --git a/presentation/src/main/res/drawable/ic_reply_white_24dp.xml b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
index 649cc2b081fd636408d69da6709deb7ae103d240..494a1bcce255e1d29e487d7c439676320f533d58 100644
--- a/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
@@ -20,7 +20,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    android:tint="@color/colorAccent">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
diff --git a/presentation/src/main/res/layout/attachment_contact_list_item.xml b/presentation/src/main/res/layout/attachment_contact_list_item.xml
index 1c9f888378dd9e666f806199e4da291571660d34..17fbcf95b8a908a4001631179939996438dd4342 100644
--- a/presentation/src/main/res/layout/attachment_contact_list_item.xml
+++ b/presentation/src/main/res/layout/attachment_contact_list_item.xml
@@ -40,7 +40,7 @@
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_person_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
+            android:tint="@color/colorAccent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -88,6 +88,6 @@
         android:background="@drawable/circle"
         android:backgroundTint="?attr/bubbleColor"
         android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
+        android:tint="@color/colorAccent" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/attachment_image_list_item.xml b/presentation/src/main/res/layout/attachment_image_list_item.xml
index ff757f0351af9d6ef7c777d1b2549079dfc014c0..876e377a26d606a70ab867fe05a8045cac75791e 100644
--- a/presentation/src/main/res/layout/attachment_image_list_item.xml
+++ b/presentation/src/main/res/layout/attachment_image_list_item.xml
@@ -51,6 +51,6 @@
         android:background="@drawable/circle"
         android:backgroundTint="?attr/bubbleColor"
         android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
+        android:tint="@color/colorAccent" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml
index 23de4cf7704cdbf29a033517583a81688b958414..e5ce20c2babfdc66eb65ea74baf57a09844cb308 100644
--- a/presentation/src/main/res/layout/backup_controller.xml
+++ b/presentation/src/main/res/layout/backup_controller.xml
@@ -48,7 +48,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="16dp"
-                    android:tint="?android:attr/textColorSecondary"
+                    android:tint="@color/colorAccent"
                     app:layout_constraintBottom_toBottomOf="@id/progressSummary"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@id/progressTitle"
@@ -87,7 +87,7 @@
                     android:background="?android:attr/selectableItemBackground"
                     android:padding="16dp"
                     android:src="@drawable/ic_close_black_24dp"
-                    android:tint="?android:attr/textColorSecondary"
+                    android:tint="@color/colorAccent"
                     app:layout_constraintBottom_toBottomOf="@id/progressSummary"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/progressTitle" />
diff --git a/presentation/src/main/res/layout/blocked_number_list_item.xml b/presentation/src/main/res/layout/blocked_number_list_item.xml
index 93bcb89348a56b1bdda62d92f0b787287e693e71..bf3c8316f40bbe03d86705a40ca9eca0f3e99165 100644
--- a/presentation/src/main/res/layout/blocked_number_list_item.xml
+++ b/presentation/src/main/res/layout/blocked_number_list_item.xml
@@ -42,6 +42,6 @@
         android:background="?android:attr/selectableItemBackground"
         android:padding="12dp"
         android:src="@drawable/ic_close_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
+        android:tint="@color/colorAccent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml
index 3a52e42976e1dffcdad66ea9e32c977ce394eacb..6c7dd1535f7494efde61cdb7178b69751ddb2a31 100644
--- a/presentation/src/main/res/layout/compose_activity.xml
+++ b/presentation/src/main/res/layout/compose_activity.xml
@@ -392,7 +392,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?android:attr/divider"
+        android:background="@color/backgroundDark"
         app:layout_constraintBottom_toBottomOf="parent" />
 
     <androidx.constraintlayout.widget.Group
@@ -425,7 +425,7 @@
         android:elevation="4dp"
         android:padding="10dp"
         android:src="@drawable/ic_person_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@color/colorAccent"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/schedule"
         app:layout_constraintEnd_toEndOf="@id/attach"
@@ -459,7 +459,7 @@
         android:elevation="4dp"
         android:padding="10dp"
         android:src="@drawable/ic_event_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@color/colorAccent"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/gallery"
         app:layout_constraintEnd_toEndOf="@id/attach"
@@ -493,7 +493,7 @@
         android:elevation="4dp"
         android:padding="10dp"
         android:src="@drawable/ic_insert_photo_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@color/colorAccent"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/camera"
         app:layout_constraintEnd_toEndOf="@id/attach"
@@ -527,7 +527,7 @@
         android:elevation="4dp"
         android:padding="10dp"
         android:src="@drawable/ic_camera_alt_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
+        android:tint="@color/colorAccent"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@id/attach"
         app:layout_constraintEnd_toEndOf="@id/attach"
diff --git a/presentation/src/main/res/layout/container_activity.xml b/presentation/src/main/res/layout/container_activity.xml
index 16ca0bb1557f367273062e9ffe17ce3e08c048bc..4afa326b748c93e273376566785456038f37b1f8 100644
--- a/presentation/src/main/res/layout/container_activity.xml
+++ b/presentation/src/main/res/layout/container_activity.xml
@@ -40,10 +40,4 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="?android:attr/windowBackground" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml
index 973b1b22a9b9c573097c21c29321ebfb95c5a60b..bf776b00f609fcfa76a4da42cb6fddee2916edd3 100644
--- a/presentation/src/main/res/layout/main_activity.xml
+++ b/presentation/src/main/res/layout/main_activity.xml
@@ -112,7 +112,7 @@
             android:id="@+id/bottom"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?android:attr/divider"
+            android:background="@color/backgroundDark"
             app:layout_constraintBottom_toTopOf="@id/snackbar" />
 
         <ViewStub
diff --git a/presentation/src/main/res/layout/mms_file_list_item.xml b/presentation/src/main/res/layout/mms_file_list_item.xml
index 4c1550ee9de604c3c10cab7c957ec5a6b3240157..1ff74e07e0ef13ac370151877bf2b7ef230ab8ff 100644
--- a/presentation/src/main/res/layout/mms_file_list_item.xml
+++ b/presentation/src/main/res/layout/mms_file_list_item.xml
@@ -35,7 +35,7 @@
             android:layout_height="24dp"
             android:layout_marginStart="12dp"
             android:src="@drawable/ic_attachment_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
+            android:tint="@color/colorAccent"
             app:layout_constraintBottom_toBottomOf="@id/fileBackground"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/fileBackground" />
diff --git a/presentation/src/main/res/layout/mms_vcard_list_item.xml b/presentation/src/main/res/layout/mms_vcard_list_item.xml
index b237b016529ac8be669648335da2c5d6a56989ac..b2b9933245e079bbc53ac0ca1002e58850929e29 100644
--- a/presentation/src/main/res/layout/mms_vcard_list_item.xml
+++ b/presentation/src/main/res/layout/mms_vcard_list_item.xml
@@ -35,7 +35,7 @@
             android:layout_height="24dp"
             android:layout_marginStart="12dp"
             android:src="@drawable/ic_person_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
+            android:tint="@color/colorAccent"
             app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/vCardBackground" />
diff --git a/presentation/src/main/res/layout/notification_prefs_activity.xml b/presentation/src/main/res/layout/notification_prefs_activity.xml
index 5f130300dfe9ef71a200e8b4774118ee809dfb6b..befb918fc7fd236941b293542e4aff8f378502ac 100644
--- a/presentation/src/main/res/layout/notification_prefs_activity.xml
+++ b/presentation/src/main/res/layout/notification_prefs_activity.xml
@@ -162,7 +162,7 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/divider"
+        android:background="@color/backgroundDark"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml
index 3045c3670f9c2a36ba0307971c8d9d3f629c417f..1d2090fc9f9f73ceb08bd77d17ba1c1fbd6fead4 100644
--- a/presentation/src/main/res/layout/qksms_plus_activity.xml
+++ b/presentation/src/main/res/layout/qksms_plus_activity.xml
@@ -260,6 +260,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/divider" />
+        android:background="@color/backgroundDark" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml
index 37cbd78c88b3ad385fae580aa11277b1801bb224..79be1d327c3f53047b626c75798e08fc4e699d98 100644
--- a/presentation/src/main/res/layout/scheduled_activity.xml
+++ b/presentation/src/main/res/layout/scheduled_activity.xml
@@ -156,6 +156,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:background="?android:attr/divider" />
+        android:background="@color/backgroundDark" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml
index 79f1dbcfe5325190610bb21214ff9cb490104837..a36693d6fe411d5824d729a2029dd999e744e750 100644
--- a/presentation/src/main/res/values-night/themes.xml
+++ b/presentation/src/main/res/values-night/themes.xml
@@ -17,13 +17,14 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="AppBaseTheme" />
 
     <style name="AppBaseTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:divider">@color/separatorDark</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorPrimaryDark</item>
         <item name="android:queryBackground">@color/toolbarSearchBackgroundDark</item>
         <item name="android:statusBarColor">@color/statusBarDark</item>
         <item name="android:textColorPrimary">@color/text_primary</item>
@@ -70,6 +71,7 @@
     <!-- Black theme -->
     <style name="AppTheme.Black">
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorPrimaryDark</item>
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
         <item name="android:windowBackground">@color/backgroundDark</item>
         <item name="colorPrimary">@color/colorPrimary</item>
diff --git a/presentation/src/main/res/values-v27/themes.xml b/presentation/src/main/res/values-v27/themes.xml
index 3c37e9b56a2f91cc3cc951c037b1120b68918630..0dddc369cb0e63c9567185244081fcbbfc08c887 100644
--- a/presentation/src/main/res/values-v27/themes.xml
+++ b/presentation/src/main/res/values-v27/themes.xml
@@ -22,6 +22,7 @@
     <!-- On Oreo, use the light status and navigation bars -->
     <style name="AppTheme" parent="AppBaseTheme">
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarDividerColor">@color/colorPrimaryDark</item>
         <item name="android:statusBarColor">@color/statusBarLight</item>
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowLightStatusBar">true</item>
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
index 74f5114d620d8558e3949f62a57902d5418a8dce..4ed6f90af733214f0aba6d8e51382f3b6bed03ca 100644
--- a/presentation/src/main/res/values/themes.xml
+++ b/presentation/src/main/res/values/themes.xml
@@ -16,7 +16,7 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <attr name="bubbleColor" format="reference" />
     <attr name="composeBackground" format="reference" />
@@ -27,6 +27,7 @@
 
     <style name="AppLaunchTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorPrimaryDark</item>
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
         <item name="android:windowBackground">@color/backgroundLight</item>
         <item name="android:textCursorDrawable">@drawable/cursor</item>
@@ -59,6 +60,7 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="windowActionBar">false</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorPrimaryDark</item>
         <item name="android:textCursorDrawable">@drawable/cursor</item>
         <item name="alertDialogTheme">@style/customAlertDialog</item>
         <item name="android:alertDialogTheme">@style/customAlertDialog</item>