diff --git a/src/bundle/Resources/public/scss/_badges.scss b/src/bundle/Resources/public/scss/_badges.scss
index 3069319668..5583dabefb 100644
--- a/src/bundle/Resources/public/scss/_badges.scss
+++ b/src/bundle/Resources/public/scss/_badges.scss
@@ -9,57 +9,61 @@
     background-color: $ibexa-color-light-500;
     white-space: nowrap;
 
-    &--primary {
-        color: $ibexa-color-primary;
-        background-color: $ibexa-color-primary-200;
+    &--status {
+        position: relative;
+        padding-left: calculateRem(16px);
+        padding-top: calculateRem(3px);
+        padding-bottom: calculateRem(3px);
+        border-width: calculateRem(1px);
+        border-style: solid;
 
-        .ibexa-icon {
-            fill: $ibexa-color-primary;
+        &::before {
+            content: '';
+            position: absolute;
+            left: calculateRem(8px);
+            width: calculateRem(4px);
+            height: calculateRem(4px);
+            border-radius: 50%;
+            top: 50%;
+            transform: translateY(-50%);
         }
     }
 
-    &--secondary {
-        color: $ibexa-color-dark;
-        background-color: $ibexa-color-light-500;
+    @mixin version-properties($color, $background-color) {
+        color: $color;
+        background-color: $background-color;
+        border-color: $color;
 
         .ibexa-icon {
-            fill: $ibexa-color-dark;
+            fill: $color;
+        }
+
+        &::before {
+            background-color: $color;
         }
     }
 
-    &--info {
-        color: $ibexa-color-info;
-        background-color: $ibexa-color-info-200;
+    &--primary {
+        @include version-properties($ibexa-color-primary, $ibexa-color-primary-200);
+    }
 
-        .ibexa-icon {
-            fill: $ibexa-color-info;
-        }
+    &--secondary {
+        @include version-properties($ibexa-color-dark, $ibexa-color-light-500);
     }
 
-    &--danger {
-        color: $ibexa-color-danger;
-        background-color: $ibexa-color-danger-200;
+    &--info {
+        @include version-properties($ibexa-color-info, $ibexa-color-info-200);
+    }
 
-        .ibexa-icon {
-            fill: $ibexa-color-danger;
-        }
+    &--danger {
+        @include version-properties($ibexa-color-danger, $ibexa-color-danger-200);
     }
 
     &--success {
-        color: $ibexa-color-success;
-        background-color: $ibexa-color-success-200;
-
-        .ibexa-icon {
-            fill: $ibexa-color-success;
-        }
+        @include version-properties($ibexa-color-success, $ibexa-color-success-200);
     }
 
     &--complementary {
-        color: $ibexa-color-complementary;
-        background-color: $ibexa-color-complementary-200;
-
-        .ibexa-icon {
-            fill: $ibexa-color-complementary;
-        }
+        @include version-properties($ibexa-color-complementary, $ibexa-color-complementary-200);
     }
 }