diff --git a/src/components/ha-cards.html b/src/components/ha-cards.html
index c45971cdbf..717161e063 100644
--- a/src/components/ha-cards.html
+++ b/src/components/ha-cards.html
@@ -18,7 +18,6 @@
 
     .badges {
       margin-top: 16px;
-      margin-left: 8px;
       font-size: 85%;
       text-align: center;
     }
diff --git a/src/layouts/partial-dev-call-service.html b/src/layouts/partial-dev-call-service.html
index dcd2e6dadd..ceb005d4d4 100644
--- a/src/layouts/partial-dev-call-service.html
+++ b/src/layouts/partial-dev-call-service.html
@@ -36,7 +36,7 @@
   </style>
   <template>
     <partial-base narrow="[[narrow]]" show-menu='[[showMenu]]'>
-      <span header-title>Call Service</span>
+      <span header-title>Services</span>
 
       <div class$='[[computeFormClasses(narrow)]]'>
         <div class='flex'>
diff --git a/src/layouts/partial-dev-fire-event.html b/src/layouts/partial-dev-fire-event.html
index b96c552f8d..face922dc5 100644
--- a/src/layouts/partial-dev-fire-event.html
+++ b/src/layouts/partial-dev-fire-event.html
@@ -32,7 +32,7 @@
 
   <template>
     <partial-base narrow="{{narrow}}" show-menu='[[showMenu]]'>
-      <span header-title>Fire Event</span>
+      <span header-title>Events</span>
 
       <div class$='[[computeFormClasses(narrow)]]'>
         <div class='flex'>
diff --git a/src/layouts/partial-dev-set-state.html b/src/layouts/partial-dev-set-state.html
index e54298f8eb..1c95bb1fdf 100644
--- a/src/layouts/partial-dev-set-state.html
+++ b/src/layouts/partial-dev-set-state.html
@@ -32,7 +32,7 @@
 
   <template>
     <partial-base narrow="[[narrow]]" show-menu='[[showMenu]]'>
-      <span header-title>Set State</span>
+      <span header-title>States</span>
 
       <div class$='[[computeFormClasses(narrow)]]'>
         <div class='flex'>