diff --git a/CHANGELOG.md b/CHANGELOG.md
index def8e616..63563696 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,8 +12,8 @@
 - Default widget 'show_buffer' is now 20 instead of 0 (causes scrolling to stay slightly ahead of widget selection). This can be overridden with the ba.widget() call if anything breaks.
 - Relocated ba.app.uiscale to ba.app.ui.uiscale
 - Top level settings window now properly saves/restores its state again.
-- BombSquad now has its own Exclusive Emojis in the Internal Game Keyboard.
-- Added continuos CAPITAL letters typing feature in the Internal Game Keyboard.
+- Added Emojis to the Internal Game Keyboard.
+- Added continuous CAPITAL letters typing feature in the Internal Game Keyboard.
 
 ### 1.5.22 (20139)
 - Button and key names now display correctly again on Android (and are cleaned up on other platforms too).
diff --git a/assets/src/ba_data/python/bastd/ui/onscreenkeyboard.py b/assets/src/ba_data/python/bastd/ui/onscreenkeyboard.py
index a5d0fec1..a87af751 100644
--- a/assets/src/ba_data/python/bastd/ui/onscreenkeyboard.py
+++ b/assets/src/ba_data/python/bastd/ui/onscreenkeyboard.py
@@ -38,6 +38,7 @@ class OnScreenKeyboardWindow(ba.Window):
 
     def __init__(self, textwidget: ba.Widget, label: str, max_chars: int):
         # pylint: disable=too-many-locals
+        # pylint: disable=too-many-statements
         self._target_text = textwidget
         self._width = 700
         self._height = 400
@@ -261,63 +262,19 @@ class OnScreenKeyboardWindow(ba.Window):
 
         elif self._mode in ['emoji', 'emoji2']:
             chars = [
-                '💣',
-                '💥',
-                '🙂',
-                '😄',
-                '😆',
-                '😅',
-                '😂',
-                '☺',
-                '😀',
-                '😉',
-                '😇',
-                '😎',
-                '😰',
-                '😠',
-                '😈',
-                '😨',
-                '😛',
-                '😜',
-                '😝',
-                '😐',
-                '😑',
-                '😵',
-                '😬',
-                '😡',
-                '😌',
-                '😍']
+                '💣', '💥', '🙂', '😄', '😆', '😅', '😂', '☺', '😀', '😉', '😇', '😎',
+                '😰', '😠', '😈', '😨', '😛', '😜', '😝', '😐', '😑', '😵', '😬', '😡',
+                '😌', '😍'
+            ]
             if self._mode == 'emoji2':
                 chars = [
-                    '😔',
-                    '😥',
-                    '😭',
-                    '😖',
-                    '😓',
-                    '😉',
-                    '😴',
-                    '😷',
-                    '👋',
-                    '💯',
-                    '🙏',
-                    '💪',
-                    '👀',
-                    '💬',
-                    '💀',
-                    '☠',
-                    '💩',
-                    '👻',
-                    '👽',
-                    '👾',
-                    '❤',
-                    '💛',
-                    '💚',
-                    '💙',
-                    '💜',
-                    '💔']
+                    '😔', '😥', '😭', '😖', '😓', '😉', '😴', '😷', '👋', '💯', '🙏', '💪',
+                    '👀', '💬', '💀', '☠', '💩', '👻', '👽', '👾', '❤', '💛', '💚', '💙',
+                    '💜', '💔'
+                ]
             ba.buttonwidget(edit=self._shift_button,
-                            color=self._key_color_lit
-                            if self._mode == 'emoji2' else self._key_color_dark,
+                            color=self._key_color_lit if self._mode == 'emoji2'
+                            else self._key_color_dark,
                             label=charstr(SpCh.SHIFT),
                             on_activate_call=self._emoji_mode_2)
             ba.buttonwidget(edit=self._emoji_button,