diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
index 28a087cab..ba03ae68b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt
@@ -11,10 +11,9 @@ import android.graphics.Typeface
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.ViewTreeObserver
 import android.widget.RelativeLayout
 import kotlinx.android.synthetic.main.mozac_ui_tabcounter_layout.view.*
-import mozilla.components.ui.tabcounter.R
+import org.mozilla.fenix.R
 import java.text.NumberFormat
 
 open class TabCounter @JvmOverloads constructor(
@@ -25,7 +24,6 @@ open class TabCounter @JvmOverloads constructor(
 
     private val animationSet: AnimatorSet
     private var count: Int = 0
-    private var currentTextRatio: Float = 0.toFloat()
 
     init {
         val inflater = LayoutInflater.from(context)
@@ -165,7 +163,7 @@ open class TabCounter @JvmOverloads constructor(
             counter_text, "alpha",
             ANIM_TEXT_FADEIN_FROM, ANIM_TEXT_FADEIN_TO
         ).setDuration(ANIM_TEXT_FADEIN_DURATION)
-        fadeIn.startDelay = (ANIM_TEXT_FADEIN_DELAY).toLong() // delay 6 frames after fadeOut
+        fadeIn.startDelay = (ANIM_TEXT_FADEIN_DELAY) // delay 6 frames after fadeOut
 
         // Move down on y-axis, from 0 to 4.4 in 66ms, with fadeIn (57~61, 4 frames).
         val moveDown = ObjectAnimator.ofFloat(
@@ -199,26 +197,14 @@ open class TabCounter @JvmOverloads constructor(
             ONE_DIGIT_SIZE_RATIO
         }
 
-        if (newRatio != currentTextRatio) {
-            currentTextRatio = newRatio
-            counter_text.viewTreeObserver.addOnGlobalLayoutListener(object :
-                ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    counter_text.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                    val sizeInPixel = (counter_box.width * newRatio).toInt()
-                    if (sizeInPixel > 0) {
-                        // Only apply the size when we calculate a valid value.
-                        counter_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, sizeInPixel.toFloat())
-                        counter_text.setTypeface(null, Typeface.BOLD)
-                        counter_text.setPadding(0, 0, 0, 0)
-                    }
-                }
-            })
-        }
+        val counterBoxWidth = context.resources.getDimensionPixelSize(R.dimen.tab_counter_box_width_height)
+        val textSize = newRatio * counterBoxWidth
+        counter_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
+        counter_text.setTypeface(null, Typeface.BOLD)
+        counter_text.setPadding(0, 0, 0, 0)
     }
 
     companion object {
-
         internal const val MAX_VISIBLE_TABS = 99
 
         internal const val SO_MANY_TABS_OPEN = "∞"
@@ -226,7 +212,6 @@ open class TabCounter @JvmOverloads constructor(
 
         internal const val ONE_DIGIT_SIZE_RATIO = 0.5f
         internal const val TWO_DIGITS_SIZE_RATIO = 0.4f
-        internal const val ONE_DIGIT_PADDING = 2F
         internal const val TWO_DIGIT_PADDING = 3F
         internal const val TWO_DIGITS_TAB_COUNT_THRESHOLD = 10
 
diff --git a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
index 30fe37d36..b26f35b99 100644
--- a/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
+++ b/app/src/main/res/layout/mozac_ui_tabcounter_layout.xml
@@ -17,8 +17,8 @@
 
         <ImageView
             android:id="@+id/counter_box"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/tab_counter_box_width_height"
+            android:layout_height="@dimen/tab_counter_box_width_height"
             android:importantForAccessibility="no"
             app:srcCompat="@drawable/ic_tabs"/>
 
@@ -28,6 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:textAlignment="center"
             android:textColor="?primaryText"
             android:textSize="12sp"
             android:textStyle="bold"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 999f9c6d1..8c2a7564b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -40,6 +40,8 @@
     <dimen name="tp_onboarding_x_offset">-4dp</dimen>
     <dimen name="tp_onboarding_triangle_height">16dp</dimen>
 
+    <dimen name="tab_counter_box_width_height">24dp</dimen>
+
     <!--Quick Settings-->
     <dimen name="quicksettings_item_height">28dp</dimen>
     <dimen name="tracking_protection_item_height">48dp</dimen>