diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less
index fbcef49565..7a87681ff9 100755
--- a/src/definitions/elements/label.less
+++ b/src/definitions/elements/label.less
@@ -255,7 +255,7 @@ a.ui.label {
   border-color: inherit;
   border-width: @basicBorderWidth 0 0 @basicBorderWidth;
   border-style: inherit;
-  right: e(%("calc(100%% + %d)", @basicBorderWidth));
+  right: @basicBorderFullWidthOffset;
 }
 .ui.basic.tag.labels .label:after,
 .ui.basic.tag.label:after {
@@ -385,6 +385,27 @@ a.ui.label {
   padding-left: @ribbonTriangleSize;
   padding-right: @ribbonDistance;
 }
+.ui.basic.ribbon.label {
+  padding-top: @basicRibbonOffset;
+  padding-bottom: @basicRibbonOffset;
+}
+.ui.basic.ribbon.label:not([class*="right ribbon"]) {
+  padding-left: @basicRibbonTriangleSizeOffset;
+  padding-right: @basicRibbonTriangleSize;
+}
+.ui.basic[class*="right ribbon"].label {
+  padding-left: @basicRibbonTriangleSize;
+  padding-right: @basicRibbonTriangleSizeOffset;
+}
+.ui.basic.ribbon.label::after {
+  top: @basicBorderFullWidthOffset;
+}
+.ui.basic.ribbon.label:not([class*="right ribbon"])::after {
+  left: @basicBorderWidthOffset;
+}
+.ui.basic[class*="right ribbon"].label::after {
+  right: @basicBorderWidthOffset;
+}
 
 /* Right Ribbon */
 .ui[class*="right ribbon"].label {
diff --git a/src/themes/default/elements/label.variables b/src/themes/default/elements/label.variables
index 9778c6c3fe..3609dd2f88 100644
--- a/src/themes/default/elements/label.variables
+++ b/src/themes/default/elements/label.variables
@@ -105,6 +105,8 @@
 /* Basic */
 @basicBackground: none @white;
 @basicBorderWidth: 1px;
+@basicBorderWidthOffset: -@basicBorderWidth;
+@basicBorderFullWidthOffset: e(%("calc(100%% + %d)", @basicBorderWidth));
 @basicBorder: @basicBorderWidth solid @borderColor;
 @basicColor: @textColor;
 @basicBoxShadow: none;
@@ -128,10 +130,13 @@
 
 /* Ribbon */
 @ribbonTriangleSize: 1.2em;
+@basicRibbonTriangleSize: e(%("calc(%d - %d)", @ribbonTriangleSize, @basicBorderWidth));
+@basicRibbonTriangleSizeOffset: e(%("calc(1rem + %d - %d)", @ribbonTriangleSize, @basicBorderWidth));
 @ribbonShadowColor: rgba(0, 0, 0, 0.15);
 
 @ribbonMargin: 1rem;
 @ribbonOffset: e(%("calc(%d - %d)", -@ribbonMargin, @ribbonTriangleSize));
+@basicRibbonOffset: e(%("calc(%d - %d)", @verticalPadding, @basicBorderWidth));
 @ribbonDistance: e(%("calc(%d + %d)", @ribbonMargin, @ribbonTriangleSize));
 @rightRibbonOffset: e(%("calc(100%% + %d + %d)", @ribbonMargin, @ribbonTriangleSize));