diff --git a/src/panels/lovelace/entity-rows/hui-cover-entity-row.js b/src/panels/lovelace/entity-rows/hui-cover-entity-row.js
index 0e2a50363e..435f34a215 100644
--- a/src/panels/lovelace/entity-rows/hui-cover-entity-row.js
+++ b/src/panels/lovelace/entity-rows/hui-cover-entity-row.js
@@ -9,6 +9,12 @@ import CoverEntity from '../../../util/cover-model.js';
 class HuiCoverEntityRow extends PolymerElement {
   static get template() {
     return html`
+      <style>
+        ha-cover-controls,
+        ha-cover-tilt-controls {
+          margin-right: -.57em;
+        }
+      </style>
       <hui-generic-entity-row
         hass="[[hass]]"
         config="[[_config]]"
diff --git a/src/panels/lovelace/entity-rows/hui-lock-entity-row.js b/src/panels/lovelace/entity-rows/hui-lock-entity-row.js
index ff71a74380..1d43603516 100644
--- a/src/panels/lovelace/entity-rows/hui-lock-entity-row.js
+++ b/src/panels/lovelace/entity-rows/hui-lock-entity-row.js
@@ -16,7 +16,7 @@ class HuiLockEntityRow extends LocalizeMixin(PolymerElement) {
         paper-button {
           color: var(--primary-color);
           font-weight: 500;
-          margin: 0;
+          margin-right: -.57em;
         }
       </style>
       <hui-generic-entity-row
diff --git a/src/panels/lovelace/entity-rows/hui-scene-entity-row.js b/src/panels/lovelace/entity-rows/hui-scene-entity-row.js
index c5fb0a954f..c8ed756450 100644
--- a/src/panels/lovelace/entity-rows/hui-scene-entity-row.js
+++ b/src/panels/lovelace/entity-rows/hui-scene-entity-row.js
@@ -16,7 +16,7 @@ class HuiSceneEntityRow extends LocalizeMixin(PolymerElement) {
         paper-button {
           color: var(--primary-color);
           font-weight: 500;
-          margin: 0;
+          margin-right: -.57em;
         }
       </style>
       <hui-generic-entity-row
diff --git a/src/panels/lovelace/entity-rows/hui-script-entity-row.js b/src/panels/lovelace/entity-rows/hui-script-entity-row.js
index 0cbb5f5931..c2314c55eb 100644
--- a/src/panels/lovelace/entity-rows/hui-script-entity-row.js
+++ b/src/panels/lovelace/entity-rows/hui-script-entity-row.js
@@ -17,7 +17,7 @@ class HuiScriptEntityRow extends LocalizeMixin(PolymerElement) {
         paper-button {
           color: var(--primary-color);
           font-weight: 500;
-          margin: 0;
+          margin-right: -.57em;
         }
       </style>
       <hui-generic-entity-row
diff --git a/src/panels/lovelace/special-rows/hui-call-service-row.js b/src/panels/lovelace/special-rows/hui-call-service-row.js
index 7b1c91816b..442da03ab3 100644
--- a/src/panels/lovelace/special-rows/hui-call-service-row.js
+++ b/src/panels/lovelace/special-rows/hui-call-service-row.js
@@ -33,7 +33,7 @@ class HuiCallServiceRow extends PolymerElement {
         paper-button {
           color: var(--primary-color);
           font-weight: 500;
-          margin: 0;
+          margin-right: -.57em;
         }
       </style>
       <ha-icon icon="[[_config.icon]]"></ha-icon>