3 files changed, 16 insertions, 16 deletions
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 7cad64009..9db6937ae 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -104,10 +104,10 @@
 // When Popper is enabled, reset the basic dropdown position
 // stylelint-disable-next-line no-duplicate-selectors
 .dropdown-menu {
-  &[x-placement^="top"],
-  &[x-placement^="right"],
-  &[x-placement^="bottom"],
-  &[x-placement^="left"] {
+  &[data-popper-placement^="top"],
+  &[data-popper-placement^="right"],
+  &[data-popper-placement^="bottom"],
+  &[data-popper-placement^="left"] {
     right: auto;
     bottom: auto;
     left: auto;
diff --git a/scss/_popover.scss b/scss/_popover.scss
index 6688f729c..36478b337 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -134,16 +134,16 @@
 }
 
 .bs-popover-auto {
-  &[x-placement^="top"] {
+  &[data-popper-placement^="top"] {
     @extend .bs-popover-top;
   }
-  &[x-placement^="right"] {
+  &[data-popper-placement^="right"] {
     @extend .bs-popover-end;
   }
-  &[x-placement^="bottom"] {
+  &[data-popper-placement^="bottom"] {
     @extend .bs-popover-bottom;
   }
-  &[x-placement^="left"] {
+  &[data-popper-placement^="left"] {
     @extend .bs-popover-start;
   }
 }
diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss
index a98ff4db5..60c860c67 100644
--- a/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@ -36,7 +36,7 @@
     bottom: 0;
 
     &::before {
-      top: 0;
+      top: -1px;
       border-width: $tooltip-arrow-height ($tooltip-arrow-width / 2) 0;
       border-top-color: $tooltip-arrow-color;
     }
@@ -52,7 +52,7 @@
     height: $tooltip-arrow-width;
 
     &::before {
-      right: 0 #{"/* rtl:ignore */"};
+      right: -1px #{"/* rtl:ignore */"};
       border-width: ($tooltip-arrow-width / 2) $tooltip-arrow-height ($tooltip-arrow-width / 2) 0 #{"/* rtl:ignore */"};
       border-right-color: $tooltip-arrow-color #{"/* rtl:ignore */"};
     }
@@ -66,7 +66,7 @@
     top: 0;
 
     &::before {
-      bottom: 0;
+      bottom: -1px;
       border-width: 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height;
       border-bottom-color: $tooltip-arrow-color;
     }
@@ -82,7 +82,7 @@
     height: $tooltip-arrow-width;
 
     &::before {
-      left: 0 #{"/* rtl:ignore */"};
+      left: -1px #{"/* rtl:ignore */"};
       border-width: ($tooltip-arrow-width / 2) 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height #{"/* rtl:ignore */"};
       border-left-color: $tooltip-arrow-color #{"/* rtl:ignore */"};
     }
@@ -90,16 +90,16 @@
 }
 
 .bs-tooltip-auto {
-  &[x-placement^="top"] {
+  &[data-popper-placement^="top"] {
     @extend .bs-tooltip-top;
   }
-  &[x-placement^="right"] {
+  &[data-popper-placement^="right"] {
     @extend .bs-tooltip-end;
   }
-  &[x-placement^="bottom"] {
+  &[data-popper-placement^="bottom"] {
     @extend .bs-tooltip-bottom;
   }
-  &[x-placement^="left"] {
+  &[data-popper-placement^="left"] {
     @extend .bs-tooltip-start;
   }
 }