diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/components/ModelSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/components/ModelSelector.vue
index a871adba4..d676e166f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/captain/components/ModelSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/components/ModelSelector.vue
@@ -28,7 +28,7 @@ const PROVIDER_ICONS = {
   openai: 'i-logos-openai-icon',
   anthropic: 'i-logos-anthropic-icon',
   mistral: 'i-logos-mistral-icon',
-  gemini: 'i-logos-gemini-icon',
+  gemini: 'i-woot-gemini',
 };
 
 const iconForModel = model => {
@@ -128,7 +128,7 @@ const selectModel = model => {
       </button>
       <DropdownBody
         v-if="isOpen"
-        class="absolute right-0 top-full mt-1 min-w-64 z-50"
+        class="absolute right-0 top-full mt-1 min-w-64 z-50 max-h-96 [&>ul]:max-h-96 [&>ul]:overflow-y-scroll"
       >
         <DropdownItem
           v-for="model in availableModels"
diff --git a/app/javascript/dashboard/store/captain/config.js b/app/javascript/dashboard/store/captain/config.js
index 458925669..ba6824553 100644
--- a/app/javascript/dashboard/store/captain/config.js
+++ b/app/javascript/dashboard/store/captain/config.js
@@ -18,11 +18,18 @@ const getters = {
     const feature = $state.features[featureKey];
     const models = feature?.models || [];
 
+    const providerOrder = { openai: 0, anthropic: 1, gemini: 2 };
+
     return [...models].sort((a, b) => {
       // Move coming_soon items to the end
       if (a.coming_soon && !b.coming_soon) return 1;
       if (!a.coming_soon && b.coming_soon) return -1;
 
+      // Sort by provider
+      const providerA = providerOrder[a.provider] ?? 999;
+      const providerB = providerOrder[b.provider] ?? 999;
+      if (providerA !== providerB) return providerA - providerB;
+
       // Sort by credit_multiplier (highest first)
       return (b.credit_multiplier || 0) - (a.credit_multiplier || 0);
     });
diff --git a/config/llm.yml b/config/llm.yml
index 47f32442d..4a56105dd 100644
--- a/config/llm.yml
+++ b/config/llm.yml
@@ -1,10 +1,10 @@
 providers:
   openai:
     display_name: 'OpenAI'
-    logo: openai.png
   anthropic:
     display_name: 'Anthropic'
-    logo: anthropic.png
+  gemini:
+    display_name: 'Gemini'
 
 models:
   gpt-4.1:
@@ -49,6 +49,16 @@ models:
     display_name: 'Claude Sonnet 4'
     coming_soon: true
     credit_multiplier: 2
+  gemini-3-flash:
+    provider: gemini
+    display_name: 'Gemini 3 Flash'
+    coming_soon: true
+    credit_multiplier: 0.5
+  gemini-3-pro:
+    provider: gemini
+    display_name: 'Gemini 3 Pro'
+    coming_soon: true
+    credit_multiplier: 1.5
   whisper-1:
     provider: openai
     display_name: 'Whisper'
@@ -70,6 +80,8 @@ features:
         gpt-5.1,
         gpt-5.2,
         claude-haiku-4.5,
+        gemini-3-flash,
+        gemini-3-pro,
       ]
     default: gpt-4.1-mini
   assistant:
@@ -82,6 +94,8 @@ features:
         gpt-5.2,
         claude-haiku-4.5,
         claude-sonnet-4,
+        gemini-3-flash,
+        gemini-3-pro,
       ]
     default: gpt-5.2
   copilot:
@@ -94,10 +108,13 @@ features:
         gpt-5.2,
         claude-haiku-4.5,
         claude-sonnet-4,
+        gemini-3-flash,
+        gemini-3-pro,
       ]
     default: gpt-5.2
   label_suggestion:
-    models: [gpt-4.1-nano, gpt-4.1-mini, gpt-5-mini]
+    models:
+      [gpt-4.1-nano, gpt-4.1-mini, gpt-5-mini, gemini-3-flash, claude-haiku-4.5]
     default: gpt-4.1-nano
   audio_transcription:
     models: [whisper-1]
diff --git a/theme/icons.js b/theme/icons.js
index 6e7df16a4..373421de8 100644
--- a/theme/icons.js
+++ b/theme/icons.js
@@ -184,5 +184,106 @@ export const icons = {
     width: 14,
     height: 14,
   },
+  gemini: {
+    width: 32,
+    height: 32,
+    body: `<defs>
+		<filter id="SVGqoIxVV2h" width="39.274" height="43.217" x="-19.824" y="13.152" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="2.46" />
+		</filter>
+		<filter id="SVGOahAkcjC" width="84.868" height="85.688" x="-15.001" y="-40.257" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="11.891" />
+		</filter>
+		<filter id="SVGyT4fLePl" width="79.454" height="90.917" x="-20.776" y="11.927" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="10.109" />
+		</filter>
+		<filter id="SVGonSETbRF" width="79.731" height="81.505" x="-19.845" y="15.459" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="10.109" />
+		</filter>
+		<filter id="SVGSN7ofz6B" width="75.117" height="73.758" x="29.832" y="-11.552" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="9.606" />
+		</filter>
+		<filter id="SVGHvbpPvOn" width="78.135" height="78.758" x="-38.583" y="-16.253" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="8.706" />
+		</filter>
+		<filter id="SVG7JmfweRd" width="78.877" height="77.539" x="8.107" y="-5.966" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="7.775" />
+		</filter>
+		<filter id="SVGgGkiybCN" width="56.272" height="51.81" x="13.587" y="-18.488" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="6.957" />
+		</filter>
+		<filter id="SVGxEY6lcrm" width="70.856" height="69.306" x="-15.526" y="-31.297" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="5.876" />
+		</filter>
+		<filter id="SVGg29FyG4g" width="55.501" height="51.571" x="-14.168" y="20.964" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
+			<feFlood flood-opacity="0" result="BackgroundImageFix" />
+			<feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape" />
+			<feGaussianBlur result="effect1_foregroundBlur_10859_4895" stdDeviation="7.273" />
+		</filter>
+		<linearGradient id="SVGlOwgwsgJ" x1="18.447" x2="52.153" y1="43.42" y2="15.004" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#4893fc" />
+			<stop offset=".27" stop-color="#4893fc" />
+			<stop offset=".777" stop-color="#969dff" />
+			<stop offset="1" stop-color="#bd99fe" />
+		</linearGradient>
+		<mask id="SVGbqsmycuA" width="65" height="65" x="0" y="0" maskUnits="userSpaceOnUse">
+			<path d="M32.447 0c.68 0 1.272.465 1.438 1.125a39 39 0 0 0 2 5.905q3.23 7.5 8.854 13.125q5.626 5.626 13.125 8.855a39 39 0 0 0 5.905 1.999c.66.166 1.125.758 1.125 1.438s-.464 1.273-1.125 1.439a39 39 0 0 0-5.905 1.999q-7.5 3.23-13.125 8.854q-5.625 5.627-8.854 13.125a39 39 0 0 0-2 5.906a1.485 1.485 0 0 1-1.438 1.124c-.68 0-1.272-.464-1.438-1.125a39 39 0 0 0-2-5.905q-3.228-7.5-8.854-13.125T7.03 35.885a39 39 0 0 0-5.905-2A1.485 1.485 0 0 1 0 32.448c0-.68.465-1.272 1.125-1.438a39 39 0 0 0 5.905-2q7.5-3.229 13.125-8.854C25.78 14.53 26.857 12.03 29.01 7.03a39 39 0 0 0 1.999-5.905A1.485 1.485 0 0 1 32.447 0" />
+			<path fill="url(#SVGlOwgwsgJ)" d="M32.447 0c.68 0 1.272.465 1.438 1.125a39 39 0 0 0 2 5.905q3.23 7.5 8.854 13.125q5.626 5.626 13.125 8.855a39 39 0 0 0 5.905 1.999c.66.166 1.125.758 1.125 1.438s-.464 1.273-1.125 1.439a39 39 0 0 0-5.905 1.999q-7.5 3.23-13.125 8.854q-5.625 5.627-8.854 13.125a39 39 0 0 0-2 5.906a1.485 1.485 0 0 1-1.438 1.124c-.68 0-1.272-.464-1.438-1.125a39 39 0 0 0-2-5.905q-3.228-7.5-8.854-13.125T7.03 35.885a39 39 0 0 0-5.905-2A1.485 1.485 0 0 1 0 32.448c0-.68.465-1.272 1.125-1.438a39 39 0 0 0 5.905-2q7.5-3.229 13.125-8.854C25.78 14.53 26.857 12.03 29.01 7.03a39 39 0 0 0 1.999-5.905A1.485 1.485 0 0 1 32.447 0" />
+		</mask>
+	</defs>
+	<g mask="url(#SVGbqsmycuA)" transform="translate(2.15 2.15)scale(.42687)">
+		<g filter="url(#SVGqoIxVV2h)">
+			<ellipse cx="14.407" cy="16.95" fill="#ffe432" rx="14.407" ry="16.95" transform="rotate(19.551 -44.575 -16.496)" />
+		</g>
+		<g filter="url(#SVGOahAkcjC)">
+			<ellipse cx="27.433" cy="2.587" fill="#fc413d" rx="18.652" ry="19.062" />
+		</g>
+		<g filter="url(#SVGyT4fLePl)">
+			<ellipse cx="18.951" cy="57.386" fill="#00b95c" rx="19.493" ry="25.253" transform="rotate(-2.799 18.951 57.386)" />
+		</g>
+		<g filter="url(#SVGyT4fLePl)">
+			<ellipse cx="18.951" cy="57.386" fill="#00b95c" rx="19.493" ry="25.253" transform="rotate(-2.799 18.951 57.386)" />
+		</g>
+		<g filter="url(#SVGonSETbRF)">
+			<ellipse cx="20.02" cy="56.211" fill="#00b95c" rx="19.107" ry="21.034" transform="rotate(-31.318 20.02 56.211)" />
+		</g>
+		<g filter="url(#SVGSN7ofz6B)">
+			<ellipse cx="67.391" cy="25.327" fill="#3186ff" rx="18.346" ry="17.667" />
+		</g>
+		<g filter="url(#SVGHvbpPvOn)">
+			<ellipse cx="21.222" cy="22.384" fill="#fbbc04" rx="21.222" ry="22.384" transform="rotate(37.252 9.752 -8.009)" />
+		</g>
+		<g filter="url(#SVG7JmfweRd)">
+			<ellipse cx="24.469" cy="22.604" fill="#3186ff" rx="24.469" ry="22.604" transform="rotate(34.51 19.587 64.852)" />
+		</g>
+		<g filter="url(#SVGgGkiybCN)">
+			<path fill="#749bff" d="M54.984-2.336c2.833 3.852-.807 11.34-8.13 16.728c-7.325 5.386-15.558 6.63-18.39 2.779c-2.834-3.852.806-11.341 8.13-16.728c7.323-5.387 15.557-6.631 18.39-2.78z" />
+		</g>
+		<g filter="url(#SVGxEY6lcrm)">
+			<ellipse cx="19.902" cy="3.356" fill="#fc413d" rx="27.971" ry="17.388" transform="rotate(-42.848 19.902 3.356)" />
+		</g>
+		<g filter="url(#SVGg29FyG4g)">
+			<ellipse cx="13.583" cy="46.75" fill="#ffee48" rx="14.989" ry="8.717" transform="rotate(35.592 13.583 46.75)" />
+		</g>
+	</g>`,
+  },
   /** Ends */
 };