diff --git a/app/assets/stylesheets/common/base/d-popover.scss b/app/assets/stylesheets/common/base/d-popover.scss
index c6e90d1b3d..670ab19751 100644
--- a/app/assets/stylesheets/common/base/d-popover.scss
+++ b/app/assets/stylesheets/common/base/d-popover.scss
@@ -63,7 +63,7 @@ $d-popover-border: $primary-medium;
   }
 
   .d-popover-content {
-    padding: 1em;
+    padding: 0.5em;
     font-size: $font-down-1;
     overflow-wrap: break-word;
     -webkit-animation: popoverFadeIn 0.5s;
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
index 4c96ae006f..daacf30dd3 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
@@ -70,7 +70,10 @@
     $element
       .html(DATE_TEMPLATE)
       .attr("aria-label", textPreview)
-      .attr("data-html-tooltip", `<div class="previews">${htmlPreview}</div>`)
+      .attr(
+        "data-html-tooltip",
+        `<div class="locale-dates-previews">${htmlPreview}</div>`
+      )
       .addClass("cooked-date")
       .find(".relative-time")
       .text(formatedDateTime);
diff --git a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
index 1b210bcf02..708f8d7438 100644
--- a/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
+++ b/plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
@@ -14,24 +14,20 @@
   }
 }
 
-.discourse-local-date + #discourse-tooltip {
-  .tooltip-content {
+#d-popover {
+  .locale-dates-previews {
     max-width: 360px;
-    padding: 0.5em;
+    .preview {
+      display: flex;
+      flex-direction: column;
+      padding: 5px;
 
-    .previews {
-      .preview {
-        display: flex;
-        flex-direction: column;
-        padding: 5px;
+      .timezone {
+        font-weight: 700;
+      }
 
-        .timezone {
-          font-weight: 700;
-        }
-
-        &.current {
-          background: $tertiary-low;
-        }
+      &.current {
+        background: $tertiary-low;
       }
     }
   }