diff --git a/res/layout/activity_custom_devices.xml b/res/layout/activity_custom_devices.xml
index a9746768..ba16d8d8 100644
--- a/res/layout/activity_custom_devices.xml
+++ b/res/layout/activity_custom_devices.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:listitem="@layout/custom_device_item"/>
 
     <TextView
         android:id="@+id/emptyListMessage"
         style="@style/TextAppearance.AppCompat.Medium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:gravity="center_horizontal"
         android:text="@string/custom_device_list_help"
         />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
-        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        style="@style/KdeConnectThemeBase"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         app:elevation="@dimen/fab_elevation"
         app:srcCompat="@drawable/ic_add"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/values/styles-dark.xml b/res/values/styles-dark.xml
index c7d7e6f7..2da687be 100644
--- a/res/values/styles-dark.xml
+++ b/res/values/styles-dark.xml
@@ -1,41 +1,43 @@
 <resources>
 
     <color name="darkGrey">#555555</color>
     <color name="darkToolbarBackground">#222222</color>
     <color name="darkStatusBarBackground">#333333</color>
 
     <!-- KdeConnectThemeBase styles must only be defined in the main res/values/ folder -->
     <style name="KdeConnectThemeBase.Dark" parent="Theme.MaterialComponents">
-        <item name="colorPrimary">@color/darkGrey</item>
+        <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/darkStatusBarBackground</item>
+        <item name="colorSecondary">@color/primary</item>
+        <item name="colorOnSecondary">@android:color/black</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:windowBackground">@android:color/black</item>
         <item name="toolbarStyle">@style/KdeConnectTheme.Toolbar.Dark</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
         <item name="mainNavigationViewStyle">@style/MainNavigationView.Dark</item>
         <item name="colorHighContrast">@android:color/white</item>
         <item name="android:textColorPrimary">@android:color/white</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="KdeConnectThemeBase.Dark.NoActionBar" parent="KdeConnectThemeBase.Dark">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
     <!-- KdeConnectTheme styles (without the 'Base' on the end) can be redefined in other 'values' folders. like res/values-v21/ -->
 
     <style name="KdeConnectTheme.Toolbar.Dark">
         <item name="android:background">@color/darkToolbarBackground</item>
     </style>
     <style name="KdeConnectTheme.Dark" parent="KdeConnectThemeBase.Dark" />
     <style name="KdeConnectTheme.Dark.NoActionBar" parent="KdeConnectThemeBase.Dark.NoActionBar" />
 
     <style name="MainNavigationView.Dark">
         <item name="android:background">@drawable/state_list_drawer_background_dark</item>
         <item name="itemBackground">@drawable/state_list_drawer_background_dark</item>
         <item name="itemIconTint">@android:color/white</item>
         <item name="itemTextColor">@android:color/white</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 277a84e3..b5585697 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,58 +1,60 @@
 <resources>
     <color name="primary">#F67400</color>
     <color name="primaryDark">#BD5900</color>
     <color name="accent">#4ebffa</color>
     <color name="disabled_grey">#EEEEEE</color>
 
     <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
     <style name="KdeConnectThemeBase" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ -->
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="colorSecondary">@color/primary</item>
+        <item name="colorOnSecondary">@android:color/white</item>
         <item name="colorAccent">@color/accent</item>
         <item name="toolbarStyle">@style/KdeConnectTheme.Toolbar</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="mainNavigationViewStyle">@style/MainNavigationView</item>
         <item name="colorHighContrast">@android:color/black</item>
         <!-- TODO: The 2 items below change to much (eg snackbar text is now black, should be white) -->
         <item name="android:textColorPrimary">@android:color/black</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="actionModeStyle">@style/ActionModeStyle</item>
     </style>
 
     <style name="KdeConnectThemeBase.NoActionBar" parent="KdeConnectThemeBase">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
     <style name="KdeConnectTheme" parent="KdeConnectThemeBase" />
 
     <style name="KdeConnectTheme.Toolbar" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">?attr/colorPrimary</item>
     </style>
     <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar" />
 
     <style name="MainNavigationView">
         <item name="android:background">@drawable/state_list_drawer_background</item>
         <item name="itemBackground">@drawable/state_list_drawer_background</item>
         <item name="itemIconTint">@color/state_list_drawer_text</item>
         <item name="itemTextColor">@color/state_list_drawer_text</item>
     </style>
 
     <style name="DisableableButton" parent="ThemeOverlay.AppCompat">
         <item name="colorButtonNormal">@drawable/disableable_button</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
         <item name="background">@color/primaryDark</item>
     </style>
     <style name="Theme.Transparent" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 </resources>