diff --git a/bundles/org.openhab.ui/web/src/components/widgets/standard/oh-card.vue b/bundles/org.openhab.ui/web/src/components/widgets/standard/oh-card.vue
index fcf8325334..6f9fede361 100644
--- a/bundles/org.openhab.ui/web/src/components/widgets/standard/oh-card.vue
+++ b/bundles/org.openhab.ui/web/src/components/widgets/standard/oh-card.vue
@@ -28,10 +28,8 @@
 .oh-col >
 .oh-masonry-item >
   .oh-card
-    --f7-safe-area-left 0px
-    --f7-safe-area-right 0px
-    --f7-safe-area-top 0px
-    --f7-safe-area-bottom 0px
+    margin-left var(--f7-card-margin-horizontal)
+    margin-right var(--f7-card-margin-horizontal)
 </style>
 
 <script>
diff --git a/bundles/org.openhab.ui/web/src/css/app.styl b/bundles/org.openhab.ui/web/src/css/app.styl
index d9bf8c4b4a..290c55fd91 100644
--- a/bundles/org.openhab.ui/web/src/css/app.styl
+++ b/bundles/org.openhab.ui/web/src/css/app.styl
@@ -311,9 +311,12 @@ html
       color var(--f7-input-text-color)
 
 // Fix safe area issues inside f7-card components, where safe areas are already respected by the f7-card itself
-.card >
-  div
-    --f7-safe-area-left 0px
-    --f7-safe-area-right 0px
-    --f7-safe-area-top 0px
-    --f7-safe-area-bottom 0px
+.card
+  .block
+    padding-left var(--f7-block-padding-horizontal) !important
+    padding-right var(--f7-block-padding-horizontal) !important
+  .media-item
+    .item-content
+      padding-left var(--f7-list-item-padding-horizontal)
+      .item-inner
+        padding-right var(--f7-list-item-padding-horizontal)