diff --git a/app/src/main/res/layout/list_widgets_row.xml b/app/src/main/res/layout/list_widgets_row.xml
index 147cc36..94eb068 100644
--- a/app/src/main/res/layout/list_widgets_row.xml
+++ b/app/src/main/res/layout/list_widgets_row.xml
@@ -12,8 +12,9 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:backgroundTint="#00000000"
-        app:cardElevation="0dp"
+        app:cardBackgroundColor="?cardBackgroundColor"
+        app:cardElevation="8dp"
+        app:cardCornerRadius="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,6 +22,7 @@
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_margin="10dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/app/src/main/res/layout/tutorial_4_setup.xml b/app/src/main/res/layout/tutorial_4_setup.xml
index 9650c57..5482f9f 100644
--- a/app/src/main/res/layout/tutorial_4_setup.xml
+++ b/app/src/main/res/layout/tutorial_4_setup.xml
@@ -33,17 +33,27 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tutorial_setup_title" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/tutorial_setup_actions_rview_fragment"
-        android:name="de.jrpie.android.launcher.ui.settings.actions.SettingsFragmentActionsRecycler"
-        android:layout_width="0dp"
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginBottom="16dp"
+        app:cardElevation="8dp"
+        app:cardBackgroundColor="?cardBackgroundColor"
+        app:cardCornerRadius="12dp"
+        app:cardUseCompatPadding="true"
+        app:layout_constraintTop_toBottomOf="@id/tutorial_setup_subtitle"
         app:layout_constraintBottom_toTopOf="@id/tutorial_setup_text_bottom"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tutorial_setup_subtitle" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/tutorial_setup_actions_rview_fragment"
+            android:name="de.jrpie.android.launcher.ui.settings.actions.SettingsFragmentActionsRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginVertical="4dp"
+            android:layout_marginStart="10dp"/>
+
+    </androidx.cardview.widget.CardView>
 
     <TextView
         android:id="@+id/tutorial_setup_text_bottom"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c5b7252..1defe2f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,7 @@
 
         <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="colorButtonNormal">?colorAccent</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
 
         <!--<item name="android:popupMenuStyle">@style/PopupMenuCustom</item>-->
 
@@ -32,6 +33,7 @@
         <item name="colorPrimaryDark">@color/darkTheme_background_color</item>
         <item name="colorAccent">@color/darkTheme_accent_color</item>
         <item name="android:colorBackground">@color/darkTheme_background_color</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
         <item name="android:textColor">@color/darkTheme_text_color</item>
     </style>
 
@@ -40,6 +42,7 @@
         <item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
         <item name="colorAccent">@color/finnmglasTheme_accent_color</item>
         <item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
         <item name="android:textColor">@color/finnmglasTheme_text_color</item>
     </style>
 
@@ -48,6 +51,7 @@
         <item name="colorPrimaryDark">@color/lightTheme_background_color</item>
         <item name="colorAccent">@color/lightTheme_accent_color</item>
         <item name="android:colorBackground">@color/lightTheme_background_color</item>
+        <item name="cardBackgroundColor">@color/cardview_light_background</item>
         <item name="android:textColor">@color/lightTheme_text_color</item>
     </style>
 
@@ -57,6 +61,7 @@
         <item name="colorPrimaryDark">@color/material_dynamic_primary50</item>
         <item name="colorAccent">@color/material_dynamic_tertiary50</item>
         <item name="android:colorBackground">@color/material_dynamic_neutral10</item>
+        <item name="cardBackgroundColor">@color/cardview_dark_background</item>
         <item name="android:textColor">@color/material_dynamic_neutral_variant90</item>
     </style>