diff --git a/panels/dev-event/ha-panel-dev-event.html b/panels/dev-event/ha-panel-dev-event.html
index 41b6a17b4b..344856de5f 100644
--- a/panels/dev-event/ha-panel-dev-event.html
+++ b/panels/dev-event/ha-panel-dev-event.html
@@ -27,7 +27,7 @@
       }
       .content {
         @apply(--paper-font-body1);
-        padding: 24px;
+        padding: 16px;
       }
 
       .ha-form {
diff --git a/panels/dev-info/ha-panel-dev-info.html b/panels/dev-info/ha-panel-dev-info.html
index 3313fea75d..fac7668756 100644
--- a/panels/dev-info/ha-panel-dev-info.html
+++ b/panels/dev-info/ha-panel-dev-info.html
@@ -21,7 +21,7 @@
       }
 
       .content {
-        padding: 24px;
+        padding: 16px;
       }
 
       .about {
diff --git a/panels/dev-service/ha-panel-dev-service.html b/panels/dev-service/ha-panel-dev-service.html
index 0e85c804b3..45fab19bd1 100644
--- a/panels/dev-service/ha-panel-dev-service.html
+++ b/panels/dev-service/ha-panel-dev-service.html
@@ -25,7 +25,7 @@
       }
 
       .content {
-        padding: 24px;
+        padding: 16px;
       }
 
       .ha-form {
diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.html
index ac5fc330ad..4b4ebe53ad 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.html
@@ -24,7 +24,7 @@
       }
 
       .content {
-        padding: 24px;
+        padding: 16px;
       }
 
       .entities th {
@@ -59,8 +59,10 @@
 
       <div class='content'>
         <div>
-          Set the representation of a device within Home Assistant.<br />
-          This will not communicate with the actual device.
+          <p>
+            Set the representation of a device within Home Assistant.<br />
+            This will not communicate with the actual device.
+          </p>
 
           <paper-input label="Entity ID" autofocus required value='{{_entityId}}'></paper-input>
           <paper-input label="State" required value='{{_state}}'></paper-input>
diff --git a/panels/dev-template/ha-panel-dev-template.html b/panels/dev-template/ha-panel-dev-template.html
index 9012dfe13d..ecc136913c 100644
--- a/panels/dev-template/ha-panel-dev-template.html
+++ b/panels/dev-template/ha-panel-dev-template.html
@@ -23,7 +23,7 @@
       }
 
       .content {
-        padding: 24px;
+        padding: 16px;
       }
 
       .edit-pane {
diff --git a/panels/history/ha-panel-history.html b/panels/history/ha-panel-history.html
index 750d4d0a93..c6b44dcda1 100644
--- a/panels/history/ha-panel-history.html
+++ b/panels/history/ha-panel-history.html
@@ -16,20 +16,12 @@
   <template>
     <style include="iron-flex ha-style">
       .content {
-        background-color: white;
-      }
-
-      .content.wide {
-        padding: 8px;
+        padding: 16px;
       }
 
       paper-input {
         max-width: 200px;
       }
-
-      .narrow paper-input {
-        margin-left: 8px;
-      }
     </style>
 
     <app-header-layout has-scrolling-region>
@@ -44,7 +36,7 @@
         </app-toolbar>
       </app-header>
 
-      <div class$="[[computeContentClasses(narrow)]]">
+      <div class="flex content">
         <paper-input
           label='Showing entries for'
           id='datePicker'
@@ -156,8 +148,5 @@ Polymer({
     this.datePicker.destroy();
   },
 
-  computeContentClasses: function (narrow) {
-    return narrow ? 'flex content narrow' : 'flex content wide';
-  },
 });
 </script>
diff --git a/panels/logbook/ha-logbook.html b/panels/logbook/ha-logbook.html
index 3f05bec734..871b22daba 100644
--- a/panels/logbook/ha-logbook.html
+++ b/panels/logbook/ha-logbook.html
@@ -9,7 +9,6 @@
     <style>
       :host {
         display: block;
-        padding: 16px;
       }
 
       .entry {
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.html
index e47ac12c3e..6c7e69bee2 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.html
@@ -18,8 +18,8 @@
 <dom-module id="ha-panel-logbook">
   <template>
     <style include="ha-style">
-    .selected-date-container {
-      padding: 0 16px;
+    .content {
+      padding: 16px;
     }
 
     paper-input {
@@ -43,7 +43,7 @@
         </app-toolbar>
       </app-header>
 
-      <div>
+      <div class="flex content">
         <div class='selected-date-container'>
           <paper-input
             label='Showing entries for'
@@ -167,5 +167,6 @@ Polymer({
   detached: function () {
     this.datePicker.destroy();
   },
+
 });
 </script>