diff --git a/assets/icons/keyboard_stroke2_corner0_rounded.svg b/assets/icons/keyboard_stroke2_corner0_rounded.svg
new file mode 100644
index 0000000000..bb6f00b607
--- /dev/null
+++ b/assets/icons/keyboard_stroke2_corner0_rounded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M18 2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7v2h15a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1h3V5a1 1 0 0 1 1-1h11V3a1 1 0 0 1 1-1ZM3 20h18V10H3v10Zm3-4.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5Zm12 0a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5ZM14 16a1 1 0 1 1 0 2h-4a1 1 0 1 1 0-2h4Zm-8.268 1.42h0Zm-.073-.057h0Zm-.06-.067h0Zm-.047-.078h0Zm-.033-.09q.006.027.016.055-.01-.027-.016-.055ZM5.5 17h0Zm.5-5.25a1.25 1.25 0 1 1-1.243 1.378L4.75 13l.007-.128A1.25 1.25 0 0 1 6 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L8.75 13l.007-.128A1.25 1.25 0 0 1 10 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L12.75 13l.007-.128A1.25 1.25 0 0 1 14 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L16.75 13l.007-.128A1.25 1.25 0 0 1 18 11.75ZM5.732 13.42h0Zm-.073-.057h0Zm-.06-.067h0Zm-.047-.078h0Zm-.033-.09q.006.028.016.055-.01-.028-.016-.055ZM5.5 13h0Z"/></svg>
diff --git a/src/components/icons/Keyboard.tsx b/src/components/icons/Keyboard.tsx
new file mode 100644
index 0000000000..252b6feb91
--- /dev/null
+++ b/src/components/icons/Keyboard.tsx
@@ -0,0 +1,5 @@
+import {createSinglePathSVG} from './TEMPLATE'
+
+export const Keyboard_Stroke2_Corner0_Rounded = createSinglePathSVG({
+  path: 'M18 2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7v2h15a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1h3V5a1 1 0 0 1 1-1h11V3a1 1 0 0 1 1-1ZM3 20h18V10H3v10Zm3-4.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5Zm12 0a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5ZM14 16a1 1 0 1 1 0 2h-4a1 1 0 1 1 0-2h4Zm-8.268 1.42h0Zm-.073-.057h0Zm-.06-.067h0Zm-.047-.078h0Zm-.033-.09q.006.027.016.055-.01-.027-.016-.055ZM5.5 17h0Zm.5-5.25a1.25 1.25 0 1 1-1.243 1.378L4.75 13l.007-.128A1.25 1.25 0 0 1 6 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L8.75 13l.007-.128A1.25 1.25 0 0 1 10 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L12.75 13l.007-.128A1.25 1.25 0 0 1 14 11.75Zm4 0a1.25 1.25 0 1 1-1.243 1.378L16.75 13l.007-.128A1.25 1.25 0 0 1 18 11.75ZM5.732 13.42h0Zm-.073-.057h0Zm-.06-.067h0Zm-.047-.078h0Zm-.033-.09q.006.028.016.055-.01-.028-.016-.055ZM5.5 13h0Z',
+})
diff --git a/src/view/com/composer/select-language/PostLanguageSelect.tsx b/src/view/com/composer/select-language/PostLanguageSelect.tsx
index 5a918bc6f4..f9c22dc9a5 100644
--- a/src/view/com/composer/select-language/PostLanguageSelect.tsx
+++ b/src/view/com/composer/select-language/PostLanguageSelect.tsx
@@ -15,6 +15,7 @@ import * as Dialog from '#/components/Dialog'
 import {LanguageSelectDialog} from '#/components/dialogs/LanguageSelectDialog'
 import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRightIcon} from '#/components/icons/Chevron'
 import {Globe_Stroke2_Corner0_Rounded as GlobeIcon} from '#/components/icons/Globe'
+import {Keyboard_Stroke2_Corner0_Rounded as KeyboardIcon} from '#/components/icons/Keyboard'
 import * as Menu from '#/components/Menu'
 import {Text} from '#/components/Typography'
 
@@ -65,20 +66,32 @@ export function PostLanguageSelect({
           )}
         </Menu.Trigger>
         <Menu.Outer>
-          <Menu.Group>
-            {showAutoItem && (
+          {showAutoItem && (
+            <Menu.Group>
               <Menu.Item
-                label={_(msg`Automatic`)}
+                label={_(
+                  msg`Keyboard (${codeToLanguageName(
+                    keyboardLanguage,
+                    langPrefs.appLanguage,
+                  )})`,
+                )}
                 onPress={() => onSelectAutomatic?.()}>
+                <Menu.ItemIcon icon={KeyboardIcon} />
                 <Menu.ItemText>
-                  <Trans>Automatic</Trans>
-                  {' ('}
-                  {codeToLanguageName(keyboardLanguage, langPrefs.appLanguage)}
-                  {')'}
+                  <Trans>
+                    Keyboard (
+                    {codeToLanguageName(
+                      keyboardLanguage,
+                      langPrefs.appLanguage,
+                    )}
+                    )
+                  </Trans>
                 </Menu.ItemText>
                 <Menu.ItemRadio selected={!!isAutoMode} />
               </Menu.Item>
-            )}
+            </Menu.Group>
+          )}
+          <Menu.Group>
             {dedupedHistory.map(historyItem => {
               const langCodes = historyItem.split(',')
               const langName = langCodes