diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
index b67732cd42da45d3f9b407efc2fb841b814357b9..fad0ec4586104a5cc559efe898d72ce436cd1df7 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
index 534f1cdfdb15db851eab5a61ad52f9d2b3c780f8..215f8157c3b7306760178bc0e1715afd675fbd76 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
index fba10b8882d6ecb43458ed5535e20d77f65197c5..88acdd7483f4eaf257c1b64331c7ae3046ff53f7 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png
index b67732cd42da45d3f9b407efc2fb841b814357b9..fad0ec4586104a5cc559efe898d72ce436cd1df7 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png
index 534f1cdfdb15db851eab5a61ad52f9d2b3c780f8..215f8157c3b7306760178bc0e1715afd675fbd76 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png
index fba10b8882d6ecb43458ed5535e20d77f65197c5..88acdd7483f4eaf257c1b64331c7ae3046ff53f7 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png differ
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 01f3ba66cda6a65d28d1608be5ceaac6cc5c6429..26f8a328bfbe98eed1ea7ac8d27f966200eed970 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1487,7 +1487,12 @@ public class LatinIME extends InputMethodService
             mVoiceInput.cancel();
         }
         requestHideSelf(0);
-        mKeyboardSwitcher.getInputView().closing();
+        if (mKeyboardSwitcher != null) {
+            LatinKeyboardView inputView = mKeyboardSwitcher.getInputView();
+            if (inputView != null) {
+                inputView.closing();
+            }
+        }
         TextEntryState.endSession();
     }
 
diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
index 6d15d216cd949a7251a5f7b50852323031282680..a8ab9cc98e9fe32852f237a4431ee13b6844fc2e 100644
--- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java
+++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java
@@ -37,8 +37,8 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang
     public static void onDestroy() {
     }
 
-    public static void logOnManualSuggestion(String before, String after, int position
-            , List<CharSequence> suggestions) {
+    public static void logOnManualSuggestion(
+            String before, String after, int position, List<CharSequence> suggestions) {
    }
 
     public static void logOnAutoSuggestion(String before, String after) {