diff --git a/src/controls/templates/SwipeListItem.qml b/src/controls/templates/SwipeListItem.qml
--- a/src/controls/templates/SwipeListItem.qml
+++ b/src/controls/templates/SwipeListItem.qml
@@ -238,13 +238,13 @@
             anchors {
                 right: parent.right
                 verticalCenter: parent.verticalCenter
-                rightMargin: Units.gridUnit
+                rightMargin: behindItem.view && behindItem.view.parent.T2.ScrollBar && behindItem.view.parent.T2.ScrollBar.vertical && behindItem.view.parent.T2.ScrollBar.vertical.visible ? behindItem.view.parent.T2.ScrollBar.vertical.width : Units.smallSpacing
             }
             height: Math.min( parent.height / 1.5, Units.iconSizes.smallMedium)
             width: childrenRect.width
             property bool exclusive: false
             property Item checkedButton
-            spacing: Units.largeSpacing
+            spacing: Settings.tabletMode ? Units.largeSpacing : 0
             property int visibleActions: 0
             Repeater {
                 model: {
@@ -306,7 +306,7 @@
         anchors {
             right: parent.right
             verticalCenter: parent.verticalCenter
-            rightMargin: !Settings.isMobile && behindItem.view && behindItem.view.T2.ScrollBar && behindItem.view.T2.ScrollBar.vertical && behindItem.view.T2.ScrollBar.vertical.visible ? behindItem.view.T2.ScrollBar.vertical.width : Units.smallSpacing
+            rightMargin: behindItem.view && behindItem.view.parent.T2.ScrollBar && behindItem.view.parent.T2.ScrollBar.vertical && behindItem.view.parent.T2.ScrollBar.vertical.visible ? behindItem.view.parent.T2.ScrollBar.vertical.width : Units.smallSpacing
         }
 
         preventStealing: true