diff --git a/apps/docs/components/Frameworks.tsx b/apps/docs/components/Frameworks.tsx
index 12e38b7910d..4488ad7c1e7 100644
--- a/apps/docs/components/Frameworks.tsx
+++ b/apps/docs/components/Frameworks.tsx
@@ -38,12 +38,12 @@ const Frameworks = () => {
       href: '/reference/javascript/installing#javascript',
     },
     {
-      name: 'Kotlin',
+      name: 'Android',
       logo: {
-        light: '/docs/img/icons/kotlin-icon.svg',
-        dark: '/docs/img/icons/kotlin-icon.svg',
+        light: '/docs/img/icons/android-icon.svg',
+        dark: '/docs/img/icons/android-icon.svg',
       },
-      href: '/guides/with-kotlin',
+      href: '/guides/with-android',
     },
     {
       name: 'Next.js',
diff --git a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
index 8c2bf2cfd75..b3ae1f10f9d 100644
--- a/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
+++ b/apps/docs/components/Navigation/NavigationMenu/NavigationMenu.constants.ts
@@ -215,7 +215,7 @@ export const gettingstarted: NavMenuConstant = {
         { name: 'NuxtJS', url: '/guides/getting-started/quickstarts/nuxtjs' },
         { name: 'RedwoodJS', url: '/guides/getting-started/quickstarts/redwoodjs' },
         { name: 'Flutter', url: '/guides/getting-started/quickstarts/flutter' },
-        { name: 'Kotlin', url: '/guides/getting-started/quickstarts/kotlin' },
+        { name: 'Android', url: '/guides/getting-started/quickstarts/android' },
         { name: 'SvelteKit', url: '/guides/getting-started/quickstarts/sveltekit' },
         { name: 'SolidJS', url: '/guides/getting-started/quickstarts/solidjs' },
         { name: 'Vue', url: '/guides/getting-started/quickstarts/vue' },
@@ -274,8 +274,8 @@ export const gettingstarted: NavMenuConstant = {
           url: '/guides/getting-started/tutorials/with-expo',
         },
         {
-          name: 'Kotlin',
-          url: '/guides/getting-started/tutorials/with-kotlin',
+          name: 'Android',
+          url: '/guides/getting-started/tutorials/with-android',
         },
         {
           name: 'Ionic React',
diff --git a/apps/docs/pages/guides/getting-started.mdx b/apps/docs/pages/guides/getting-started.mdx
index 79f185423ed..a5480613ed5 100644
--- a/apps/docs/pages/guides/getting-started.mdx
+++ b/apps/docs/pages/guides/getting-started.mdx
@@ -158,11 +158,11 @@ export const quickstarts = [
     icon: '/docs/img/icons/flutter-icon',
   },
   {
-    title: 'Kotlin',
-    href: '/guides/getting-started/quickstarts/kotlin',
+    title: 'Android',
+    href: '/guides/getting-started/quickstarts/android',
     description:
-      'Learn how to create a Supabase project, add some sample data to your database, and query the data from a Kotlin app.',
-    icon: '/docs/img/icons/kotlin-icon',
+      'Learn how to create a Supabase project, add some sample data to your database, and query the data from an Android app.',
+    icon: '/docs/img/icons/android-icon',
   },
   {
     title: 'SvelteKit',
@@ -262,11 +262,11 @@ export const mobile = [
     icon: '/docs/img/icons/expo-icon',
   },
   {
-    title: 'Kotlin',
-    href: '/guides/getting-started/tutorials/with-kotlin',
+    title: 'Android',
+    href: '/guides/getting-started/tutorials/with-android',
     description:
-      'Learn how to build a groceries store app with Kotlin and Supabase Database, Auth, and Storage functionality.',
-    icon: '/docs/img/icons/kotlin-icon',
+      'Learn how to build a product management app with Android and Supabase Database, Auth, and Storage functionality.',
+    icon: '/docs/img/icons/android-icon',
   },
   {
     title: 'Ionic React',
diff --git a/apps/docs/pages/guides/getting-started/quickstarts/kotlin.mdx b/apps/docs/pages/guides/getting-started/quickstarts/android.mdx
similarity index 100%
rename from apps/docs/pages/guides/getting-started/quickstarts/kotlin.mdx
rename to apps/docs/pages/guides/getting-started/quickstarts/android.mdx
diff --git a/apps/docs/pages/guides/getting-started/tutorials/with-kotlin.mdx b/apps/docs/pages/guides/getting-started/tutorials/with-android.mdx
similarity index 99%
rename from apps/docs/pages/guides/getting-started/tutorials/with-kotlin.mdx
rename to apps/docs/pages/guides/getting-started/tutorials/with-android.mdx
index 420a937f375..8fac4c8f5e5 100644
--- a/apps/docs/pages/guides/getting-started/tutorials/with-kotlin.mdx
+++ b/apps/docs/pages/guides/getting-started/tutorials/with-android.mdx
@@ -48,7 +48,7 @@ In `build.gradle (app)`, create `Properties` object and read value from `local.p
 
 ```kotlin
 defaultConfig {
-   applicationId "com.hieuwu.groceriesstore"
+   applicationId "com.example.manageproducts"
    minSdkVersion 22
    targetSdkVersion 33
    versionCode 5
diff --git a/apps/docs/public/img/icons/android-icon.svg b/apps/docs/public/img/icons/android-icon.svg
new file mode 100644
index 00000000000..5753b644f89
--- /dev/null
+++ b/apps/docs/public/img/icons/android-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="48px" height="48px"><path fill="#30dc80" d="M24,14.088C11.427,14.088,1.108,23.716,0,36h48C46.892,23.716,36.573,14.088,24,14.088z M33.179,27.079c0-1.104,0.895-1.999,1.999-1.999c1.104,0,1.999,0.895,1.999,1.999c0,1.104-0.895,1.999-1.999,1.999	C34.074,29.078,33.179,28.183,33.179,27.079z M12.822,29.078c-1.104,0-1.999-0.895-1.999-1.999c0-1.104,0.895-1.999,1.999-1.999	s1.999,0.895,1.999,1.999C14.821,28.183,13.926,29.078,12.822,29.078z"/><path fill="#30dc80" d="M34.038,19.313c-0.14,0-0.281-0.035-0.41-0.11c-0.393-0.227-0.527-0.729-0.301-1.122l5.197-9.008	c0.227-0.394,0.729-0.529,1.122-0.301c0.393,0.227,0.527,0.729,0.301,1.122l-5.197,9.008C34.598,19.166,34.322,19.313,34.038,19.313	z"/><path fill="#30dc80" d="M13.962,19.313c-0.284,0-0.56-0.148-0.712-0.411L8.054,9.894C7.827,9.501,7.962,8.999,8.354,8.772	c0.392-0.228,0.895-0.093,1.122,0.301l5.197,9.008c0.227,0.394,0.092,0.896-0.301,1.122C14.243,19.278,14.102,19.313,13.962,19.313z"/></svg>
\ No newline at end of file
diff --git a/apps/docs/public/sitemap.xml b/apps/docs/public/sitemap.xml
index 8d45f277b06..b5f1f67ce03 100644
--- a/apps/docs/public/sitemap.xml
+++ b/apps/docs/public/sitemap.xml
@@ -1123,7 +1123,7 @@
   </url>
 
   <url>
-    <loc>https://supabase.com/docs/guides/getting-started/quickstarts/kotlin</loc>
+    <loc>https://supabase.com/docs/guides/getting-started/quickstarts/android</loc>
     <changefreq>weekly</changefreq>
     <changefreq>0.5</changefreq>
   </url>
@@ -1603,7 +1603,7 @@
   </url>
 
   <url>
-    <loc>https://supabase.com/docs/guides/getting-started/tutorials/with-kotlin</loc>
+    <loc>https://supabase.com/docs/guides/getting-started/tutorials/with-android</loc>
     <changefreq>weekly</changefreq>
     <changefreq>0.5</changefreq>
   </url>
diff --git a/apps/www/components/Hero/HeroFrameworks.tsx b/apps/www/components/Hero/HeroFrameworks.tsx
index b0cbf1cd66c..6ee78cbcca8 100644
--- a/apps/www/components/Hero/HeroFrameworks.tsx
+++ b/apps/www/components/Hero/HeroFrameworks.tsx
@@ -33,9 +33,9 @@ const frameworks = [
     gaEvent: 'www_hp_hero_frameworks_flutter',
   },
   {
-    name: 'Kotlin',
+    name: 'Android',
     icon: '/images/logos/frameworks/kotlin.svg',
-    docs: '/docs/guides/getting-started/quickstarts/kotlin',
+    docs: '/docs/guides/getting-started/quickstarts/android',
     gaEvent: 'www_hp_hero_frameworks_kotlin',
   },
   {
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index c0696dd320d..d0952f9a24a 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -1714,8 +1714,8 @@ module.exports = [
   },
   {
     permanent: true,
-    source: '/docs/guides/with-kotlin',
-    destination: '/docs/guides/getting-started/tutorials/with-kotlin',
+    source: '/docs/guides/with-android',
+    destination: '/docs/guides/getting-started/tutorials/with-android',
   },
   {
     permanent: true,
diff --git a/packages/ui/src/components/Command/utils/shared-nav-items.json b/packages/ui/src/components/Command/utils/shared-nav-items.json
index 138de8f97e5..55b3767edaa 100644
--- a/packages/ui/src/components/Command/utils/shared-nav-items.json
+++ b/packages/ui/src/components/Command/utils/shared-nav-items.json
@@ -214,7 +214,7 @@
     },
     {
       "label": "Kotlin",
-      "url": "https://supabase.com/docs/guides/getting-started/quickstarts/kotlin"
+      "url": "https://supabase.com/docs/guides/getting-started/quickstarts/android"
     },
     {
       "label": "SvelteKit",