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
@@ -26,7 +26,7 @@
 
     <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"
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
@@ -6,8 +6,10 @@
 
     <!-- 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>
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
@@ -9,6 +9,8 @@
         <!-- 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>