diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
index 491f27e303d763e2c0199741e56be44cb2a87f7d..b51cad3a665c63bf6a70cc3a350e964a12871786 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
@@ -108,9 +108,10 @@ class BackupController : QkController<BackupView, BackupState, BackupPresenter>(
 
         progressBar.indeterminateTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme))
         progressBar.progressTintList = ColorStateList.valueOf(ContextCompat.getColor(progressBar.context, R.color.tools_theme))
-        fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme))
-        fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.tools_theme))
 
+        fabIcon.setTint(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark))
+        fabLabel.setTextColor(ContextCompat.getColor(fabIcon.context, R.color.colorPrimaryDark))
+        fab.setBackgroundTint(ContextCompat.getColor(fabIcon.context, R.color.tools_theme))
 
         // Make the list titles bold
         linearLayout.children
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
index 4c17fab585880e2fb0444b3b1b0187019c88b812..8bdf1420059f1fe6669ed76c4f9c3231ead8919d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
@@ -30,6 +30,7 @@ import com.moez.QKSMS.common.base.QkViewHolder
 import com.moez.QKSMS.common.util.Colors
 import com.moez.QKSMS.common.util.extensions.forwardTouches
 import com.moez.QKSMS.common.util.extensions.setTint
+
 import com.moez.QKSMS.extensions.associateByNotNull
 import com.moez.QKSMS.model.Contact
 import com.moez.QKSMS.model.ContactGroup
@@ -65,8 +66,7 @@ class ComposeItemAdapter @Inject constructor(
         val layoutInflater = LayoutInflater.from(parent.context)
         val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false)
 
-        view.icon.setColorFilter(ContextCompat.getColor(parent.context, R.color.emphasis));
-        view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis))
+           view.index.setTextColor(ContextCompat.getColor(parent.context, R.color.emphasis))
 
         view.numbers.setRecycledViewPool(numbersViewPool)
         view.numbers.adapter = PhoneNumberAdapter()
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
index 4aa113e186a119af1269e446014510d7d87411fe..bdce36e93f08af44d046ae31ccef9d274bacb1a3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
@@ -32,7 +32,10 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
 import com.moez.QKSMS.common.util.extensions.setTint
 import dagger.android.AndroidInjection
 import kotlinx.android.synthetic.main.collapsing_toolbar.*
+import kotlinx.android.synthetic.main.main_activity.*
 import kotlinx.android.synthetic.main.scheduled_activity.*
+import kotlinx.android.synthetic.main.scheduled_activity.compose
+import kotlinx.android.synthetic.main.scheduled_activity.empty
 import javax.inject.Inject
 
 
@@ -80,8 +83,12 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
 
         sampleMessage.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme))
         sampleMessage.setTextColor(ContextCompat.getColor(this, R.color.white))
-        compose.setTint(ContextCompat.getColor(this, R.color.tools_theme))
-        compose.setBackgroundTint(ContextCompat.getColor(this, R.color.colorPrimaryDark))
+
+        // Set the FAB compose icon color
+        compose.setTint(ContextCompat.getColor(this, R.color.colorPrimaryDark))
+        //set the FAB background color
+        compose.setBackgroundTint(ContextCompat.getColor(this, R.color.tools_theme))
+
 
     }
 
diff --git a/presentation/src/main/res/drawable/ic_people_black_24dp.xml b/presentation/src/main/res/drawable/ic_people_black_24dp.xml
index 91306539f7c2ad5ab82feec33a65a3924fdf0df7..c1535c5b8d3434c97ad9085511791a0cd2e96856 100644
--- a/presentation/src/main/res/drawable/ic_people_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_people_black_24dp.xml
@@ -22,6 +22,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/emphasis"
         android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
 </vector>
diff --git a/presentation/src/main/res/drawable/ic_star_black_24dp.xml b/presentation/src/main/res/drawable/ic_star_black_24dp.xml
index a1b975f41903eec8fec217f9190b910eb4a4e988..61c6406d5f43a401773df4e7645a3a1bead9a84a 100644
--- a/presentation/src/main/res/drawable/ic_star_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_star_black_24dp.xml
@@ -22,6 +22,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/emphasis"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
 </vector>
diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml
index f938ba89e4c62bce057b76e721f8285f510bdd81..82f2c01f2afad458f6fc00852127261a2e3810c8 100644
--- a/presentation/src/main/res/menu/blocked_messages.xml
+++ b/presentation/src/main/res/menu/blocked_messages.xml
@@ -24,7 +24,6 @@
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/main_menu_delete"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -32,7 +31,6 @@
         android:icon="@drawable/ic_block_white_24dp"
         android:title="@string/main_menu_block"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml
index 9c4a21c335273e8b7f3afa19ad99d1458a3a4c67..3d0dac325800d33934acfdda00375a0b387c62a0 100644
--- a/presentation/src/main/res/menu/compose.xml
+++ b/presentation/src/main/res/menu/compose.xml
@@ -31,7 +31,7 @@
         android:icon="@drawable/ic_call_white_24dp"
         android:title="@string/menu_call"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
+        app:iconTint="@color/emphasis"
         app:showAsAction="always" />
 
     <item
@@ -39,7 +39,7 @@
         android:icon="@drawable/ic_more_vert_black_24dp"
         android:title="@string/menu_info"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
+        app:iconTint="@color/emphasis"
         app:showAsAction="always" />
 
     <item
@@ -47,7 +47,6 @@
         android:icon="@drawable/ic_info_black_24dp"
         android:title="@string/compose_menu_copy"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -55,7 +54,6 @@
         android:icon="@lineageos.platform:drawable/ic_bin"
         android:title="@string/compose_menu_delete"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -63,7 +61,6 @@
         android:icon="@drawable/ic_content_copy_black_24dp"
         android:title="@string/compose_menu_copy"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -71,7 +68,6 @@
         android:icon="@drawable/ic_forward_black_24dp"
         android:title="@string/compose_menu_forward"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -79,7 +75,6 @@
         android:icon="@drawable/ic_keyboard_arrow_up_black_24dp"
         android:title="@string/compose_menu_previous"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="always" />
 
     <item
@@ -87,7 +82,6 @@
         android:icon="@drawable/ic_keyboard_arrow_down_black_24dp"
         android:title="@string/compose_menu_next"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="always" />
 
     <item
@@ -95,7 +89,6 @@
         android:icon="@drawable/ic_clear_black_24dp"
         android:title="@string/compose_menu_clear"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml
index 32444b2e418f7a3f41fd2afee744a480d7d43b3b..58eaca6f20ce05b7d284c110817660defc17166d 100644
--- a/presentation/src/main/res/menu/main.xml
+++ b/presentation/src/main/res/menu/main.xml
@@ -25,7 +25,6 @@
         android:icon="@lineageos.platform:drawable/ic_archive"
         android:title="@string/main_menu_archive"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -33,7 +32,6 @@
         android:icon="@drawable/ic_inbox_black_24dp"
         android:title="@string/main_menu_unarchive"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -41,7 +39,6 @@
         android:icon="@lineageos.platform:drawable/ic_bin"
         android:title="@string/main_menu_delete"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -49,7 +46,6 @@
         android:icon="@drawable/ic_person_add_black_24dp"
         android:title="@string/main_menu_add_contact"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -57,7 +53,6 @@
         android:icon="@drawable/ic_baseline_push_pin_24"
         android:title="@string/main_menu_pin"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -65,7 +60,6 @@
         android:icon="@drawable/ic_baseline_push_pin_24"
         android:title="@string/main_menu_unpin"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -73,7 +67,6 @@
         android:icon="@drawable/ic_drafts_black_24dp"
         android:title="@string/main_menu_read"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -81,7 +74,6 @@
         android:icon="@drawable/ic_markunread_black_24dp"
         android:title="@string/main_menu_unread"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -89,7 +81,6 @@
         android:icon="@drawable/ic_block_black_24dp"
         android:title="@string/main_menu_block"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml
index f8ba10aa7891025d1b99c01e699e9bd864a4a1ae..bd19151bac77c5c43126fe6d75db068fdad26a65 100644
--- a/presentation/src/main/res/menu/qkreply.xml
+++ b/presentation/src/main/res/menu/qkreply.xml
@@ -23,14 +23,12 @@
         android:id="@+id/read"
         android:icon="@drawable/ic_check_white_24dp"
         android:title="@string/qkreply_menu_read"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/expand"
         android:icon="@drawable/ic_unfold_more_black_24dp"
         android:title="@string/qkreply_menu_expand"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
@@ -38,7 +36,6 @@
         android:icon="@drawable/ic_unfold_less_black_24dp"
         android:title="@string/qkreply_menu_collapse"
         android:visible="false"
-        app:iconTint="@color/tools_theme"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
index 2eb68b3d4e58a578d349b2a7c8351f81d2405e0b..7e9c4408a0f0d0ca9936a7bc597ff7ec6bd0e922 100644
--- a/presentation/src/main/res/values/colors.xml
+++ b/presentation/src/main/res/values/colors.xml
@@ -80,7 +80,7 @@
     <color name="red_draft">#FF5D5D</color>
     <color name="avatar_bg_color">#e0e0e0</color>
     <color name="avatar_icon_color">#383838</color>
-    <color name="emphasis">#DE000000</color>
+    <color name="emphasis">#99000000</color>