diff --git a/java/res/drawable/ic_subtype_keyboard_fr_ch.png b/java/res/drawable/ic_subtype_keyboard_fr_ch.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_fr_ch.png differ
diff --git a/java/res/drawable/ic_subtype_us_keyboard.png b/java/res/drawable/ic_subtype_us_keyboard.png
deleted file mode 100644
index 8ed6cc8b2..000000000
Binary files a/java/res/drawable/ic_subtype_us_keyboard.png and /dev/null differ
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 63c9f4213..a0d776517 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -402,6 +402,7 @@
     <string name="subtype_mode_es_US_keyboard">Spanish (United States) Keyboard</string>
     <string name="subtype_mode_fr_keyboard">French Keyboard</string>
     <string name="subtype_mode_fr_CA_keyboard">French (Canada) Keyboard</string>
+    <string name="subtype_mode_fr_CH_keyboard">French (Switzerland) Keyboard</string>
     <string name="subtype_mode_it_keyboard">Italian Keyboard</string>
     <string name="subtype_mode_nb_keyboard">Norwegian Keyboard</string>
     <string name="subtype_mode_nl_keyboard">Dutch Keyboard</string>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 1ec301b32..4ee60da51 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -20,7 +20,7 @@
 <!-- The attributes in this XML file provide configuration information -->
 <!-- for the Input Method Manager. -->
 
-<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, it, nb, nl, sr, sv -->
+<!-- Keyboard: en_US, cs, da, de, en_GB, es, es_US, fr, fr_CA, fr_CH, it, nb, nl, sr, sv -->
 <!-- Voice: cs, da, de, en_AU, en_GB, en_IN, en_NZ, en_US, es, fr, ko, ja, pl, pt, ru, tr, zh_CN, zh_TW -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- TODO: use <lang>_mic icon instead of a common mic icon. -->
@@ -74,6 +74,11 @@
             android:imeSubtypeLocale="fr_CA"
             android:imeSubtypeMode="keyboard"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ch"
+            android:label="@string/subtype_mode_fr_CH_keyboard"
+            android:imeSubtypeLocale="fr_CH"
+            android:imeSubtypeMode="keyboard"
+    />
     <subtype android:icon="@drawable/ic_subtype_keyboard_it"
             android:label="@string/subtype_mode_it_keyboard"
             android:imeSubtypeLocale="it"