diff --git a/keymap.h b/keymap.h
index dca2158..0a610b9 100644
--- a/keymap.h
+++ b/keymap.h
@@ -1350,7 +1350,7 @@ xkb_symbols \"(unnamed)\" {\
         key <HJCV>               {	[    Hangul_Hanja ] };\
         key <LWIN>               {	[         Super_L ] };\
         key <RWIN>               {	[         Super_R ] };\
-        key <COMP>               {	[       U%04X, U%04X ] };\
+        key <COMP>               {	[       U%08X, U%08X ] };\
         key <STOP>               {	[          Cancel ] };\
         key <AGAI>               {	[            Redo ] };\
         key <PROP>               {	[        SunProps ] };\
@@ -2814,7 +2814,7 @@ xkb_symbols \"(unnamed)\" {\
         key <HJCV>               {	[    Hangul_Hanja ] };\
         key <LWIN>               {	[         Super_L ] };\
         key <RWIN>               {	[         Super_R ] };\
-        key <COMP>               {	[       U%04X, U%04X ] };\
+        key <COMP>               {	[       U%08X, U%08X ] };\
         key <STOP>               {	[          Cancel ] };\
         key <AGAI>               {	[            Redo ] };\
         key <PROP>               {	[        SunProps ] };\
diff --git a/layout.mobile.h b/layout.mobile.h
index 46cac91..91d8ba2 100644
--- a/layout.mobile.h
+++ b/layout.mobile.h
@@ -619,36 +619,36 @@ static struct key keys_compose_i[] = {
 };
 
 static struct key keys_compose_q[] = {
-  { "🙂", "", 1.0, Copy, 0x101f642, 0, 0 }, //Emojis
-  { "😀", "", 1.0, Copy, 0x101f600, 0, 0 },
-  { "😁", "", 1.0, Copy, 0x101f601, 0, 0 },
-  { "😂", "", 1.0, Copy, 0x101f602, 0, 0 },
-  { "😃", "", 1.0, Copy, 0x101f603, 0, 0 },
-  { "😄", "", 1.0, Copy, 0x101f604, 0, 0 },
-  { "😅", "", 1.0, Copy, 0x101f605, 0, 0 },
-  { "😆", "", 1.0, Copy, 0x101f606, 0, 0 },
-  { "😇", "", 1.0, Copy, 0x101f607, 0, 0 },
-  { "😈", "", 1.0, Copy, 0x101f608, 0, 0 },
+  { "🙂", "", 1.0, Copy, 0x1f642, 0, 0 }, //Emojis
+  { "😀", "", 1.0, Copy, 0x1f600, 0, 0 },
+  { "😁", "", 1.0, Copy, 0x1f601, 0, 0 },
+  { "😂", "", 1.0, Copy, 0x1f602, 0, 0 },
+  { "😃", "", 1.0, Copy, 0x1f603, 0, 0 },
+  { "😄", "", 1.0, Copy, 0x1f604, 0, 0 },
+  { "😅", "", 1.0, Copy, 0x1f605, 0, 0 },
+  { "😆", "", 1.0, Copy, 0x1f606, 0, 0 },
+  { "😇", "", 1.0, Copy, 0x1f607, 0, 0 },
+  { "😈", "", 1.0, Copy, 0x1f608, 0, 0 },
   {"", "", 0.0, EndRow},
-  { "😉", "", 1.0, Copy, 0x101f609, 0, 0 },
-  { "😊", "", 1.0, Copy, 0x101f60a, 0, 0 },
-  { "😋", "", 1.0, Copy, 0x101f60b, 0, 0 },
-  { "😌", "", 1.0, Copy, 0x101f60c, 0, 0 },
-  { "😍", "", 1.0, Copy, 0x101f60d, 0, 0 },
-  { "😎", "", 1.0, Copy, 0x101f60e, 0, 0 },
-  { "😏", "", 1.0, Copy, 0x101f60f, 0, 0 },
-  { "😐", "", 1.0, Copy, 0x101f610, 0, 0 },
-  { "😒", "", 1.0, Copy, 0x101f612, 0, 0 },
-  { "😓", "", 1.0, Copy, 0x101f613, 0, 0 },
+  { "😉", "", 1.0, Copy, 0x1f609, 0, 0 },
+  { "😊", "", 1.0, Copy, 0x1f60a, 0, 0 },
+  { "😋", "", 1.0, Copy, 0x1f60b, 0, 0 },
+  { "😌", "", 1.0, Copy, 0x1f60c, 0, 0 },
+  { "😍", "", 1.0, Copy, 0x1f60d, 0, 0 },
+  { "😎", "", 1.0, Copy, 0x1f60e, 0, 0 },
+  { "😏", "", 1.0, Copy, 0x1f60f, 0, 0 },
+  { "😐", "", 1.0, Copy, 0x1f610, 0, 0 },
+  { "😒", "", 1.0, Copy, 0x1f612, 0, 0 },
+  { "😓", "", 1.0, Copy, 0x1f613, 0, 0 },
   {"", "", 0.0, EndRow},
-  { "😛", "", 1.0, Copy, 0x101f61b, 0, 0 },
-  { "😮", "", 1.0, Copy, 0x101f62e, 0, 0 },
-  { "😟", "", 1.0, Copy, 0x101f61f, 0, 0 },
-  { "😟", "", 1.0, Copy, 0x101f620, 0, 0 },
-  { "😢", "", 1.0, Copy, 0x101f622, 0, 0 },
-  { "😭", "", 1.0, Copy, 0x101f62d, 0, 0 },
-  { "😳", "", 1.0, Copy, 0x101f633, 0, 0 },
-  { "😴", "", 1.0, Copy, 0x101f634, 0, 0 },
+  { "😛", "", 1.0, Copy, 0x1f61b, 0, 0 },
+  { "😮", "", 1.0, Copy, 0x1f62e, 0, 0 },
+  { "😟", "", 1.0, Copy, 0x1f61f, 0, 0 },
+  { "😟", "", 1.0, Copy, 0x1f620, 0, 0 },
+  { "😢", "", 1.0, Copy, 0x1f622, 0, 0 },
+  { "😭", "", 1.0, Copy, 0x1f62d, 0, 0 },
+  { "😳", "", 1.0, Copy, 0x1f633, 0, 0 },
+  { "😴", "", 1.0, Copy, 0x1f634, 0, 0 },
   {"⌫", "⌫", 2.0, Code, KEY_BACKSPACE},
   {"", "", 0.0, EndRow},
   {"Abc", "Abc", 1.0, Layout, 0, &layouts[DefaultLayout]},