diff --git a/src/components/dialog/content/TopUpCreditsDialogContent.vue b/src/components/dialog/content/TopUpCreditsDialogContent.vue
index 0a2884daf..4867e7a39 100644
--- a/src/components/dialog/content/TopUpCreditsDialogContent.vue
+++ b/src/components/dialog/content/TopUpCreditsDialogContent.vue
@@ -95,22 +95,23 @@
 
     <p
       v-if="isBelowMin"
-      class="text-sm text-gold-500 m-0 px-8 pt-4 text-center"
+      class="text-sm text-red-500 m-0 px-8 pt-4 text-center flex items-center justify-center gap-1"
     >
+      <i class="icon-[lucide--component] size-4" />
       {{
-        $t('credits.topUp.minimumPurchase', {
-          amount: MIN_AMOUNT,
-          credits: usdToCredits(MIN_AMOUNT)
+        $t('credits.topUp.minRequired', {
+          credits: formatNumber(usdToCredits(MIN_AMOUNT))
         })
       }}
     </p>
     <p
       v-if="showCeilingWarning"
-      class="text-sm text-gold-500 m-0 px-8 pt-4 text-center"
+      class="text-sm text-gold-500 m-0 px-8 pt-4 text-center flex items-center justify-center gap-1"
     >
+      <i class="icon-[lucide--component] size-4" />
       {{
-        $t('credits.topUp.maximumAmount', {
-          amount: formatNumber(MAX_AMOUNT)
+        $t('credits.topUp.maxAllowed', {
+          credits: formatNumber(usdToCredits(MAX_AMOUNT))
         })
       }}
       <span>{{ $t('credits.topUp.needMore') }}</span>
diff --git a/src/components/ui/stepper/FormattedNumberStepper.vue b/src/components/ui/stepper/FormattedNumberStepper.vue
index ab8a6bf1e..2de6bbf13 100644
--- a/src/components/ui/stepper/FormattedNumberStepper.vue
+++ b/src/components/ui/stepper/FormattedNumberStepper.vue
@@ -1,8 +1,9 @@
 <template>
-  <div
+  <label
+    :for="inputId"
     :class="
       cn(
-        'flex h-10 items-center rounded-lg bg-secondary-background text-secondary-foreground hover:bg-secondary-background-hover',
+        'flex h-10 cursor-text items-center rounded-lg bg-secondary-background text-secondary-foreground hover:bg-secondary-background-hover focus-within:ring-1 focus-within:ring-secondary-foreground',
         disabled && 'opacity-50 pointer-events-none'
       )
     "
@@ -21,12 +22,13 @@
     >
       <slot name="prefix" />
       <input
+        :id="inputId"
         ref="inputRef"
         v-model="inputValue"
         type="text"
         inputmode="numeric"
         :style="{ width: `${inputWidth}ch` }"
-        class="min-w-0 rounded border-none bg-transparent text-center text-base-foreground font-medium text-lg focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-secondary-foreground"
+        class="min-w-0 rounded border-none bg-transparent text-center text-base-foreground font-medium text-lg focus-visible:outline-none"
         :disabled="disabled"
         @input="handleInputChange"
         @blur="handleInputBlur"
@@ -43,11 +45,11 @@
     >
       <i class="icon-[lucide--plus] size-4" />
     </button>
-  </div>
+  </label>
 </template>
 
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { computed, ref, useId, watch } from 'vue'
 
 import { cn } from '@/utils/tailwindUtil'
 
@@ -71,6 +73,7 @@ const emit = defineEmits<{
 
 const modelValue = defineModel<number>({ required: true })
 
+const inputId = useId()
 const inputRef = ref<HTMLInputElement | null>(null)
 const inputValue = ref(formatNumber(modelValue.value))
 
@@ -164,7 +167,9 @@ function handleInputBlur() {
 }
 
 function handleInputFocus(e: FocusEvent) {
-  ;(e.target as HTMLInputElement).select()
+  const input = e.target as HTMLInputElement
+  const len = input.value.length
+  input.setSelectionRange(len, len)
 }
 
 function handleStep(direction: 1 | -1) {
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 1e709c549..5f5d1a056 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -1933,6 +1933,8 @@
       "buyCredits": "Continue to payment",
       "minimumPurchase": "${amount} minimum ({credits} credits)",
       "maximumAmount": "${amount} max.",
+      "minRequired": "{credits} credits minimum",
+      "maxAllowed": "{credits} credits maximum.",
       "creditsPerDollar": "credits per dollar",
       "amountToPayLabel": "Amount to pay in dollars",
       "creditsToReceiveLabel": "Credits to receive",