diff --git a/client/src/assets/icons/a1-chinese.tsx b/client/src/assets/icons/a1-chinese.tsx
new file mode 100644
index 00000000000..d2f1f24535a
--- /dev/null
+++ b/client/src/assets/icons/a1-chinese.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+
+function A1ChineseIcon(
+  props: JSX.IntrinsicAttributes & React.SVGProps<SVGSVGElement>
+): JSX.Element {
+  return (
+    <svg
+      aria-hidden='true'
+      viewBox='0 0 48 48'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+      {...props}
+    >
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
+      />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        A
+      </text>
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        1
+      </text>
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        Z
+      </text>
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        H
+      </text>
+    </svg>
+  );
+}
+
+A1ChineseIcon.displayName = 'A1ChineseIcon';
+
+export default A1ChineseIcon;
diff --git a/client/src/assets/icons/a1-spanish.tsx b/client/src/assets/icons/a1-spanish.tsx
new file mode 100644
index 00000000000..f580b1fcd0c
--- /dev/null
+++ b/client/src/assets/icons/a1-spanish.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+
+function A1SpanishIcon(
+  props: JSX.IntrinsicAttributes & React.SVGProps<SVGSVGElement>
+): JSX.Element {
+  return (
+    <svg
+      aria-hidden='true'
+      viewBox='0 0 48 48'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+      {...props}
+    >
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
+      />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        A
+      </text>
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        1
+      </text>
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        E
+      </text>
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        S
+      </text>
+    </svg>
+  );
+}
+
+A1SpanishIcon.displayName = 'A1SpanishIcon';
+
+export default A1SpanishIcon;
diff --git a/client/src/assets/icons/a2-chinese.tsx b/client/src/assets/icons/a2-chinese.tsx
new file mode 100644
index 00000000000..09da704351c
--- /dev/null
+++ b/client/src/assets/icons/a2-chinese.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+
+function A2ChineseIcon(
+  props: JSX.IntrinsicAttributes & React.SVGProps<SVGSVGElement>
+): JSX.Element {
+  return (
+    <svg
+      aria-hidden='true'
+      viewBox='0 0 48 48'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+      {...props}
+    >
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
+      />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        A
+      </text>
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        2
+      </text>
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        Z
+      </text>
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        H
+      </text>
+    </svg>
+  );
+}
+
+A2ChineseIcon.displayName = 'A2ChineseIcon';
+
+export default A2ChineseIcon;
diff --git a/client/src/assets/icons/a2-english.tsx b/client/src/assets/icons/a2-english.tsx
index 07e15f0e2fe..f9a52edc2da 100644
--- a/client/src/assets/icons/a2-english.tsx
+++ b/client/src/assets/icons/a2-english.tsx
@@ -6,7 +6,7 @@ function A2EnglishIcon(
   return (
     <svg
       aria-hidden='true'
-      viewBox='0 0 175 170'
+      viewBox='0 0 48 48'
       fill='none'
       xmlns='http://www.w3.org/2000/svg'
       {...props}
@@ -14,8 +14,63 @@ function A2EnglishIcon(
       <path
         fillRule='evenodd'
         clipRule='evenodd'
-        d='M 138 9 L 83 9 L 83 79.476 L 147 79.476 L 147 18 C 147 13.029 142.971 9 138 9 Z M 147 88.476 L 83 88.476 L 83 156 L 138 156 C 142.971 156 147 151.971 147 147 L 147 88.476 Z M 74 79.476 L 74 9 L 18 9 C 13.029 9 9 13.029 9 18 L 9 79.476 L 74 79.476 Z M 9 88.476 L 74 88.476 L 74 156 L 18 156 C 13.029 156 9 151.971 9 147 L 9 88.476 Z M 18 0 C 8.059 0 0 8.059 0 18 L 0 147 C 0 156.941 8.059 165 18 165 L 138 165 C 147.941 165 156 156.941 156 147 L 156 18 C 156 8.059 147.941 0 138 0 L 18 0 Z M 22.332 64.394 L 31.56 64.394 L 34.581 55.107 L 49.286 55.107 L 52.301 64.394 L 61.528 64.394 L 47.489 23.667 L 36.392 23.667 L 22.332 64.394 Z M 47.103 48.386 L 42.099 32.974 L 41.781 32.974 L 36.768 48.386 L 47.103 48.386 Z M 100.301 64.394 L 100.301 58.19 L 114.798 44.766 C 116.031 43.573 117.065 42.499 117.901 41.545 C 118.749 40.59 119.392 39.656 119.83 38.741 C 120.267 37.813 120.486 36.812 120.486 35.738 C 120.486 34.545 120.214 33.517 119.67 32.656 C 119.127 31.781 118.384 31.111 117.443 30.647 C 116.502 30.17 115.435 29.931 114.241 29.931 C 112.995 29.931 111.908 30.183 110.98 30.687 C 110.052 31.191 109.336 31.913 108.832 32.855 C 108.329 33.796 108.077 34.916 108.077 36.215 L 99.903 36.215 C 99.903 33.551 100.507 31.237 101.713 29.275 C 102.92 27.313 104.61 25.795 106.784 24.721 C 108.958 23.647 111.464 23.11 114.301 23.11 C 117.218 23.11 119.757 23.627 121.918 24.661 C 124.092 25.682 125.782 27.101 126.989 28.917 C 128.195 30.733 128.798 32.815 128.798 35.161 C 128.798 36.699 128.493 38.217 127.884 39.715 C 127.287 41.213 126.22 42.877 124.682 44.707 C 123.144 46.523 120.976 48.704 118.179 51.249 L 112.233 57.076 L 112.233 57.355 L 129.335 57.355 L 129.335 64.394 L 100.301 64.394 Z M 27.54 142 L 27.54 101.273 L 54.983 101.273 L 54.983 108.372 L 36.151 108.372 L 36.151 118.077 L 53.571 118.077 L 53.571 125.176 L 36.151 125.176 L 36.151 134.901 L 55.063 134.901 L 55.063 142 L 27.54 142 Z M 131.605 142 L 131.605 101.273 L 123.034 101.273 L 123.034 126.886 L 122.676 126.886 L 105.097 101.273 L 97.54 101.273 L 97.54 142 L 106.151 142 L 106.151 116.366 L 106.449 116.366 L 124.168 142 L 131.605 142 Z'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
       />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        A
+      </text>
+
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        2
+      </text>
+
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        E
+      </text>
+
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        N
+      </text>
     </svg>
   );
 }
diff --git a/client/src/assets/icons/a2-spanish.tsx b/client/src/assets/icons/a2-spanish.tsx
new file mode 100644
index 00000000000..b6db8bc7033
--- /dev/null
+++ b/client/src/assets/icons/a2-spanish.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+
+function A2SpanishIcon(
+  props: JSX.IntrinsicAttributes & React.SVGProps<SVGSVGElement>
+): JSX.Element {
+  return (
+    <svg
+      aria-hidden='true'
+      viewBox='0 0 48 48'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+      {...props}
+    >
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
+      />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        A
+      </text>
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        2
+      </text>
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        E
+      </text>
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        S
+      </text>
+    </svg>
+  );
+}
+
+A2SpanishIcon.displayName = 'A2SpanishIcon';
+
+export default A2SpanishIcon;
diff --git a/client/src/assets/icons/b1-english.tsx b/client/src/assets/icons/b1-english.tsx
index 1de37f18cbb..e75413b7e16 100644
--- a/client/src/assets/icons/b1-english.tsx
+++ b/client/src/assets/icons/b1-english.tsx
@@ -6,7 +6,7 @@ function B1EnglishIcon(
   return (
     <svg
       aria-hidden='true'
-      viewBox='0 0 175 170'
+      viewBox='0 0 48 48'
       fill='none'
       xmlns='http://www.w3.org/2000/svg'
       {...props}
@@ -14,8 +14,63 @@ function B1EnglishIcon(
       <path
         fillRule='evenodd'
         clipRule='evenodd'
-        d='M138 9H83V79.476H147V18C147 13.029 142.971 9 138 9ZM147 88.476H83V156H138C142.971 156 147 151.971 147 147V88.476ZM74 79.476V9H18C13.029 9 9 13.029 9 18V79.476H72H74ZM9 88.476H74V156H18C13.029 156 9 151.971 9 147V88.476ZM18 0C8.059 0 0 8.059 0 18V147C0 156.941 8.059 165 18 165H138C147.941 165 156 156.941 156 147V18C156 8.059 147.941 0 138 0H18ZM27.54 64.394H36.151V48H42.8115C45.3948 48 47.489 50.0942 47.489 52.6775V52.6775C47.489 55.2608 45.3948 57.355 42.8115 57.355H36.151V64.394H45.63C50.9366 64.394 55.377 60.3669 55.8938 55.0854V55.0854C55.9643 54.3647 55.9435 53.638 55.8317 52.9225L55.5571 51.1642C55.24 49.1331 54.153 47.302 52.5219 46.0509L50.5 44.5L52.0247 43.495C53.9086 42.2532 55.1806 40.2735 55.527 38.0439L55.8246 36.1287C55.9411 35.379 55.9657 34.6179 55.8979 33.8623V33.8623C55.3799 28.0899 50.5423 23.667 44.7467 23.667H27.54V64.394ZM42.04 41.545C45.0494 41.545 47.489 39.1054 47.489 36.096V36.096C47.489 33.0866 45.0494 30.647 42.04 30.647H36.151V41.545H42.04ZM100.301 64.394V57.355H111V45.5C111 44 111 39 111 37.5C111 38.661 111 36.2586 111 37.5C111 38.574 111 36.339 111 37.5C111 38.693 111 36.307 111 37.5C111 35.5 111 35.569 111 35C112.194 35 109.5 35 111 35C111 36 111 34.069 111 35C109.5 36 105 39 104 39.5C103.5 38.5 101 34.5 100.5 33.5C99.2921 35.4577 102 31.069 100.5 33.5C102 32.5 111.5 25.167 114 23.667C118.5 23.667 119 23.667 120.5 23.667C120.5 24.7787 120.5 22.5 120.5 25C120.5 28 120.5 27.931 120.5 29.931C120.5 32.431 120.5 33.154 120.5 35.5C120.5 37.038 120.5 39 120.5 40.5C120.5 42.285 120.5 44 120.5 46C120.5 48.5 120.5 55 120.5 57.355H129.335V64.394H100.301ZM27.54 142V101.273H54.983V108.372H36.151V118.077H53.571V125.176H36.151V134.901H55.063V142H27.54ZM131.605 142V101.273H123.034V126.886H122.676L105.097 101.273H97.54V142H106.151V116.366H106.449L124.168 142H131.605Z'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
       />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        B
+      </text>
+
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        1
+      </text>
+
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        E
+      </text>
+
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        N
+      </text>
     </svg>
   );
 }
diff --git a/client/src/assets/icons/b2-english.tsx b/client/src/assets/icons/b2-english.tsx
index 92e2cf363a6..3788b6056ec 100644
--- a/client/src/assets/icons/b2-english.tsx
+++ b/client/src/assets/icons/b2-english.tsx
@@ -6,7 +6,7 @@ function B2EnglishIcon(
   return (
     <svg
       aria-hidden='true'
-      viewBox='0 0 175 170'
+      viewBox='0 0 48 48'
       fill='none'
       xmlns='http://www.w3.org/2000/svg'
       {...props}
@@ -14,8 +14,63 @@ function B2EnglishIcon(
       <path
         fillRule='evenodd'
         clipRule='evenodd'
-        d='M138 9H83V79.5H147V18C147 13 143 9 138 9ZM147 88.5H83V156H138C143 156 147 152 147 147V88.5ZM74 79.5V9H18C13 9 9 13 9 18V79.5H72H74ZM9 88.5H74V156H18C13 156 9 152 9 147V88.5ZM18 0C8.1 0 0 8.1 0 18V147C0 156.9 8.1 165 18 165H138C147.9 165 156 156.9 156 147V18C156 8.1 147.9 0 138 0H18ZM27.5 142V101.3H55V108.4H36.2V118.1H53.6V125.2H36.2V134.9H55.1V142H27.5ZM131.6 142V101.3H123V126.9H122.6L105 101.3H97.4V142H106V116.4H106.3L124 142H131.6ZM100.7 64.9V58.7L115.2 45.3C116.4 44.1 117.5 43 118.3 42.1C119.1 41.1 119.8 40.2 120.2 39.3C120.6 38.4 120.9 37.4 120.9 36.3C120.9 35.1 120.6 34.1 120.1 33.2C119.6 32.3 118.8 31.7 117.9 31.2C117 30.7 115.9 30.5 114.7 30.5C113.5 30.5 112.4 30.8 111.4 31.3C110.5 31.8 109.8 32.5 109.3 33.5C108.8 34.4 108.5 35.6 108.5 36.9H100.3C100.3 34.2 100.9 31.9 102.1 30C103.3 28 105 26.5 107.2 25.4C109.4 24.3 111.9 23.8 114.7 23.8C117.6 23.8 120.2 24.3 122.3 25.4C124.5 26.4 126.2 27.8 127.4 29.7C128.6 31.5 129.2 33.6 129.2 35.9C129.2 37.4 128.9 39 128.3 40.5C127.7 42 126.6 43.7 125.1 45.5C123.6 47.3 121.4 49.5 118.6 52L112.7 57.8V58.1H129.8V65.1H100.7V64.9ZM27.4 64.6H36V48.2H42.7C45.3 48.2 47.4 50.3 47.4 52.9C47.4 55.5 45.3 57.6 42.7 57.6H36V64.6H45.5C50.8 64.6 55.2 60.6 55.8 55.3C55.9 54.6 55.8 53.9 55.7 53.1L55.4 51.3C55.1 49.3 54 47.4 52.4 46.2L50.4 44.6L51.9 43.6C53.8 42.4 55.1 40.4 55.4 38.1L55.7 36.2C55.8 35.5 55.8 34.7 55.8 33.9C55.3 28.1 50.4 23.7 44.6 23.7H27.4V64.6ZM41.9 41.7C44.9 41.7 47.3 39.3 47.3 36.3C47.3 33.3 44.9 30.9 41.9 30.9H36V41.8H41.9V41.7Z'
+        d='M38 2.5H25.5V22.5H45.5V6C45.5 3.79086 43.7091 2 41.5 2.5H38ZM45.5 25.5H25.5V45.5H41.5C43.7091 45.5 45.5 43.7091 45.5 41.5V25.5ZM22.5 22.5V2.5H10H6.5C4.29086 2.5 2.5 4.29086 2.5 6.5V22.5H22.5ZM2.5 25.5H22.5V45.5H6.5C4.29086 45.5 2.5 43.7091 2.5 41.5V25.5ZM6.5 0C2.91015 0 0 2.91015 0 6.5V41.5C0 45.0899 2.91015 48 6.5 48H41.5C45.0899 48 48 45.0899 48 41.5V6.5C48 2.91015 45.0899 0 41.5 0H6.5Z'
       />
+      <text
+        x={12}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        B
+      </text>
+
+      <text
+        x={36}
+        y={14}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        2
+      </text>
+
+      <text
+        x={12}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        E
+      </text>
+
+      <text
+        x={36}
+        y={37}
+        fontSize={16}
+        fontFamily='Lato, sans-serif'
+        fontWeight='bold'
+        textAnchor='middle'
+        dominantBaseline='middle'
+        fill='currentColor'
+        stroke='none'
+      >
+        N
+      </text>
     </svg>
   );
 }
diff --git a/client/src/assets/superblock-icon.tsx b/client/src/assets/superblock-icon.tsx
index 3959554ce72..5265fef14a7 100644
--- a/client/src/assets/superblock-icon.tsx
+++ b/client/src/assets/superblock-icon.tsx
@@ -18,6 +18,10 @@ import CollegeAlgebra from './icons/college-algebra';
 import CSharpLogo from './icons/c-sharp-logo';
 import A2EnglishIcon from './icons/a2-english';
 import B1EnglishIcon from './icons/b1-english';
+import A1SpanishIcon from './icons/a1-spanish';
+import A2SpanishIcon from './icons/a2-spanish';
+import A1ChineseIcon from './icons/a1-chinese';
+import A2ChineseIcon from './icons/a2-chinese';
 import RosettaCodeIcon from './icons/rosetta-code';
 import Code from './icons/code';
 
@@ -43,10 +47,10 @@ const iconMap = {
   [SuperBlocks.FullStackDeveloper]: Code,
   [SuperBlocks.A2English]: A2EnglishIcon,
   [SuperBlocks.B1English]: B1EnglishIcon,
-  [SuperBlocks.A1Spanish]: A2EnglishIcon,
-  [SuperBlocks.A2Spanish]: A2EnglishIcon,
-  [SuperBlocks.A2Chinese]: A2EnglishIcon,
-  [SuperBlocks.A1Chinese]: A2EnglishIcon,
+  [SuperBlocks.A1Spanish]: A1SpanishIcon,
+  [SuperBlocks.A2Spanish]: A2SpanishIcon,
+  [SuperBlocks.A2Chinese]: A2ChineseIcon,
+  [SuperBlocks.A1Chinese]: A1ChineseIcon,
   [SuperBlocks.RosettaCode]: RosettaCodeIcon,
   [SuperBlocks.PythonForEverybody]: PythonIcon,
   [SuperBlocks.BasicHtml]: Code,