diff --git a/themes/esphome-theme/assets/css/main.css b/themes/esphome-theme/assets/css/main.css
index fcc5a5651c..8237f4bc40 100644
--- a/themes/esphome-theme/assets/css/main.css
+++ b/themes/esphome-theme/assets/css/main.css
@@ -23,7 +23,7 @@
   --getting-started-text: #333;
   --nav-bg: #fff;
   --nav-text: #333;
-  --dropdown-bg: #fff;
+  --dropdown-bg: var(--background-color);
   --dropdown-text: #333;
   --footer-bg: #111;
   --footer-text: #e1e1e1;
@@ -522,7 +522,7 @@ img.align-right, figure.align-right, .figure.align-right, object.align-right {
   position: absolute;
   background-color: var(--dropdown-bg);
   min-width: 200px;
-  box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+  text-align: right;
   z-index: 1;
   border-radius: 4px;
 }
@@ -533,11 +533,6 @@ img.align-right, figure.align-right, .figure.align-right, object.align-right {
   display: block;
 }
 
-.dropdown-content a:hover {
-  background-color: var(--sidebar-background);
-  color: var(--nav-text);
-}
-
 /* Search Box Styles */
 .nav-search {
   margin-left: 20px;
@@ -710,18 +705,12 @@ img.align-right, figure.align-right, .figure.align-right, object.align-right {
   .dropdown-content {
     background: #23272e;
     color: #f1f1f1;
-    box-shadow: 0 8px 16px rgba(0,0,0,0.7);
   }
 
   .dropdown-content a {
     color: #99e6fc;
   }
 
-  .dropdown-content a:hover {
-    background: #1f2937;
-    color: #fff;
-  }
-
   .footer, .footer-content {
     background: #181c20;
     color: #f1f1f1;
@@ -1262,9 +1251,6 @@ figcaption {
     top: 0;
     right: 0;
   }
-  .nav-links.active {
-    overflow-y: auto;
-  }
 }
 
 /* Responsive */
@@ -1312,6 +1298,7 @@ figcaption {
     padding: 1em;
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
     z-index: 0;
+    overflow: auto;
     display: none;
     height: 0;
     scrollbar-width: none; /* Firefox */
@@ -1342,13 +1329,8 @@ figcaption {
   }
 
   .dropdown-content {
-    position: absolute;
-    top: 0;
-    right: 200px;
     box-shadow: none;
     margin-top: 0.5em;
-    padding-left: 1em;
-    padding-right: 1em;
   }
 
   .dropdown-content a {