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 @@
Spanish (United States) Keyboard
French Keyboard
French (Canada) Keyboard
+ French (Switzerland) Keyboard
Italian Keyboard
Norwegian Keyboard
Dutch Keyboard
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 @@
-
+
@@ -74,6 +74,11 @@
android:imeSubtypeLocale="fr_CA"
android:imeSubtypeMode="keyboard"
/>
+