diff --git a/src/more-infos/more-info-climate.html b/src/more-infos/more-info-climate.html
index 6a197bea39..063b8136d4 100644
--- a/src/more-infos/more-info-climate.html
+++ b/src/more-infos/more-info-climate.html
@@ -42,6 +42,7 @@
       .has-swing_list .container-swing_list,
       .has-swing_mode .container-swing_list {
         display: block;
+        margin-bottom: 5px;
       }
 
       .container-operation_list iron-icon,
diff --git a/src/state-summary/state-card-climate.html b/src/state-summary/state-card-climate.html
index 95c1d88ddf..f33498a8ed 100644
--- a/src/state-summary/state-card-climate.html
+++ b/src/state-summary/state-card-climate.html
@@ -26,7 +26,7 @@
         color: var(--secondary-text-color);
       }
 
-      .operation-mode {
+      .state-label {
         font-weight: bold;
         text-transform: capitalize;
       }
@@ -36,8 +36,8 @@
       <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
       <div class='state'>
         <div class='target'>
-          <span class="operation-mode">
-            [[stateObj.attributes.operation_mode]]
+          <span class="state-label">
+            [[stateObj.state]]
           </span>
           <span>
             [[computeTargetTemperature(stateObj)]]