diff --git a/core/src/main/res/layout/maintenance_import_list_item.xml b/core/src/main/res/layout/maintenance_import_list_item.xml
index 30b58d31f0..50859ad4c5 100644
--- a/core/src/main/res/layout/maintenance_import_list_item.xml
+++ b/core/src/main/res/layout/maintenance_import_list_item.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/careportal_cardview"
+    style="@style/Widget.MaterialComponents.CardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    card_view:cardElevation="0dp"
-    card_view:cardBackgroundColor="?attr/cardItemBackgroundColor">
+    android:layout_marginStart="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginTop="4dp"
+    app:strokeColor="?attr/strokeColor"
+    app:strokeWidth="2dp"
+    app:cardCornerRadius="3dp"
+    app:contentPadding="2dp"
+    app:cardElevation="2dp"
+    app:cardUseCompatPadding="false"
+    android:layout_gravity="center">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -30,7 +37,7 @@
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="6dp"
                 android:layout_marginBottom="1dp"
-                card_view:srcCompat="@drawable/ic_meta_format"
+                app:srcCompat="@drawable/ic_meta_format"
                 app:tint="?attr/importListFileNameColor" />
 
             <TextView
@@ -91,7 +98,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
-                card_view:srcCompat="@drawable/ic_meta_name"
+                app:srcCompat="@drawable/ic_meta_name"
                 app:tint="?attr/importListAdditionalInfoColor" />
 
             <TextView
@@ -123,7 +130,7 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginBottom="1dp"
-                card_view:srcCompat="@drawable/ic_meta_date"
+                app:srcCompat="@drawable/ic_meta_date"
                 app:tint="?attr/importListAdditionalInfoColor" />
 
             <TextView
@@ -156,16 +163,6 @@
 
         </LinearLayout>
 
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="7dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="3dp"
-            android:background="?android:attr/dividerHorizontal" />
-
     </LinearLayout>
 
-</androidx.cardview.widget.CardView>
+</com.google.android.material.card.MaterialCardView>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index dcef1bf39c..b0b4a086b6 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -223,6 +223,8 @@
         <item name="bgiColor">@color/bgi</item>
         <item name="ratioColor">@color/ratio</item>
         <item name="activityColor">@color/activity</item>
+        <!-- CardView specific colors  -->
+        <item name="strokeColor">@color/plastic_grey</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 095291bc71..c2364008d3 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -203,4 +203,6 @@
     <attr name="bgiColor" format="reference|color" />
     <attr name="ratioColor" format="reference|color" />
     <attr name="activityColor" format="reference|color" />
+    <!-- CardView specific colors  -->
+    <attr name="strokeColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 771e8869f0..9cebe24152 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -36,7 +36,7 @@
     <color name="tabSelectedText">@color/black_alpha_90</color>
 
     <!--    Buttons-->
-    <color name="buttonBackground">@color/midlightgray</color>
+    <color name="buttonBackground">#B2B2B2</color>
     <color name="buttonText">#000000</color>
     <color name="okButtonText">@color/colorAccent</color>
     <color name="okButtonSelected">#33969696</color>
@@ -146,12 +146,12 @@
     <color name="transparent">#00000000</color>
 
     <!-- Maintenance -->
-    <color name="metadataOk">#77dd77</color>
+    <color name="metadataOk">#66BB6A</color>
     <color name="metadataTextWarning">#FF8C00</color>
     <color name="metadataTextError">#FF5555</color>
 
     <!-- Import/Export -->
-    <color name="importListAdditionalInfo">#757575</color>
+    <color name="importListAdditionalInfo">#666666</color>
     <color name="importListFileName">#000000</color>
 
     <color name="ribbonWarning">#f4d700</color>
@@ -190,7 +190,7 @@
     <color name="cardObjectiveText">#779ECB</color>
 
     <color name="colorAcceptTempButton">#E19701</color>
-    <color name="colorTreatmentButton">#42A5F5</color>
+    <color name="colorTreatmentButton">#429BF5</color>
     <color name="colorInsulinButton">#67dfe8</color>
     <color name="colorCarbsButton">#E19701</color>
     <color name="colorCalibrationButton">#e93057</color>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 810077f242..f1dbc5de9d 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -231,6 +231,8 @@
         <item name="bgiColor">@color/bgi</item>
         <item name="ratioColor">@color/ratio</item>
         <item name="activityColor">@color/activity</item>
+        <!-- CardView specific colors  -->
+        <item name="strokeColor">@color/plastic_grey</item>
     </style>
 
     <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>