diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 954d5e3927dbb3ef2f8ff45006e8f8fae31a5b80..c4d4496acc2ff717f0ad39c10ea2badc8ce1530c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -16,10 +16,7 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
 import android.text.Html
-import android.view.Gravity
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
+import android.view.*
 import android.widget.EditText
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -41,6 +38,7 @@ import de.kuschku.quasseldroid.ui.chat.input.MessageHistoryAdapter
 import de.kuschku.quasseldroid.ui.settings.app.AppSettingsActivity
 import de.kuschku.quasseldroid.util.helper.editCommit
 import de.kuschku.quasseldroid.util.helper.invoke
+import de.kuschku.quasseldroid.util.helper.retint
 import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
 import de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
@@ -257,6 +255,11 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     editorPanel.panelState = SlidingUpPanelLayout.PanelState.COLLAPSED
   }
 
+  override fun onActionModeStarted(mode: ActionMode?) {
+    mode?.menu?.retint(toolbar.context)
+    super.onActionModeStarted(mode)
+  }
+
   override fun onStart() {
     if (Settings.autoComplete(this) != autoCompleteSettings) {
       recreate()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index da53bae836d5892b6a890b189718c6c318bcdd21..e6a55ceef714c35d98d5aa400963834639663570 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -105,7 +105,6 @@ class MessageListFragment : ServiceBoundFragment() {
     override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
       actionMode = mode
       mode?.menuInflater?.inflate(R.menu.context_messages, menu)
-      menu?.retint(requireContext())
       return true
     }
 
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
index abc5cc3a11689315080005da00c51e5be7a4a310..32a4c0e5b6fd229a88eed0eab774a0d7a47d6d1f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
@@ -10,9 +10,10 @@ fun Menu.retint(context: Context) {
     val color = getColor(0, 0)
 
     for (item in (0 until size()).map { getItem(it) }) {
-      val drawable = item.icon.mutate()
-      DrawableCompat.setTint(drawable, color)
-      item.icon = drawable
+      item.icon?.mutate()?.let { drawable ->
+        DrawableCompat.setTint(drawable, color)
+        item.icon = drawable
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 6fbeebcf0032e13d09f5ae5f1d47ad4d85667f74..2524553dd4f169a6210937e25f9275f274434210 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -20,6 +20,7 @@
     <item name="colorControlNormal">?colorTextPrimary</item>
     <item name="android:textColorPrimary">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="android:actionModeBackground">?colorPrimary</item>
   </style>
 
   <style name="Widget.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.ActionBar">