diff --git a/app/src/main/res/layout/list_widgets_row.xml b/app/src/main/res/layout/list_widgets_row.xml
index 94eb068..147cc36 100644
--- a/app/src/main/res/layout/list_widgets_row.xml
+++ b/app/src/main/res/layout/list_widgets_row.xml
@@ -12,9 +12,8 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="?cardBackgroundColor"
-        app:cardElevation="8dp"
-        app:cardCornerRadius="12dp"
+        android:backgroundTint="#00000000"
+        app:cardElevation="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +21,6 @@
 
 
         <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 5482f9f..9650c57 100644
--- a/app/src/main/res/layout/tutorial_4_setup.xml
+++ b/app/src/main/res/layout/tutorial_4_setup.xml
@@ -33,27 +33,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tutorial_setup_title" />
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_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="0dp"
         android:layout_height="0dp"
-        app:cardElevation="8dp"
-        app:cardBackgroundColor="?cardBackgroundColor"
-        app:cardCornerRadius="12dp"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintTop_toBottomOf="@id/tutorial_setup_subtitle"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toTopOf="@id/tutorial_setup_text_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        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>
+        app:layout_constraintTop_toBottomOf="@id/tutorial_setup_subtitle" />
 
     <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 1defe2f..c5b7252 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,6 @@
 
         <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>-->
 
@@ -33,7 +32,6 @@
         <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>
 
@@ -42,7 +40,6 @@
         <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>
 
@@ -51,7 +48,6 @@
         <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>
 
@@ -61,7 +57,6 @@
         <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>