diff --git a/TODO b/TODO
new file mode 100644
index 00000000000..6f211756677
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+- Bug in set name, every seven sets it repeats a letter through the end of the screen
diff --git a/flipagotchi/application.fam b/flipagotchi/application.fam
index b338a911896..2abffdae02b 100644
--- a/flipagotchi/application.fam
+++ b/flipagotchi/application.fam
@@ -9,4 +9,5 @@ App(
     order=12,
     fap_icon="flipagotchi_10px.png",
     fap_category="Tools",
+    fap_icon_assets="assets",
 )
\ No newline at end of file
diff --git a/flipagotchi/assets/faces/angry.png b/flipagotchi/assets/faces/angry.png
deleted file mode 100644
index 4716c944921..00000000000
Binary files a/flipagotchi/assets/faces/angry.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/angry_flipagotchi.png b/flipagotchi/assets/faces/angry_flipagotchi.png
new file mode 100644
index 00000000000..51b0e79dee6
Binary files /dev/null and b/flipagotchi/assets/faces/angry_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/awake.png b/flipagotchi/assets/faces/awake.png
deleted file mode 100644
index 4a017277c29..00000000000
Binary files a/flipagotchi/assets/faces/awake.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/awake_flipagotchi.png b/flipagotchi/assets/faces/awake_flipagotchi.png
new file mode 100644
index 00000000000..e395f3dcd7c
Binary files /dev/null and b/flipagotchi/assets/faces/awake_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/bored.png b/flipagotchi/assets/faces/bored.png
deleted file mode 100644
index b8dccb41ebe..00000000000
Binary files a/flipagotchi/assets/faces/bored.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/bored_flipagotchi.png b/flipagotchi/assets/faces/bored_flipagotchi.png
new file mode 100644
index 00000000000..c0570ffff4d
Binary files /dev/null and b/flipagotchi/assets/faces/bored_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/broken.png b/flipagotchi/assets/faces/broken.png
deleted file mode 100644
index 10dbc9ea35c..00000000000
Binary files a/flipagotchi/assets/faces/broken.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/broken_flipagotchi.png b/flipagotchi/assets/faces/broken_flipagotchi.png
new file mode 100644
index 00000000000..6f33dfdf6a9
Binary files /dev/null and b/flipagotchi/assets/faces/broken_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/cool.png b/flipagotchi/assets/faces/cool.png
deleted file mode 100644
index 26f9d7dddf9..00000000000
Binary files a/flipagotchi/assets/faces/cool.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/cool_flipagotchi.png b/flipagotchi/assets/faces/cool_flipagotchi.png
new file mode 100644
index 00000000000..3779f8e5270
Binary files /dev/null and b/flipagotchi/assets/faces/cool_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/debug.png b/flipagotchi/assets/faces/debug.png
deleted file mode 100644
index 945bb9baded..00000000000
Binary files a/flipagotchi/assets/faces/debug.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/debug_flipagotchi.png b/flipagotchi/assets/faces/debug_flipagotchi.png
new file mode 100644
index 00000000000..64c918d1b98
Binary files /dev/null and b/flipagotchi/assets/faces/debug_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/demotivated.png b/flipagotchi/assets/faces/demotivated.png
deleted file mode 100644
index d8453a8b214..00000000000
Binary files a/flipagotchi/assets/faces/demotivated.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/demotivated_flipagotchi.png b/flipagotchi/assets/faces/demotivated_flipagotchi.png
new file mode 100644
index 00000000000..e9775b932fc
Binary files /dev/null and b/flipagotchi/assets/faces/demotivated_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/excited.png b/flipagotchi/assets/faces/excited.png
deleted file mode 100644
index ab4ea6c7f4e..00000000000
Binary files a/flipagotchi/assets/faces/excited.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/excited_flipagotchi.png b/flipagotchi/assets/faces/excited_flipagotchi.png
new file mode 100644
index 00000000000..e344991eb37
Binary files /dev/null and b/flipagotchi/assets/faces/excited_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/friend.png b/flipagotchi/assets/faces/friend.png
deleted file mode 100644
index a434aaf1790..00000000000
Binary files a/flipagotchi/assets/faces/friend.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/friend_flipagotchi.png b/flipagotchi/assets/faces/friend_flipagotchi.png
new file mode 100644
index 00000000000..eb9976b446a
Binary files /dev/null and b/flipagotchi/assets/faces/friend_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/grateful.png b/flipagotchi/assets/faces/grateful.png
deleted file mode 100644
index 4a01b632513..00000000000
Binary files a/flipagotchi/assets/faces/grateful.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/grateful_flipagotchi.png b/flipagotchi/assets/faces/grateful_flipagotchi.png
new file mode 100644
index 00000000000..41f2b5d1261
Binary files /dev/null and b/flipagotchi/assets/faces/grateful_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/happy.png b/flipagotchi/assets/faces/happy.png
deleted file mode 100644
index 587ecef220b..00000000000
Binary files a/flipagotchi/assets/faces/happy.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/happy_flipagotchi.png b/flipagotchi/assets/faces/happy_flipagotchi.png
new file mode 100644
index 00000000000..4deb2d9ea58
Binary files /dev/null and b/flipagotchi/assets/faces/happy_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/intense.png b/flipagotchi/assets/faces/intense.png
deleted file mode 100644
index add88cd28b3..00000000000
Binary files a/flipagotchi/assets/faces/intense.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/intense_flipagotchi.png b/flipagotchi/assets/faces/intense_flipagotchi.png
new file mode 100644
index 00000000000..14353422050
Binary files /dev/null and b/flipagotchi/assets/faces/intense_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/lonely.png b/flipagotchi/assets/faces/lonely.png
deleted file mode 100644
index 8ae0c96ea2c..00000000000
Binary files a/flipagotchi/assets/faces/lonely.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/lonely_flipagotchi.png b/flipagotchi/assets/faces/lonely_flipagotchi.png
new file mode 100644
index 00000000000..47f33aec554
Binary files /dev/null and b/flipagotchi/assets/faces/lonely_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/look_l.png b/flipagotchi/assets/faces/look_l.png
deleted file mode 100644
index 414774af72b..00000000000
Binary files a/flipagotchi/assets/faces/look_l.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/look_l_flipagotchi.png b/flipagotchi/assets/faces/look_l_flipagotchi.png
new file mode 100644
index 00000000000..4a206c43eb7
Binary files /dev/null and b/flipagotchi/assets/faces/look_l_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/look_l_happy.png b/flipagotchi/assets/faces/look_l_happy.png
deleted file mode 100644
index 12b2408ac50..00000000000
Binary files a/flipagotchi/assets/faces/look_l_happy.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/look_l_happy_flipagotchi.png b/flipagotchi/assets/faces/look_l_happy_flipagotchi.png
new file mode 100644
index 00000000000..e7cd4e4bf23
Binary files /dev/null and b/flipagotchi/assets/faces/look_l_happy_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/look_r.png b/flipagotchi/assets/faces/look_r.png
deleted file mode 100644
index d53741289b1..00000000000
Binary files a/flipagotchi/assets/faces/look_r.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/look_r_flipagotchi.png b/flipagotchi/assets/faces/look_r_flipagotchi.png
new file mode 100644
index 00000000000..c9587f6cc5e
Binary files /dev/null and b/flipagotchi/assets/faces/look_r_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/look_r_happy.png b/flipagotchi/assets/faces/look_r_happy.png
deleted file mode 100644
index ab8a1b9a19a..00000000000
Binary files a/flipagotchi/assets/faces/look_r_happy.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/look_r_happy_flipagotchi.png b/flipagotchi/assets/faces/look_r_happy_flipagotchi.png
new file mode 100644
index 00000000000..adf3cff2d98
Binary files /dev/null and b/flipagotchi/assets/faces/look_r_happy_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/motivated.png b/flipagotchi/assets/faces/motivated.png
deleted file mode 100644
index deef81a36d1..00000000000
Binary files a/flipagotchi/assets/faces/motivated.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/motivated_flipagotchi.png b/flipagotchi/assets/faces/motivated_flipagotchi.png
new file mode 100644
index 00000000000..905409450db
Binary files /dev/null and b/flipagotchi/assets/faces/motivated_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/sad.png b/flipagotchi/assets/faces/sad.png
deleted file mode 100644
index ceb26fd5585..00000000000
Binary files a/flipagotchi/assets/faces/sad.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/sad_flipagotchi.png b/flipagotchi/assets/faces/sad_flipagotchi.png
new file mode 100644
index 00000000000..2b3d09e1245
Binary files /dev/null and b/flipagotchi/assets/faces/sad_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/sleep.png b/flipagotchi/assets/faces/sleep.png
deleted file mode 100644
index 578f52b0aa1..00000000000
Binary files a/flipagotchi/assets/faces/sleep.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/sleep2.png b/flipagotchi/assets/faces/sleep2.png
deleted file mode 100644
index 77b0de253c3..00000000000
Binary files a/flipagotchi/assets/faces/sleep2.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/sleep2_flipagotchi.png b/flipagotchi/assets/faces/sleep2_flipagotchi.png
new file mode 100644
index 00000000000..29901892803
Binary files /dev/null and b/flipagotchi/assets/faces/sleep2_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/sleep_flipagotchi.png b/flipagotchi/assets/faces/sleep_flipagotchi.png
new file mode 100644
index 00000000000..a7af8ceb5f3
Binary files /dev/null and b/flipagotchi/assets/faces/sleep_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/smart.png b/flipagotchi/assets/faces/smart.png
deleted file mode 100644
index 572a278f1f0..00000000000
Binary files a/flipagotchi/assets/faces/smart.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/smart_flipagotchi.png b/flipagotchi/assets/faces/smart_flipagotchi.png
new file mode 100644
index 00000000000..e36dfc7055e
Binary files /dev/null and b/flipagotchi/assets/faces/smart_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/upload.png b/flipagotchi/assets/faces/upload.png
deleted file mode 100644
index 0542397fc16..00000000000
Binary files a/flipagotchi/assets/faces/upload.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/upload1.png b/flipagotchi/assets/faces/upload1.png
deleted file mode 100644
index 1be292587ed..00000000000
Binary files a/flipagotchi/assets/faces/upload1.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/upload1_flipagotchi.png b/flipagotchi/assets/faces/upload1_flipagotchi.png
new file mode 100644
index 00000000000..edee155dde2
Binary files /dev/null and b/flipagotchi/assets/faces/upload1_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/upload2.png b/flipagotchi/assets/faces/upload2.png
deleted file mode 100644
index b43bf73649d..00000000000
Binary files a/flipagotchi/assets/faces/upload2.png and /dev/null differ
diff --git a/flipagotchi/assets/faces/upload2_flipagotchi.png b/flipagotchi/assets/faces/upload2_flipagotchi.png
new file mode 100644
index 00000000000..0ca5ac4fa48
Binary files /dev/null and b/flipagotchi/assets/faces/upload2_flipagotchi.png differ
diff --git a/flipagotchi/assets/faces/upload_flipagotchi.png b/flipagotchi/assets/faces/upload_flipagotchi.png
new file mode 100644
index 00000000000..84e99cf1b21
Binary files /dev/null and b/flipagotchi/assets/faces/upload_flipagotchi.png differ
diff --git a/flipagotchi/assets/facesScreenshot.png b/flipagotchi/assets/facesScreenshot.png
deleted file mode 100644
index 652d137462a..00000000000
Binary files a/flipagotchi/assets/facesScreenshot.png and /dev/null differ
diff --git a/flipagotchi/include/faces_xbm.h b/flipagotchi/include/faces_xbm.h
deleted file mode 100644
index 7a6d24576aa..00000000000
--- a/flipagotchi/include/faces_xbm.h
+++ /dev/null
@@ -1,2918 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/// faces_xbm.h																							   ///
-///																										   ///
-/// This file was generated by the img2xbm.py program included in the tools/ directory					   ///
-/// If you are interested in using this tool the functionality is wrapped into the extractXBMCode function ///
-/// Each function has docstrings and should be well documented, but open issues if you need help		   ///
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include <furi.h>
-
-#define noface_height 1
-#define noface_width 1
-static uint8_t noface_xbm[] = {
-	0x0,
-};
-
-#define angry_height 14
-#define angry_width 64
-static uint8_t angry_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x70,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x60,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x60,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0xf0,
-	0x3,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xf,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define awake_height 14
-#define awake_width 64
-static uint8_t awake_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x3e,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x61,
-	0x0,
-	0x8c,
-	0xfb,
-	0x0,
-	0x0,
-	0x0,
-	0xdc,
-	0xc7,
-	0x0,
-	0x8e,
-	0xf9,
-	0x0,
-	0x0,
-	0x0,
-	0xcc,
-	0xc7,
-	0x1,
-	0xc7,
-	0xf8,
-	0x1,
-	0x0,
-	0x0,
-	0xc6,
-	0x8f,
-	0x1,
-	0xc7,
-	0xff,
-	0x1,
-	0x0,
-	0x0,
-	0xfe,
-	0x8f,
-	0x3,
-	0xc7,
-	0xff,
-	0x1,
-	0x0,
-	0x0,
-	0xfe,
-	0x8f,
-	0x3,
-	0x87,
-	0xff,
-	0x0,
-	0x0,
-	0x0,
-	0xfc,
-	0x87,
-	0x3,
-	0x87,
-	0xff,
-	0x0,
-	0x0,
-	0x0,
-	0xfc,
-	0x87,
-	0x3,
-	0x7,
-	0x3e,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x81,
-	0x1,
-	0xe,
-	0x0,
-	0xf,
-	0xf8,
-	0x80,
-	0x3,
-	0xc0,
-	0x1,
-	0xc,
-	0x0,
-	0xfc,
-	0xcf,
-	0xff,
-	0x0,
-	0xc0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define bored_height 14
-#define bored_width 64
-static uint8_t bored_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x61,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define broken_height 14
-#define broken_width 64
-static uint8_t broken_xbm[] = {
-	0x80,
-	0x31,
-	0x0,
-	0x0,
-	0x80,
-	0x63,
-	0x0,
-	0x0,
-	0x9c,
-	0x33,
-	0x0,
-	0x0,
-	0x80,
-	0x73,
-	0x6,
-	0x0,
-	0x8c,
-	0x3b,
-	0x0,
-	0x0,
-	0x0,
-	0x37,
-	0xe,
-	0x0,
-	0xe,
-	0x1f,
-	0x0,
-	0x0,
-	0x0,
-	0x3e,
-	0x1c,
-	0x0,
-	0x7,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x1e,
-	0x1c,
-	0x0,
-	0x7,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x18,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x0,
-	0x0,
-	0x1e,
-	0x18,
-	0x0,
-	0x7,
-	0x1f,
-	0x0,
-	0x0,
-	0x0,
-	0x3e,
-	0x18,
-	0x0,
-	0x87,
-	0x3b,
-	0x0,
-	0x0,
-	0x0,
-	0x37,
-	0x18,
-	0x0,
-	0x87,
-	0x31,
-	0x0,
-	0x0,
-	0x80,
-	0x73,
-	0x1c,
-	0x0,
-	0xe,
-	0xc0,
-	0x3,
-	0x1e,
-	0x70,
-	0x0,
-	0x1c,
-	0x0,
-	0xc,
-	0x0,
-	0xff,
-	0xf3,
-	0x3f,
-	0x0,
-	0xe,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define cool_height 14
-#define cool_width 64
-static uint8_t cool_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0xf0,
-	0xf,
-	0xfc,
-	0x33,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0xf0,
-	0xf,
-	0xfc,
-	0x73,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0xf0,
-	0xf,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0xff,
-	0xf,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0xf1,
-	0xf,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0xf1,
-	0xf,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0xf0,
-	0xf,
-	0xfc,
-	0x73,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0xf8,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define debug_height 14
-#define debug_width 64
-static uint8_t debug_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x8c,
-	0xf,
-	0x0,
-	0xf0,
-	0x39,
-	0x0,
-	0x0,
-	0x0,
-	0x8e,
-	0xf,
-	0x0,
-	0xf0,
-	0x31,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0xfc,
-	0x73,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0xe7,
-	0x1f,
-	0x0,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define demotivated_height 14
-#define demotivated_width 64
-static uint8_t demotivated_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0xce,
-	0xff,
-	0x0,
-	0xc0,
-	0xff,
-	0x1c,
-	0x0,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x0,
-	0x1e,
-	0x1c,
-	0x0,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x0,
-	0x1e,
-	0x18,
-	0x0,
-	0x0,
-	0xc7,
-	0xff,
-	0x0,
-	0xc0,
-	0xff,
-	0x18,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x1c,
-	0x80,
-	0xff,
-	0x3f,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define excited_height 14
-#define excited_width 64
-static uint8_t excited_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x9c,
-	0xf,
-	0x0,
-	0x0,
-	0xf0,
-	0x18,
-	0x0,
-	0x0,
-	0x8c,
-	0xd,
-	0x0,
-	0x0,
-	0xf8,
-	0x39,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x7,
-	0x60,
-	0xe0,
-	0x3,
-	0x7,
-	0x60,
-	0x0,
-	0x0,
-	0x7,
-	0xe0,
-	0x60,
-	0x7,
-	0x3,
-	0x60,
-	0x0,
-	0x0,
-	0x7,
-	0xc0,
-	0x71,
-	0x8e,
-	0x3,
-	0x60,
-	0x0,
-	0x0,
-	0x7,
-	0x80,
-	0x1f,
-	0xfc,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define friend_height 14
-#define friend_width 64
-static uint8_t friend_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xcc,
-	0x1f,
-	0x0,
-	0x0,
-	0xf0,
-	0xef,
-	0x0,
-	0x0,
-	0xee,
-	0x3f,
-	0x0,
-	0x0,
-	0xf0,
-	0xcf,
-	0x0,
-	0x0,
-	0xe7,
-	0x1f,
-	0x0,
-	0x0,
-	0xf0,
-	0xcf,
-	0x1,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0x0,
-	0xe0,
-	0x8f,
-	0x1,
-	0x0,
-	0xc7,
-	0xf,
-	0x0,
-	0x0,
-	0xe0,
-	0x87,
-	0x1,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x0,
-	0xc0,
-	0x83,
-	0x1,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0x0,
-	0xc0,
-	0x83,
-	0x1,
-	0x0,
-	0x7,
-	0x3,
-	0x0,
-	0x0,
-	0x80,
-	0xc1,
-	0x1,
-	0x0,
-	0xe,
-	0x70,
-	0xc0,
-	0x7,
-	0x1c,
-	0xc0,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0xff,
-	0xfc,
-	0xf,
-	0xe0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define grateful_height 14
-#define grateful_width 64
-static uint8_t grateful_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xc,
-	0x7,
-	0x0,
-	0x0,
-	0x80,
-	0xe3,
-	0x0,
-	0x0,
-	0x8e,
-	0x7,
-	0x0,
-	0x0,
-	0xc0,
-	0xc3,
-	0x0,
-	0x0,
-	0x87,
-	0xd,
-	0x0,
-	0x0,
-	0xe0,
-	0xc7,
-	0x1,
-	0x0,
-	0xc7,
-	0x1d,
-	0x0,
-	0x0,
-	0x60,
-	0x86,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x1,
-	0x0,
-	0xe,
-	0x70,
-	0xc0,
-	0x7,
-	0x1c,
-	0xc0,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0xff,
-	0xfc,
-	0xf,
-	0xe0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define happy_height 14
-#define happy_width 64
-static uint8_t happy_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x0,
-	0x0,
-	0x87,
-	0x7,
-	0x0,
-	0x0,
-	0xc0,
-	0xc3,
-	0x1,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x0,
-	0xe0,
-	0x87,
-	0x1,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x0,
-	0xe0,
-	0x87,
-	0x1,
-	0x0,
-	0x87,
-	0x7,
-	0x0,
-	0x0,
-	0xc0,
-	0x83,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x1,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x1,
-	0x0,
-	0xe,
-	0x70,
-	0xc0,
-	0x7,
-	0x1c,
-	0xc0,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0xff,
-	0xfc,
-	0xf,
-	0xe0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define intense_height 14
-#define intense_width 64
-static uint8_t intense_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x9c,
-	0xf,
-	0x0,
-	0x0,
-	0x80,
-	0xc7,
-	0x0,
-	0x0,
-	0x8c,
-	0xd,
-	0x0,
-	0x0,
-	0xc0,
-	0xcf,
-	0x1,
-	0x0,
-	0xce,
-	0xd,
-	0x0,
-	0x0,
-	0xc0,
-	0x8f,
-	0x3,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x0,
-	0x80,
-	0x87,
-	0x3,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x7,
-	0xf0,
-	0xff,
-	0xff,
-	0x7f,
-	0x0,
-	0x3,
-	0x0,
-	0x7,
-	0xf0,
-	0xff,
-	0xff,
-	0x7f,
-	0x80,
-	0x3,
-	0x0,
-	0xe,
-	0xf0,
-	0xff,
-	0xff,
-	0x7f,
-	0x80,
-	0x3,
-	0x0,
-	0xc,
-	0xf0,
-	0xff,
-	0xff,
-	0x7f,
-	0xc0,
-	0x1,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0xff,
-	0x7f,
-	0xc0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define lonely_height 14
-#define lonely_width 64
-static uint8_t lonely_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x30,
-	0x0,
-	0x0,
-	0xc6,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x30,
-	0x0,
-	0x18,
-	0xce,
-	0x0,
-	0x0,
-	0x0,
-	0xe7,
-	0x30,
-	0x0,
-	0x1c,
-	0xce,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x3f,
-	0x0,
-	0xf8,
-	0xe7,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xee,
-	0xff,
-	0xcf,
-	0x31,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define look_l_height 14
-#define look_l_width 64
-static uint8_t look_l_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x3e,
-	0x0,
-	0x7c,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0xc,
-	0x7f,
-	0x0,
-	0xfe,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x8e,
-	0xe3,
-	0x0,
-	0xc7,
-	0x1,
-	0x38,
-	0x0,
-	0x0,
-	0x87,
-	0xfd,
-	0x0,
-	0xbb,
-	0x1,
-	0x38,
-	0x0,
-	0x0,
-	0x87,
-	0xdd,
-	0x0,
-	0xbb,
-	0x1,
-	0x30,
-	0x0,
-	0x0,
-	0x87,
-	0xe1,
-	0x0,
-	0x87,
-	0x1,
-	0x30,
-	0x0,
-	0x0,
-	0x87,
-	0xe3,
-	0x0,
-	0xc7,
-	0x1,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0x7f,
-	0x0,
-	0xfe,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x78,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0xff,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define look_l_happy_height 14
-#define look_l_happy_width 64
-static uint8_t look_l_happy_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x3e,
-	0x0,
-	0x0,
-	0x1f,
-	0x0,
-	0x3,
-	0x0,
-	0x8c,
-	0xfb,
-	0x0,
-	0xc0,
-	0x7d,
-	0x0,
-	0x7,
-	0x0,
-	0x8e,
-	0xf9,
-	0x0,
-	0xc0,
-	0x7c,
-	0x0,
-	0xe,
-	0x0,
-	0xc7,
-	0xf8,
-	0x1,
-	0x60,
-	0xfc,
-	0x0,
-	0xe,
-	0x0,
-	0xc7,
-	0xff,
-	0x1,
-	0xe0,
-	0xff,
-	0x0,
-	0xc,
-	0x0,
-	0xc7,
-	0xff,
-	0x1,
-	0xe0,
-	0xff,
-	0x0,
-	0xc,
-	0x0,
-	0x87,
-	0xff,
-	0x0,
-	0xc0,
-	0x7f,
-	0x0,
-	0xc,
-	0x0,
-	0x87,
-	0xff,
-	0x0,
-	0xc0,
-	0x7f,
-	0x0,
-	0xc,
-	0x0,
-	0x7,
-	0x3e,
-	0x0,
-	0x0,
-	0x1f,
-	0x0,
-	0xe,
-	0x0,
-	0xe,
-	0x0,
-	0xf,
-	0x38,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0xc,
-	0x0,
-	0xfc,
-	0xf,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define look_r_height 14
-#define look_r_width 64
-static uint8_t look_r_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x80,
-	0x1f,
-	0x0,
-	0x3e,
-	0xc,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0x3f,
-	0x0,
-	0x7f,
-	0x1c,
-	0x0,
-	0x0,
-	0xe,
-	0xc0,
-	0x31,
-	0x80,
-	0xe3,
-	0x38,
-	0x0,
-	0x0,
-	0x7,
-	0xe0,
-	0x7c,
-	0x80,
-	0xf1,
-	0x38,
-	0x0,
-	0x0,
-	0x7,
-	0xe0,
-	0x7c,
-	0x80,
-	0xf9,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0xe0,
-	0x70,
-	0x80,
-	0xc3,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0xc0,
-	0x39,
-	0x80,
-	0xe3,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0xc0,
-	0x3f,
-	0x0,
-	0x7f,
-	0x30,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0xf,
-	0x0,
-	0x3c,
-	0x38,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0xc0,
-	0x7f,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define look_r_happy_height 14
-#define look_r_happy_width 64
-static uint8_t look_r_happy_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x1f,
-	0x0,
-	0x80,
-	0xf,
-	0x3,
-	0x0,
-	0xc,
-	0xc0,
-	0x7d,
-	0x0,
-	0xe0,
-	0x3e,
-	0x7,
-	0x0,
-	0xe,
-	0xc0,
-	0x7c,
-	0x0,
-	0x60,
-	0x3e,
-	0xe,
-	0x0,
-	0x7,
-	0x60,
-	0xfc,
-	0x0,
-	0x30,
-	0x7e,
-	0xe,
-	0x0,
-	0x7,
-	0xe0,
-	0xff,
-	0x0,
-	0xf0,
-	0x7f,
-	0xc,
-	0x0,
-	0x7,
-	0xe0,
-	0xff,
-	0x0,
-	0xf0,
-	0x7f,
-	0xc,
-	0x0,
-	0x7,
-	0xc0,
-	0x7f,
-	0x0,
-	0xe0,
-	0x3f,
-	0xc,
-	0x0,
-	0x7,
-	0xc0,
-	0x7f,
-	0x0,
-	0xe0,
-	0x3f,
-	0xc,
-	0x0,
-	0x7,
-	0x0,
-	0x1f,
-	0x0,
-	0x80,
-	0xf,
-	0xe,
-	0x0,
-	0xe,
-	0x0,
-	0x80,
-	0x3,
-	0xe,
-	0x0,
-	0xe,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0xfe,
-	0x7,
-	0x0,
-	0x7,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define motivated_height 14
-#define motivated_width 64
-static uint8_t motivated_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x0,
-	0xe,
-	0x7,
-	0x0,
-	0x0,
-	0x80,
-	0xc1,
-	0x0,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0x0,
-	0xe0,
-	0xc7,
-	0x1,
-	0x0,
-	0xc7,
-	0xd,
-	0x0,
-	0x0,
-	0xe0,
-	0x86,
-	0x1,
-	0x0,
-	0xe7,
-	0x1c,
-	0x0,
-	0x0,
-	0x70,
-	0x8e,
-	0x1,
-	0x0,
-	0xc7,
-	0xd,
-	0x0,
-	0x0,
-	0xe0,
-	0x86,
-	0x1,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0x0,
-	0xe0,
-	0x87,
-	0x1,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0x0,
-	0x80,
-	0xc1,
-	0x1,
-	0x0,
-	0xe,
-	0x70,
-	0xc0,
-	0x7,
-	0x1c,
-	0xc0,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0xff,
-	0xfc,
-	0xf,
-	0xe0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define sad_height 14
-#define sad_width 64
-static uint8_t sad_xbm[] = {
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x7f,
-	0x0,
-	0xc0,
-	0x1,
-	0x0,
-	0x0,
-	0xc,
-	0xc0,
-	0x7f,
-	0x0,
-	0x80,
-	0x3,
-	0x0,
-	0x0,
-	0xe,
-	0xe0,
-	0xff,
-	0x0,
-	0x0,
-	0x3,
-	0x0,
-	0x0,
-	0x7,
-	0xf0,
-	0xff,
-	0x0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0xe7,
-	0xff,
-	0xff,
-	0x7f,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x87,
-	0xff,
-	0xff,
-	0x1e,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x87,
-	0xef,
-	0x7f,
-	0x1e,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x1e,
-	0x0,
-	0x6,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0x1e,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x8e,
-	0xf,
-	0x0,
-	0x1e,
-	0x0,
-	0x3,
-	0x0,
-	0x0,
-	0x8c,
-	0xf,
-	0x0,
-	0x1e,
-	0x80,
-	0x3,
-	0x0,
-	0x0,
-	0x9c,
-	0xf,
-	0x0,
-	0x1e,
-	0xc0,
-	0x1,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define sleep_height 14
-#define sleep_width 64
-static uint8_t sleep_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xc0,
-	0x1,
-	0x7,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x80,
-	0x1,
-	0x7,
-	0xe0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x80,
-	0x3,
-	0xc7,
-	0xff,
-	0x1,
-	0x0,
-	0x0,
-	0xfe,
-	0x8f,
-	0x3,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x3,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x3,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x80,
-	0x1,
-	0xe,
-	0x0,
-	0xf,
-	0xf8,
-	0x80,
-	0x3,
-	0xc0,
-	0x1,
-	0xc,
-	0x0,
-	0xfc,
-	0xcf,
-	0xff,
-	0x0,
-	0xc0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define sleep2_height 14
-#define sleep2_width 64
-static uint8_t sleep2_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0xce,
-	0xff,
-	0x0,
-	0x0,
-	0x0,
-	0xff,
-	0x73,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x0,
-	0x0,
-	0x78,
-	0x60,
-	0x0,
-	0x7,
-	0x1e,
-	0x0,
-	0x0,
-	0x0,
-	0x78,
-	0xe0,
-	0x0,
-	0xc7,
-	0xff,
-	0x0,
-	0x0,
-	0x0,
-	0xff,
-	0xe3,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0xe0,
-	0x0,
-	0x7,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x60,
-	0x0,
-	0xe,
-	0x80,
-	0x7,
-	0x7c,
-	0xc0,
-	0x1,
-	0x70,
-	0x0,
-	0xc,
-	0x0,
-	0xfe,
-	0xe7,
-	0x7f,
-	0x0,
-	0x30,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x18,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define smart_height 14
-#define smart_width 64
-static uint8_t smart_xbm[] = {
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x0,
-	0x0,
-	0x1c,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x70,
-	0x0,
-	0xc,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0xe0,
-	0x0,
-	0xe,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0xc0,
-	0x0,
-	0xc7,
-	0xff,
-	0x1,
-	0x0,
-	0x0,
-	0xfe,
-	0xc7,
-	0x1,
-	0xc7,
-	0xf7,
-	0x1,
-	0x0,
-	0x0,
-	0xbe,
-	0x87,
-	0x1,
-	0xc7,
-	0xff,
-	0x1,
-	0x0,
-	0x0,
-	0xfe,
-	0x87,
-	0x1,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x80,
-	0x1,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0x80,
-	0x1,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0xf0,
-	0xc0,
-	0x1,
-	0xe,
-	0x0,
-	0x7,
-	0x7c,
-	0xc0,
-	0x1,
-	0xc0,
-	0x0,
-	0xc,
-	0x0,
-	0xfc,
-	0xcf,
-	0xff,
-	0x0,
-	0xe0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define upload_height 14
-#define upload_width 64
-static uint8_t upload_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x8c,
-	0x7,
-	0x0,
-	0xf0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xce,
-	0x7,
-	0x0,
-	0x98,
-	0x31,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xdc,
-	0x73,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xfc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xbc,
-	0x63,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xd8,
-	0x61,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0xf8,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define upload1_height 14
-#define upload1_width 64
-static uint8_t upload1_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x8c,
-	0x7,
-	0x0,
-	0xf0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xce,
-	0x7,
-	0x0,
-	0xf8,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xe0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x7,
-	0x7,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1f,
-	0x0,
-	0xf8,
-	0x71,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
-#define upload2_height 14
-#define upload2_width 64
-static uint8_t upload2_xbm[] = {
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x8c,
-	0xf,
-	0x0,
-	0xf0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0xce,
-	0x1d,
-	0x0,
-	0xf8,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1c,
-	0x0,
-	0xe0,
-	0x70,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1e,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1b,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1d,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0xc7,
-	0x1d,
-	0x0,
-	0xe0,
-	0x60,
-	0x0,
-	0x0,
-	0x0,
-	0x87,
-	0xf,
-	0x0,
-	0xf8,
-	0x71,
-	0x0,
-	0x0,
-	0x0,
-	0xe,
-	0x0,
-	0x0,
-	0x0,
-	0x30,
-	0x0,
-	0x0,
-	0x0,
-	0xc,
-	0x0,
-	0x0,
-	0x0,
-	0x38,
-	0x0,
-	0x0,
-	0x0,
-	0x1c,
-	0xf0,
-	0xff,
-	0x7,
-	0x1c,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-	0x0,
-};
\ No newline at end of file
diff --git a/flipagotchi/src/pwnagotchi.c b/flipagotchi/src/pwnagotchi.c
index b4e2f9772de..018087da769 100644
--- a/flipagotchi/src/pwnagotchi.c
+++ b/flipagotchi/src/pwnagotchi.c
@@ -1,6 +1,7 @@
 #include "../include/pwnagotchi.h"
 
 #include "../include/faces_xbm.h"
+#include "flipagotchi_icons.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -26,151 +27,101 @@ Pwnagotchi* pwnagotchi_alloc() {
 }
 
 void pwnagotchi_draw_face(Pwnagotchi* pwn, Canvas* canvas) {
-    int width = 0;
-    int height = 0;
-    uint8_t* xbm;
+    const Icon* currentFace;
+    bool draw = true;
+
     switch (pwn->face) {
         case NoFace:
-            width = noface_width;
-            height = noface_height;
-            xbm = noface_xbm;
+            // Draw nothing
+            draw = false;
             break;
         case DefaultFace:
-            width = awake_width;
-            height = awake_height;
-            xbm = awake_xbm;
+            currentFace = &I_awake_flipagotchi;
             break;
         case Look_r:
-            width = look_r_width;
-            height = look_r_height;
-            xbm = look_r_xbm;
+            currentFace = &I_look_r_flipagotchi;
             break;
         case Look_l:
-            width = look_l_width;
-            height = look_l_height;
-            xbm = look_l_xbm;
+            currentFace = &I_look_l_flipagotchi;
             break;
         case Look_r_happy:
-            width = look_r_happy_width;
-            height = look_r_happy_height;
-            xbm = look_r_happy_xbm;
+            currentFace = &I_look_r_happy_flipagotchi;
             break;
         case Look_l_happy:
-            width = look_l_happy_width;
-            height = look_l_happy_height;
-            xbm = look_l_happy_xbm;
+            currentFace = &I_look_l_happy_flipagotchi;
             break;
         case Sleep:
-            width = sleep_width;
-            height = sleep_height;
-            xbm = sleep_xbm;
+            currentFace = &I_sleep_flipagotchi;
             break;
         case Sleep2:
-            width = sleep2_width;
-            height = sleep2_height;
-            xbm = sleep2_xbm;
+            currentFace = &I_sleep2_flipagotchi;
             break;
         case Awake:
-            width = awake_width;
-            height = awake_height;
-            xbm = awake_xbm;
+            currentFace = &I_awake_flipagotchi;
             break;
         case Bored:
-            width = bored_width;
-            height = bored_height;
-            xbm = bored_xbm;
+            currentFace = &I_bored_flipagotchi;
             break;
         case Intense:
-            width = intense_width;
-            height = intense_height;
-            xbm = intense_xbm;
+            currentFace = &I_intense_flipagotchi;
             break;
         case Cool:
-            width = cool_width;
-            height = cool_height;
-            xbm = cool_xbm;
+            currentFace = &I_cool_flipagotchi;
             break;
         case Happy:
-            width = happy_width;
-            height = happy_height;
-            xbm = happy_xbm;
+            currentFace = &I_happy_flipagotchi;
             break;
         case Grateful:
-            width = grateful_width;
-            height = grateful_height;
-            xbm = grateful_xbm;
+            currentFace = &I_grateful_flipagotchi;
             break;
         case Excited:
-            width = excited_width;
-            height = excited_height;
-            xbm = excited_xbm;
+            currentFace = &I_excited_flipagotchi;
             break;
         case Motivated:
-            width = motivated_width;
-            height = motivated_height;
-            xbm = motivated_xbm;
+            currentFace = &I_motivated_flipagotchi;
             break;
         case Demotivated:
-            width = demotivated_width;
-            height = demotivated_height;
-            xbm = demotivated_xbm;
+            currentFace = &I_demotivated_flipagotchi;
             break;
         case Smart:
-            width = smart_width;
-            height = smart_height;
-            xbm = smart_xbm;
+            currentFace = &I_smart_flipagotchi;
             break;
         case Lonely:
-            width = lonely_width;
-            height = lonely_height;
-            xbm = lonely_xbm;
+            currentFace = &I_lonely_flipagotchi;
             break;
         case Sad:
-            width = sad_width;
-            height = sad_height;
-            xbm = sad_xbm;
+            currentFace = &I_sad_flipagotchi;
             break;
         case Angry:
-            width = angry_width;
-            height = angry_height;
-            xbm = angry_xbm;
+            currentFace = &I_angry_flipagotchi;
             break;
         case Friend:
-            width = friend_width;
-            height = friend_height;
-            xbm = friend_xbm;
+            currentFace = &I_friend_flipagotchi;
             break;
         case Broken:
-            width = broken_width;
-            height = broken_height;
-            xbm = broken_xbm;
+            currentFace = &I_broken_flipagotchi;
             break;
         case Debug:
-            width = debug_width;
-            height = debug_height;
-            xbm = debug_xbm;
+            currentFace = &I_debug_flipagotchi;
             break;
         case Upload:
-            width = upload_width;
-            height = upload_height;
-            xbm = upload_xbm;
+            currentFace = &I_upload_flipagotchi;
             break;
         case Upload1:
-            width = upload1_width;
-            height = upload1_height;
-            xbm = upload1_xbm;
+            currentFace = &I_upload1_flipagotchi;
             break;
         case Upload2:
-            width = upload2_width;
-            height = upload2_height;
-            xbm = upload2_xbm;
+            currentFace = &I_upload2_flipagotchi;
             break;
         default:
-            xbm = NULL;
+            draw = false;
+
+    }
 
+    if (draw) {
+        canvas_draw_icon(canvas, PWNAGOTCHI_FACE_J, PWNAGOTCHI_FACE_I, currentFace);
     }
 
-    canvas_draw_xbm(canvas, PWNAGOTCHI_FACE_J, PWNAGOTCHI_FACE_I, width, height, xbm);
 }
 
 void pwnagotchi_draw_name(Pwnagotchi* pwn, Canvas* canvas) {