diff --git a/src/lib/components/regionCard.svelte b/src/lib/components/regionCard.svelte
index e12bef707..3e1964802 100644
--- a/src/lib/components/regionCard.svelte
+++ b/src/lib/components/regionCard.svelte
@@ -16,12 +16,12 @@
 </script>
 
 <label
-    class="card u-cursor-pointer u-flex u-flex-vertical u-gap-16"
+    class="box u-cursor-pointer u-flex u-flex-vertical u-gap-16"
     class:is-allow-focus={!disabled}
     class:is-disabled={disabled}
     class:u-height-100-percent={fullHeight}
-    style:--card-padding={`${padding}rem`}
-    style:--card-border-radius={`var(${Radius[borderRadius]})`}>
+    style:--box-padding={`${padding}rem`}
+    style:--box-border-radius={`var(${Radius[borderRadius]})`}>
     <input
         class="is-small u-margin-block-start-2"
         type="radio"
diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte
index fd5719d93..d1088bddb 100644
--- a/src/lib/elements/flag.svelte
+++ b/src/lib/elements/flag.svelte
@@ -5,6 +5,8 @@
     export let width = 40;
     export let height = 30;
     export let quality = 100;
+    let classes: string = undefined;
+    export { classes as class };
 
     export function getFlag(country: string, width: number, height: number, quality: number) {
         let flag = sdk.forProject.avatars
@@ -21,5 +23,6 @@
     style="border-radius: 2.5px"
     src={getFlag(flag, width, height, quality)}
     alt={name}
+    class={classes}
     {width}
     {height} />
diff --git a/src/routes/console/organization-[organization]/wizard/step2.svelte b/src/routes/console/organization-[organization]/wizard/step2.svelte
index 00d030dfa..df817841e 100644
--- a/src/routes/console/organization-[organization]/wizard/step2.svelte
+++ b/src/routes/console/organization-[organization]/wizard/step2.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { RegionCard } from '$lib/components';
-    import { Pill } from '$lib/elements';
+    import { Flag, Pill } from '$lib/elements';
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -11,14 +11,6 @@
     onMount(async () => {
         regions = await sdk.forConsole.billing.listRegions();
     });
-
-    function getFlag(country: string) {
-        let flag = sdk.forProject.avatars.getFlag(country, 80, 60)?.toString();
-        flag?.includes('&project=')
-            ? (flag = flag.replace('&project=', '&mode=admin'))
-            : flag + '&mode=admin';
-        return flag;
-    }
 </script>
 
 <WizardStep>
@@ -38,24 +30,26 @@
                         value={region.$id}
                         disabled={region.disabled}>
                         <div
-                            class="u-flex u-flex-vertical u-gap-12 u-justify-main-center u-cross-center u-margin-inline-auto">
+                            class="u-flex u-flex-vertical u-gap-8 u-justify-main-center u-cross-center u-margin-inline-auto">
                             {#if region.disabled}
-                                <img
-                                    src={getFlag(region.flag)}
-                                    alt={region.name}
-                                    width="40"
-                                    height="30" />
+                                <Flag
+                                    width={40}
+                                    height={30}
+                                    class={region.disabled ? 'u-opacity-50' : ''}
+                                    flag={region.flag}
+                                    name={region.name} />
                                 <p class:u-opacity-50={region.disabled}>{region.name}</p>
                                 <Pill button event="region_notify">
                                     <span class="icon-bell" aria-hidden="true" />
                                     <span class="text">Notify me</span>
                                 </Pill>
                             {:else}
-                                <img
-                                    src={getFlag(region.flag)}
-                                    alt={region.name}
-                                    width="40"
-                                    height="30" />
+                                <Flag
+                                    width={40}
+                                    height={30}
+                                    flag={region.flag}
+                                    name={region.name} />
+
                                 {region.name}
                             {/if}
                         </div>