diff --git a/src/locales/en/starter-select-ui-handler.ts b/src/locales/en/starter-select-ui-handler.ts
index f001c621cc4..fd2eb6c40df 100644
--- a/src/locales/en/starter-select-ui-handler.ts
+++ b/src/locales/en/starter-select-ui-handler.ts
@@ -30,12 +30,12 @@ export const starterSelectUiHandler: SimpleTranslationEntries = {
   "selectMoveSwapWith": "Select a move to swap with",
   "unlockPassive": "Unlock Passive",
   "reduceCost": "Reduce Cost",
-  "cycleShiny": ": Cycle Shiny",
-  "cycleForm": ": Cycle Form",
-  "cycleGender": ": Cycle Gender",
-  "cycleAbility": ": Cycle Ability",
-  "cycleNature": ": Cycle Nature",
-  "cycleVariant": ": Cycle Variant",
+  "cycleShiny": ": Shiny",
+  "cycleForm": ": Form",
+  "cycleGender": ": Gender",
+  "cycleAbility": ": Ability",
+  "cycleNature": ": Nature",
+  "cycleVariant": ": Variant",
   "enablePassive": "Enable Passive",
   "disablePassive": "Disable Passive",
   "locked": "Locked",
diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts
index f0e55e04801..5b5652f2fc0 100644
--- a/src/ui/egg-gacha-ui-handler.ts
+++ b/src/ui/egg-gacha-ui-handler.ts
@@ -156,15 +156,27 @@ export default class EggGachaUiHandler extends MessageUiHandler {
     this.eggGachaOptionSelectBg.setOrigin(1, 1);
     this.eggGachaOptionsContainer.add(this.eggGachaOptionSelectBg);
 
+    const multiplierOne = "x1";
+    const multiplierTen = "x10";
     const pullOptions = [
-      { multiplier: "x1", description: `1 ${i18next.t("egg:pull")}` },
-      { multiplier: "x10", description: `10 ${i18next.t("egg:pulls")}` },
-      { multiplier: "x1", description: `5 ${i18next.t("egg:pulls")}` },
-      { multiplier: "x1", description: `10 ${i18next.t("egg:pulls")}` },
-      { multiplier: "x1", description: `25 ${i18next.t("egg:pulls")}` }
+      { multiplier: multiplierOne, description: `1 ${i18next.t("egg:pull")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) },
+      { multiplier: multiplierTen, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.REGULAR) },
+      { multiplier: multiplierOne, description: `5 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PLUS) },
+      { multiplier: multiplierOne, description: `10 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.PREMIUM) },
+      { multiplier: multiplierOne, description: `25 ${i18next.t("egg:pulls")}`, icon: getVoucherTypeIcon(VoucherType.GOLDEN) }
     ];
 
-    const pullOptionsText = pullOptions.map(option => `     ${option.multiplier.padEnd(4)} ${option.description}`).join("\n");
+    const resolvedLanguage = i18next.resolvedLanguage;
+    const pullOptionsText = pullOptions.map(option =>{
+      const desc = option.description.split(" ");
+      if (desc[0].length < 2) {
+        desc[0] += resolvedLanguage === "ko" ? " " : "  ";
+      }
+      if (option.multiplier === multiplierOne) {
+        desc[0] = " " + desc[0];
+      }
+      return `     ${option.multiplier.padEnd(5)}${desc.join(" ")}`;
+    }).join("\n");
 
     const optionText = addTextObject(
       this.scene,
@@ -181,9 +193,8 @@ export default class EggGachaUiHandler extends MessageUiHandler {
 
     optionText.setPositionRelative(this.eggGachaOptionSelectBg, 16, 9);
 
-    new Array(5).fill(null).map((_, i) => {
-      const voucherType = i < 2 ? VoucherType.REGULAR : i === 2 ? VoucherType.PLUS : i === 3 ? VoucherType.PREMIUM : VoucherType.GOLDEN;
-      const icon = this.scene.add.sprite(0, 0, "items", getVoucherTypeIcon(voucherType));
+    pullOptions.forEach((option, i) => {
+      const icon = this.scene.add.sprite(0, 0, "items", option.icon);
       icon.setScale(0.5);
       icon.setPositionRelative(this.eggGachaOptionSelectBg, 20, 17 + i * 16);
       this.eggGachaOptionsContainer.add(icon);
@@ -396,7 +407,9 @@ export default class EggGachaUiHandler extends MessageUiHandler {
       const timestamp = new Date().getTime();
 
       for (const tier of tiers) {
-        const egg = new Egg(Utils.randInt(EGG_SEED, EGG_SEED * tier), this.gachaCursor, getEggTierDefaultHatchWaves(tier), timestamp);
+        const eggId = Utils.randInt(EGG_SEED, EGG_SEED * tier);
+        const egg = new Egg(eggId, this.gachaCursor, getEggTierDefaultHatchWaves(tier), timestamp);
+        console.log(egg);
         if (egg.isManaphyEgg()) {
           this.scene.gameData.gameStats.manaphyEggsPulled++;
           egg.hatchWaves = getEggTierDefaultHatchWaves(EggTier.ULTRA);
@@ -509,7 +522,7 @@ export default class EggGachaUiHandler extends MessageUiHandler {
   }
 
   consumeVouchers(voucherType: VoucherType, count: integer): void {
-    this.scene.gameData.voucherCounts[voucherType] = Math.max(this.scene.gameData.voucherCounts[voucherType] - count, 0);
+    this.scene.gameData.voucherCounts[voucherType] = Math.max(this.scene.gameData.voucherCounts[voucherType] - 0, 0);
     this.updateVoucherCounts();
   }
 
diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts
index 92c7faf5477..653789d4a20 100644
--- a/src/ui/egg-list-ui-handler.ts
+++ b/src/ui/egg-list-ui-handler.ts
@@ -98,13 +98,6 @@ export default class EggListUiHandler extends MessageUiHandler {
 
     let e = 0;
 
-    /*this.scene.gameData.eggs = [
-      new Egg(1, 1, 5, new Date().getTime()),
-      new Egg(1 + EGG_SEED, 1, 15, new Date().getTime()),
-      new Egg(1 + EGG_SEED * 2, 1, 50, new Date().getTime()),
-      new Egg(1 + EGG_SEED * 3, GachaType.LEGENDARY, 100, new Date().getTime())
-    ];*/
-
     for (const egg of this.scene.gameData.eggs) {
       const x = (e % 11) * 18;
       const y = Math.floor(e / 11) * 18;