diff --git a/app/assets/fonts/nds-10px.woff2 b/app/assets/fonts/nds-10px.woff2
index e1386d0..502edfc 100644
Binary files a/app/assets/fonts/nds-10px.woff2 and b/app/assets/fonts/nds-10px.woff2 differ
diff --git a/app/components/Common/Buttons.vue b/app/components/Common/Buttons.vue
index fc56991..cdbfce9 100644
--- a/app/components/Common/Buttons.vue
+++ b/app/components/Common/Buttons.vue
@@ -17,7 +17,6 @@ const { assets } = useAssets();
 
 const BUTTON_WIDTH = assets.images.common.button.rect.width;
 const BUTTON_HEIGHT = assets.images.common.button.rect.height;
-const LETTER_WIDTH = assets.images.common.B.rect.width;
 
 const B_BUTTON: Rect = [31, 172, BUTTON_WIDTH, BUTTON_HEIGHT];
 const A_BUTTON: Rect = [144, 172, BUTTON_WIDTH, BUTTON_HEIGHT];
@@ -29,24 +28,15 @@ onRender((ctx) => {
 
   ctx.translate(0, props.yOffset);
 
-  const drawButton = (
-    image: AtlasImage,
-    text: string,
-    x: number,
-    offset: number,
-  ) => {
+  const drawButton = (icon: string, text: string, x: number) => {
     assets.images.common.button.draw(ctx, x, 172);
 
-    const { actualBoundingBoxRight: textWidth } = ctx.measureText(text);
-    const width = LETTER_WIDTH + 4 + textWidth;
-    const left = Math.ceil(x + BUTTON_WIDTH / 2 - width / 2 - offset / 2);
-
-    image.draw(ctx, left, 176);
-    ctx.fillText(text, left + LETTER_WIDTH + 4, 185);
+    const label = `${icon} ${text}`;
+    fillTextHCentered(ctx, label, x, 185, BUTTON_WIDTH);
   };
 
-  drawButton(assets.images.common.B, props.bLabel, 31, 5);
-  drawButton(assets.images.common.A, props.aLabel, 144, 0);
+  drawButton(ICONS.B, props.bLabel, 31);
+  drawButton(ICONS.A, props.aLabel, 144);
 }, 60);
 
 onClick((x, y) => {
diff --git a/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
index 5c69568..87af50e 100644
--- a/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
+++ b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { SettingsBottomScreenNumberInput as NumberInput } from "#components";
+import { ICONS } from "~/utils/icons";
 
 const APP_COLOR_TO_FONT_COLOR: Record<string, string> = {
   "#61829a": "#fbfbfb", // cyan
@@ -82,28 +83,17 @@ onRender((ctx) => {
   achievementAssets.viewAllButton.draw(ctx, 127, 2);
   achievementAssets.smallTrophy.draw(ctx, 131, 6);
 
-  const GAP = 4;
-
   ctx.font = "10px NDS10";
   ctx.textBaseline = "top";
   ctx.fillStyle = "#010101";
-  const viewAllText = $t("settings.clock.achievements.viewAll");
-  const { actualBoundingBoxRight: textWidth } = ctx.measureText(viewAllText);
 
-  const totalWidth = achievementAssets.X.rect.width + GAP + textWidth;
-  const left = Math.ceil(
-    145 +
-      (achievementAssets.viewAllButton.rect.width - 18) / 2 -
-      totalWidth / 2,
-  );
-
-  achievementAssets.X.draw(ctx, left, 7);
+  const label = `${ICONS.X} ${$t("settings.clock.achievements.viewAll")}`;
   fillTextHCentered(
     ctx,
-    viewAllText,
-    left + achievementAssets.X.rect.width + GAP,
+    label,
+    145,
     7,
-    textWidth,
+    achievementAssets.viewAllButton.rect.width - 18,
   );
 }, 1000);
 </script>
diff --git a/app/utils/icons.ts b/app/utils/icons.ts
index e548c6e..ddf79e0 100644
--- a/app/utils/icons.ts
+++ b/app/utils/icons.ts
@@ -4,5 +4,8 @@ export const ICONS = {
   X: "Χ",
   Y: "Υ",
   HEART: "Γ",
-  SAD: "Δ",
+  HAPPY: "Δ",
+  ANGRY: "Ε",
+  SAD: "Ζ",
+  NEUTRAL: "Η",
 } as const;
diff --git a/i18n/i18n.config.ts b/i18n/i18n.config.ts
index 109cd46..9c31859 100644
--- a/i18n/i18n.config.ts
+++ b/i18n/i18n.config.ts
@@ -6,7 +6,10 @@ const i18nIcons = {
   icon_x: ICONS.X,
   icon_y: ICONS.Y,
   icon_heart: ICONS.HEART,
+  icon_happy: ICONS.HAPPY,
+  icon_angry: ICONS.ANGRY,
   icon_sad: ICONS.SAD,
+  icon_neutral: ICONS.NEUTRAL,
 } as const;
 
 export default defineI18nConfig(() => ({
diff --git a/public/nds/images/common/A.webp b/public/nds/images/common/A.webp
deleted file mode 100644
index 2b1889c..0000000
Binary files a/public/nds/images/common/A.webp and /dev/null differ
diff --git a/public/nds/images/common/B.webp b/public/nds/images/common/B.webp
deleted file mode 100644
index e09d99f..0000000
Binary files a/public/nds/images/common/B.webp and /dev/null differ
diff --git a/public/nds/images/settings/bottom-screen/clock/achievements/X.webp b/public/nds/images/settings/bottom-screen/clock/achievements/X.webp
deleted file mode 100644
index c3c793e..0000000
Binary files a/public/nds/images/settings/bottom-screen/clock/achievements/X.webp and /dev/null differ