diff --git a/src/pages/badges/github-badges.module.css b/src/pages/badges/github-badges.module.css
index d1dcb4ee..5b78c1ff 100644
--- a/src/pages/badges/github-badges.module.css
+++ b/src/pages/badges/github-badges.module.css
@@ -1485,6 +1485,53 @@ table tr:last-child td:last-child {
   position: relative;
 }
 
+/* Mirror levelImages styling for skin tone table so skin-tone badges match Public Sponsor theme */
+.skinToneTable .levelImages {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 8px;
+  border-radius: 12px;
+  background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+  border: 2px solid #e2e8f0;
+  box-shadow:
+    0 2px 8px rgba(0, 0, 0, 0.04),
+    inset 0 1px 0 rgba(255, 255, 255, 0.5);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+.skinToneTable .levelImages:hover {
+  transform: translateY(-1px);
+  box-shadow:
+    0 4px 12px rgba(0, 0, 0, 0.08),
+    inset 0 1px 0 rgba(255, 255, 255, 0.7);
+  border-color: #c7d2fe;
+}
+
+.skinToneTable .levelImages img {
+  width: clamp(28px, 4vw, 44px);
+  height: clamp(28px, 4vw, 44px);
+  border-radius: 12px;
+  border: 2px solid #e5e7eb;
+  background: white;
+  box-shadow:
+    0 2px 6px rgba(0, 0, 0, 0.08),
+    0 1px 2px rgba(0, 0, 0, 0.04);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  cursor: pointer;
+
+}
+
+.skinToneTable .levelImages img:hover {
+  transform: scale(1.12);
+  box-shadow:
+    0 6px 16px rgba(0, 0, 0, 0.15),
+    0 3px 8px rgba(0, 0, 0, 0.1);
+  border-color: #3b82f6;
+  z-index: 10;
+  position: relative;
+}
+
 /* Enhanced Needed Amount Section */
 .achievementsTable .neededAmount {
   font-weight: 600;
@@ -1559,6 +1606,34 @@ table tr:last-child td:last-child {
     0 3px 6px rgba(59, 130, 246, 0.3);
 }
 
+/* Dark theme overrides for neededAmount */
+[data-theme="dark"] .achievementsTable .neededAmount {
+  color: var(--ifm-color-white) !important;
+  background: linear-gradient(
+    135deg,
+    var(--dark-bg-tertiary) 0%,
+    var(--dark-bg-secondary) 100%
+  ) !important;
+  border-color: var(--dark-border) !important;
+  box-shadow:
+    0 4px 12px rgba(0, 0, 0, 0.4),
+    0 2px 4px rgba(0, 0, 0, 0.3) !important;
+}
+
+[data-theme="dark"] .achievementsTable .neededAmount::before {
+  /* Adjusts the hover shine effect for dark mode */
+  background: linear-gradient(
+    90deg,
+    transparent,
+    rgba(255, 255, 255, 0.15),
+    transparent
+  ) !important;
+}
+
+[data-theme="dark"] .achievementsTable .neededAmount:hover {
+  border-color: var(--ifm-color-primary) !important;
+}
+
 /* Enhanced Badge Levels Container */
 .achievementsTable .badgeLevels {
   display: flex;
@@ -1868,4 +1943,4 @@ table tr:last-child td:last-child {
 
 [data-theme="dark"] .achievementsTable td b:hover {
   box-shadow: 0 4px 10px rgba(37, 194, 160, 0.4) !important;
-}
\ No newline at end of file
+}
diff --git a/src/pages/badges/github-badges.tsx b/src/pages/badges/github-badges.tsx
index 1c9f98e3..2aaad04c 100644
--- a/src/pages/badges/github-badges.tsx
+++ b/src/pages/badges/github-badges.tsx
@@ -751,45 +751,63 @@ const GithubBadgesContent = (): React.ReactElement => {
                 </td>
                 <td>Starstruck</td>
                 <td>
-                  <img
-                    src="https://github.githubassets.com/images/modules/profile/achievements/starstruck-default.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://github.githubassets.com/images/modules/profile/achievements/starstruck-default.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Default"
+                    />
+                  </div>
                   👋
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone2.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone2.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Skin Tone 2"
+                    />
+                  </div>
                   👋🏻
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone3.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone3.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Skin Tone 3"
+                    />
+                  </div>
                   👋🏼
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone4.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone4.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Skin Tone 4"
+                    />
+                  </div>
                   👋🏽
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone5.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone5.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Skin Tone 5"
+                    />
+                  </div>
                   👋🏾
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone6.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Star-Struck/PNG/Skin-Tones/StarStruck_SkinTone6.png"
+                      className={styles.badgeImgSmall}
+                      alt="Starstruck Skin Tone 6"
+                    />
+                  </div>
                   👋🏿
                 </td>
               </tr>
@@ -803,45 +821,63 @@ const GithubBadgesContent = (): React.ReactElement => {
                 </td>
                 <td>Quickdraw</td>
                 <td>
-                  <img
-                    src="https://github.githubassets.com/images/modules/profile/achievements/quickdraw-default.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://github.githubassets.com/images/modules/profile/achievements/quickdraw-default.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Default"
+                    />
+                  </div>
                   👋
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone2.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone2.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Skin Tone 2"
+                    />
+                  </div>
                   👋🏻
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone3.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone3.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Skin Tone 3"
+                    />
+                  </div>
                   👋🏼
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone4.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone4.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Skin Tone 4"
+                    />
+                  </div>
                   👋🏽
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone5.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone5.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Skin Tone 5"
+                    />
+                  </div>
                   👋🏾
                 </td>
                 <td>
-                  <img
-                    src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone6.png"
-                    className={styles.badgeImgSmall}
-                  />{" "}
+                  <div className={styles.levelImages}>
+                    <img
+                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Quick-Draw/PNG/Skin-Tones/QuickDraw_SkinTone6.png"
+                      className={styles.badgeImgSmall}
+                      alt="Quickdraw Skin Tone 6"
+                    />
+                  </div>
                   👋🏿
                 </td>
               </tr>
@@ -991,11 +1027,13 @@ const GithubBadgesContent = (): React.ReactElement => {
                 <td>
                   <div className={styles.neededBox}>
                     <div className={styles.neededLabel}>DEFAULT</div>
-                    <img
-                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Mars-2020-Contributor/PNG/Mars2020ContributorBadge.png"
-                      alt="Mars 2020 Contributor"
-                      className={styles.badgeImgSmall}
-                    />
+                    <div className={styles.levelImages}>
+                      <img
+                        src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/Mars-2020-Contributor/PNG/Mars2020ContributorBadge.png"
+                        alt="Mars 2020 Contributor"
+                        className={styles.badgeImgSmall}
+                      />
+                    </div>
                     <div>1</div>
                   </div>
                 </td>
@@ -1022,11 +1060,13 @@ const GithubBadgesContent = (): React.ReactElement => {
                 <td>
                   <div className={styles.neededBox}>
                     <div className={styles.neededLabel}>DEFAULT</div>
-                    <img
-                      src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/2020-Arctic-Code-Vault-Contributor/PNG/2020ArcticCodeVaultBadge.png"
-                      alt="Arctic Code Vault Contributor"
-                      className={styles.badgeImgSmall}
-                    />
+                    <div className={styles.levelImages}>
+                      <img
+                        src="https://raw.githubusercontent.com/recodehive/awesome-github-profiles/main/assets/Badges/2020-Arctic-Code-Vault-Contributor/PNG/2020ArcticCodeVaultBadge.png"
+                        alt="Arctic Code Vault Contributor"
+                        className={styles.badgeImgSmall}
+                      />
+                    </div>
                     <div>1</div>
                   </div>
                 </td>