diff --git a/src/panels/history/ha-panel-history.js b/src/panels/history/ha-panel-history.js
index 70f8ee2d03..432f24d247 100644
--- a/src/panels/history/ha-panel-history.js
+++ b/src/panels/history/ha-panel-history.js
@@ -41,7 +41,10 @@ class HaPanelHistory extends LocalizeMixin(PolymerElement) {
           margin-right: 16px;
           margin-top: 5px;
           --paper-input-container-label-floating: {
-            padding-bottom: 10px;
+            padding-bottom: 11px;
+          }
+          --paper-input-suffix: {
+            height: 24px;
           }
         }
 
diff --git a/src/panels/logbook/ha-panel-logbook.js b/src/panels/logbook/ha-panel-logbook.js
index c0a1a66133..3c2c0d0f85 100644
--- a/src/panels/logbook/ha-panel-logbook.js
+++ b/src/panels/logbook/ha-panel-logbook.js
@@ -52,7 +52,7 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
 
         .filters {
           display: flex;
-          align-items: center;
+          align-items: flex-end;
         }
 
         :host([narrow]) .filters {
@@ -73,7 +73,10 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
           max-width: 100px;
           margin-right: 16px;
           --paper-input-container-label-floating: {
-            padding-bottom: 10px;
+            padding-bottom: 11px;
+          }
+          --paper-input-suffix: {
+            height: 24px;
           }
         }
 
@@ -92,6 +95,9 @@ class HaPanelLogbook extends LocalizeMixin(PolymerElement) {
           display: inline-block;
           flex-grow: 1;
           max-width: 400px;
+          --paper-input-suffix: {
+            height: 24px;
+          }
         }
 
         :host([narrow]) ha-entity-picker {
diff --git a/src/resources/ha-date-picker-style.js b/src/resources/ha-date-picker-style.js
index 61d8d80b7e..185b29d453 100644
--- a/src/resources/ha-date-picker-style.js
+++ b/src/resources/ha-date-picker-style.js
@@ -6,7 +6,8 @@ documentContainer.innerHTML = `
   <template>
     <style>
       :host {
-        padding: 8px 0;
+        padding: 8px 0 11px 0;
+        margin: 0;
       }
 
       [part~="label"] {
@@ -35,6 +36,9 @@ documentContainer.innerHTML = `
 
       [part~="value"] {
         font-size: var(--paper-font-subhead_-_font-size);
+        height: 24px;
+        padding-top: 4px;
+        padding-bottom: 0;
       }
     </style>
   </template>