diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/components/BadgesCatalogFragment.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/components/BadgesCatalogFragment.kt
index 253128f74..a17781a33 100644
--- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/components/BadgesCatalogFragment.kt
+++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/components/BadgesCatalogFragment.kt
@@ -40,21 +40,18 @@ class BadgesCatalogFragment : Fragment() {
                 badgeVisible = !badgeVisible
             }
         }
-        findViewById<Button>(R.id.button_add_numeric_badge).apply {
-            setOnClickListener {
-                if (!badgeVisible) {
-                    Badge.showNumericBadgeIn(imageView, imageContainer, Random(System.currentTimeMillis()).nextInt(1, 11))
-                } else {
-                    Badge.removeBadge(imageView)
-                }
-                badgeVisible = !badgeVisible
-            }
+        findViewById<Button>(R.id.button_add_one_digit_numeric_badge).setOnClickListener {
+            Badge.showNumericBadgeIn(imageView, imageContainer, Random(System.currentTimeMillis()).nextInt(1, 9))
+            badgeVisible = true
         }
-        findViewById<Button>(R.id.button_remove_badge_if_numeric_with_count_zero).apply {
-            setOnClickListener {
-                Badge.showNumericBadgeIn(imageView, imageContainer, 0)
-                badgeVisible = false
-            }
+
+        findViewById<Button>(R.id.button_add_two_digit_numeric_badge).setOnClickListener {
+            Badge.showNumericBadgeIn(imageView, imageContainer, Random(System.currentTimeMillis()).nextInt(10, 20))
+            badgeVisible = true
+        }
+        findViewById<Button>(R.id.button_remove_badge_if_numeric_with_count_zero).setOnClickListener {
+            Badge.showNumericBadgeIn(imageView, imageContainer, 0)
+            badgeVisible = false
         }
     }
 }
\ No newline at end of file
diff --git a/catalog/src/main/res/layout/screen_badges_catalog.xml b/catalog/src/main/res/layout/screen_badges_catalog.xml
index f5fa34e0f..98f26d751 100644
--- a/catalog/src/main/res/layout/screen_badges_catalog.xml
+++ b/catalog/src/main/res/layout/screen_badges_catalog.xml
@@ -38,11 +38,18 @@
         android:text="Toggle" />
 
     <Button
-        android:id="@+id/button_add_numeric_badge"
+        android:id="@+id/button_add_one_digit_numeric_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text="Toggle With Number > 0" />
+        android:text="Show with one digit number" />
+
+    <Button
+        android:id="@+id/button_add_two_digit_numeric_badge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Show with two digit number " />
 
     <Button
         android:id="@+id/button_remove_badge_if_numeric_with_count_zero"
diff --git a/library/src/main/java/com/telefonica/mistica/badge/Badge.kt b/library/src/main/java/com/telefonica/mistica/badge/Badge.kt
index 33b045359..1ceac7b7e 100644
--- a/library/src/main/java/com/telefonica/mistica/badge/Badge.kt
+++ b/library/src/main/java/com/telefonica/mistica/badge/Badge.kt
@@ -74,7 +74,7 @@ object Badge {
     private fun buildBadgeContentDescription(
         anchor: View,
         count: Int,
-        badgeDescription: String?
+        badgeDescription: String?,
     ): String {
         if (!contentDescriptions.containsKey(anchor.hashCode())) {
             contentDescriptions[anchor.hashCode()] = anchor.contentDescription
@@ -90,7 +90,7 @@ object Badge {
 
     private fun getDefaultBadgeDescription(
         anchor: View,
-        count: Int
+        count: Int,
     ) = if (count == 0) {
         anchor.context.getString(R.string.badge_notification_description)
     } else {
@@ -119,6 +119,7 @@ object Badge {
         parent.post {
             this.setBoundsFor(anchor, parent)
             val overlay = parent.overlay
+            overlay.clear()
             overlay.add(this)
             anchor.contentDescription = contentDescription
         }