From 22ca8886c25115df575f8a3e67a5da9059fc3f28 Mon Sep 17 00:00:00 2001
From: Daniel Thompson <daniel@redfelineninja.org.uk>
Date: Fri, 10 Apr 2020 20:22:51 +0100
Subject: [PATCH] wasp: draw565: Automatic RLE format conversion

From here we can also bring colour to the launcher!
---
 res/clock_icon.png    | Bin 965 -> 5599 bytes
 res/settings_icon.png | Bin 1082 -> 7628 bytes
 res/torch_icon.png    | Bin 820 -> 5170 bytes
 wasp/apps/launcher.py |   2 +-
 wasp/apps/testapp.py  |  65 +++--------------------
 wasp/draw565.py       |  19 ++++++-
 wasp/icons.py         | 120 +++++++++++++++++++++++++++++++++++++++---
 7 files changed, 139 insertions(+), 67 deletions(-)

diff --git a/res/clock_icon.png b/res/clock_icon.png
index 165bf5166a0616fe2ba319a058a8f3b3e58c9eae..b08bbfbb676c2ee7d8f683a165a3f9af8c79d3a3 100644
GIT binary patch
delta 5535
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

delta 842
zcmV-Q1GW6$E5!$pBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkvmAkKpe)uKBPq|4(%Y~
zkfAzR@P#;P6^c+H)C#RSm|XgTCJjl7i=*ILaPYBMb#QUk)xlK|1Ro$yj!ud$QsV!T
zLW>yhIPS-H|L^1Oe}KPPWvUq*160j2GO47H%dZNdR|IK>5r4(F#7uoo6w~k=U-$6w
z{Vu_?yzBlPeM-S(fKMQvWx8PzZxBy!S~}-_;utGS3h_Dds6iJbe&o9B@*C%p!+xF_
zGqRa^;ux_|>SDQzS=msDr-<W<s!_f_=d!|ii?dp-v-Umt3nK+>Wtr==hLFM{mLNia
zj5;c)!a{;}jeisq89GmT_y--oNG_RN6)<uvpavC^;|KqP-@P@9lM`-IBnkAq*!IUT
z5ZVP=4cq=cw(Zsl5O@Zzw2r^l1ZF--Z*;Wy5zxO4TwHfFc@MbU0S2CQ$&ef=K+9h&
z0`F(^O?e=C3-qqJeQTfN^a03HuhKWb!67hGqU?2#cO!?p`}S{5yMI4Bp>mPM1H(H2
z000JJOGiWi000000Qp0^f0MlvAP58q8W#o*><5$O6DTpANkl<Zc-rln(T>C*2u0QS
z|G&(>HeFk>BGT!($vjPh;1LvUPAN%3+f<kW00001lRgv{f1tIhcYlhsAIoyi!vk5`
zvR2Et5x=ft)7Z+X@gzB8aMadL5E|d^{L;pDXRGWE@M$n!zFGPuBLD1FEj0^AS}Wja
zS46gzq~o|2D_aY(S%P{-G?R25RGZ2k05rah_&+md@m^igHsY(Xt$n((7w#B3x^EnR
zD{K0yJ?hhae?WxHq!If<C)`V4?;~iW(ptRI`^teRlRvVLSf09SgjJApeiXb_jb7P{
z^x|4tf+F1W?DSc4$5g!nn!WIP+d|RCTi+byn>O6gjo2@pf<`kvTp!?>Db~m1)@i2~
z&*vJkr+`OqJhkK0h$(AvzV`HM#*eaVf?JJ`SNS>LH~pXen7K+HjiFlA#@VO4-KV4{
znb-rTi8sU^uw(MIW3Kkir4ftzMMQ)qQT-%|)`<5200001lRgw09033T2mrsSKb&#m
UYi-Q=nE(I)07*qoM6N<$g6kfVG5`Po

diff --git a/res/settings_icon.png b/res/settings_icon.png
index d1141b03052397335cfa703f4dbf7826c2dbc88b..c8e80197b6e420bbcccfdae9c6dc23fb5f4e10df 100644
GIT binary patch
delta 7580
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

delta 999
zcmV<D0~q|wJGuyvBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrj?3B9qb_D
zkfAzR5EXIMDionYs1;guFuC*(nlvOWE{=k0!NH%!s)LKOt`4q(Aov5~<mja6A|-y8
z6k5c1$8itueecWNcYx3+Gu;l21G-VQQi-^f$*xM_SA=Ma=zoK#Fx#Ay<s^K^*F6G!
zzl-rK|GGa%ua>hJ5RiyxnQ2vtH;AV<t0w1t;s`4$8u2;tm_-*Pe&o99@f+uY%L31g
zSn1R}afDbZbg<gNtZ3=PQ^ZkCHz;4oc&u^W;;ffztaVTRLNRBoEOVXKFcMhA5@bkF
zQ9}u3R1u@yAb-V1iq7Lc{vp>dlS?I635*;Is6dC}`oaI;cW>?d<b;<b#(}OE$N3lm
z!n;7T?l|Aaj?+8=g3rK}(e_swz|1G<^|ls00{XXsi|e+g?g5uOz~GaqSc)qJX$ko}
z@P0<$lm!NEfu1$5Z>@8jJ^*RzRq_TnI0Qxul)dir?h)?JzWrO%>faCD3UX_y26mv6
z5E~!}1q&__?!9CAlQ<hFe<VpnK~#9!?OegG!ypVJsQ>@Vyu(u^gi0G2B~I#`HjT33
zfE`m-Nhy_N5T%%WZ8t>3<a={sm<AK@#RQ<ykL7O?D-B@$$MNM^k08pguK;hr?@mM}
z__kxn1mAWnM}%eUc@ohF(1@`N4MPncsV+wW->dMGf=EGgv%jUAfAh0aiYqEQPyt@a
z>2LKLih{2AyPnk}{9d=e>z4_b6jtpF_8{094SW%~1-SQ_=DMD4Py;T&JztNCYTfqg
zS`i@y%_e2%wVzDDj+u#O)((UjJ_E{%(h^~XKxjanggegHRyCUIQRoS-44naA+qM;G
zQqW?$soQzklE^y%f73YD6<j}B=Z`vU7YWb|s5kJZ8LOGmGksVlB3skR8x_ke^;jgq
zR0E!XS^-GU4WoDi-jHD#$^<aJ>I0q(*ovLYUeyzJ1<aO`qkh1;(t@TS%OuS7@pLmM
zqz0UW9!=KBZAMMs*4q^>_JUe1(5wV6M^iEiz)#?=aKeb&f6)*tKnu)WqO|)&Xa~3s
zB=C1vEC@+}GGaTxK+^_zC;W?P@^D%j?ri84&yR>_3;OxKK4-)P{7_=Hfc|R0NI@x0
z9YwV4H>3viHsfX-Yu)~?UsBK}V31w0tAEI}M#}RRgqt!ndbmq~2Vo6ML7sso1u+2(
zGYX3I=o&XGJs=WKzd4rd^@m3h{B2K7<U{+66TkrS0jR4X%)u;=+Q5f*vkYZe#2@q>
VNxYH-kLv&c002ovPDHLkV1k7V+z$W%

diff --git a/res/torch_icon.png b/res/torch_icon.png
index bbd4db3bb8ecc7e891ef7187deeb57f27239a10f..aa5f5147cffd13e7b221dc4c5e03ee380c153a89 100644
GIT binary patch
delta 5101
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
P00000NkvXXu0mjfLwUc2

delta 721
zcmV;?0xtcsD6|HUBa_h(6Mra?eUUv#!$25@-=>v{L>=rP;*g;_Sr8R*)G8FALZ}s5
zbuhW~51KS2EiR6NYr(;v#j1mgv#t)Vf*|+<;^gS0=prS4mlRsWc*k)M?|tvf-FJY{
zC^Ov-jRU$-wNi<=l*z72;a7xcis*x=Fx#Ay<s^K^*F6G!zl-rK|9`qaN3WK%84!?&
zXPIeLi8qL+H>)P+ec}i!DjM-Q@t8#yB!1+&>hT-rg3AKWj9BT^JaL3rDs-^g!K`TM
z#8bpkO*bfC$at)A-r}s6Ypiuo{z5TltSob#)-V!S#1dpkP*Fn(WmFNP-5|wAiq7Lc
z{vp>dlS?I635*;IsDD6*;`+h=;CFBB{N#j}B*uZR7svS+0m8dLv+g+G$BxrH0fNuK
zmC^QB8o<ma>Gif2Jp%f-fs5<5rtSfkJHX(RsaT3D1!)QSJn()--;@OgZh@XPuWzk$
zoIU_)>Q(XvI5-4G3zWU?^X~4>zWrO%>faCD3UX_y26mtT0F!eP9tZ^p2MQwCi>H&B
z5-5KjNkl<Zc-rlmNe;vy3<M#{|G&%}Mv6uZn*f7xst&niGfiW&I0pa#0000000000
zlkn$;9zuv4<2?c;bP?6)K2(~2A<DwpchJ-Rq({DYC5G5B>QoKV;-HrA=o(^CxZM^g
zH@oaUy+bV7s$6oZwk?Fv{q9T$3FX4U??-=cjaX*LLDK4s6z`;i_LTX>#iB9$3jO^u
zvLF!avujol&%J8PjQ#Tw33YNAcZ)_nNqT(_YN_$Rfh}IIRc4~nLu{{uj0~}kHN>_x
z(XOeZP+&&Nyj-{4s-hX02Wi<4(z)8mRk2s>5H%*g<TK+*)1RVI*$(9g>>Fz1jv_UC
z(pCg=ZKoR3HR4>%oInMo-h1o=000000000006O>pr&EX!w^sVL00000NkvXXu0mjf
D=bl;@

diff --git a/wasp/apps/launcher.py b/wasp/apps/launcher.py
index 274ea9c..4e76ab1 100644
--- a/wasp/apps/launcher.py
+++ b/wasp/apps/launcher.py
@@ -66,7 +66,7 @@ class LauncherApp():
             if not app:
                 return
             draw.set_color(0xffff)
-            draw.rleblit(app.ICON, (x+13, y+12))
+            draw.blit(app.ICON, x+13, y+12)
             draw.set_color(0xbdb6)
             draw.string(app.NAME, x, y+120-30, 120)
 
diff --git a/wasp/apps/testapp.py b/wasp/apps/testapp.py
index eece822..789454f 100644
--- a/wasp/apps/testapp.py
+++ b/wasp/apps/testapp.py
@@ -11,42 +11,8 @@ class TestApp():
     NAME = 'Self Test'
     ICON = icons.app
 
-    # 2-bit RLE, generated from res/app_icon.png, 457 bytes
-    RLE_2BIT = (
-        96, 64,
-        b'\x1e@md<d<d;f?X\xec2\xf0/'
-        b'\xf2-\xf4,\xc3.\xc3,\xc3.\xc3,\xc3.\xc3,'
-        b'\xc3.\xc3,\xc3.\xc3,\xc3\x0c\x80\xfc\x83\x10\xc0]'
-        b'\xc3\x0c@\xffC,C\n\x87\x0c\xc7\nC,C\t'
-        b'\x83\x02\x84\n\xc4\x02\xc3\tC,C\x08\x82\x07\x82\x08'
-        b'\xc2\x07\xc2\x08C,C\x07\x82\t\x82\x06\xc2\t\xc2\x07'
-        b'C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x06'
-        b'\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x05\x82\x0c\x82\x04'
-        b'\xc2\x0c\xc2\x05C,C\x05\x82\x0c\x82\x04\xc2\x0c\xc2\x05'
-        b'C,C\x05\x83\x0b\x82\x04\xc2\x0b\xc3\x05C,C\x06'
-        b'\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x06\x82\x0b\x82\x04'
-        b'\xc2\x0b\xc1\x07C,C\x07\x82\n\x82\x04\xc2\n\xc2\x07'
-        b'C+D\x08\x82\t\x82\x04\xc2\t\xc2\x08C*E\t'
-        b'\x8c\x04\xcc\tC*E\n\x8b\x04\xcb\nC*E.'
-        b'C*E.C*E.C*E.C*E\n'
-        b'\x80\xe9\x8b\x04\xc0o\xcb\nC+D\t\x8c\x04\xcc\t'
-        b'C,C\x08\x82\t\x82\x04\xc2\t\xc2\x08C,C\x07'
-        b'\x82\n\x82\x04\xc2\n\xc2\x07C,C\x06\x82\x0b\x82\x04'
-        b'\xc2\x0b\xc1\x07C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06'
-        b'C,C\x05\x83\x0b\x82\x04\xc2\x0b\xc3\x05C,C\x05'
-        b'\x82\x0c\x82\x04\xc2\x0c\xc2\x05C,C\x05\x82\x0c\x82\x04'
-        b'\xc2\x0c\xc2\x05C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06'
-        b'C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x07'
-        b'\x82\t\x82\x06\xc2\t\xc2\x07C,C\x08\x82\x07\x82\x08'
-        b'\xc2\x07\xc2\x08C,C\t\x83\x02\x84\n\xc4\x02\xc3\t'
-        b'C,C\n\x86\x0e\xc6\nC,C\x0c\x83\x10\xc3\x0c'
-        b'C,C.C,C.C,C.C,C.'
-        b'C,C.C,t-r/p2l?X@'
-        b'mf;d<d<d\x1e'
-    )
-
     def __init__(self):
-        self.tests = ('Touch', 'String', 'Button', 'Crash', '1-bit RLE', '2-bit RLE')
+        self.tests = ('Touch', 'String', 'Button', 'Crash', 'RLE')
         self.test = self.tests[0]
         self.scroll = wasp.widgets.ScrollIndicator()
 
@@ -90,32 +56,17 @@ class TestApp():
                     event[1], event[2]), 0, 108, width=240)
         elif self.test == 'String':
             self.benchmark_string()
-        elif self.test == '1-bit RLE':
-            self.benchmark_rle_1bit()
-        elif self.test == '2-bit RLE':
-            self.benchmark_rle_2bit()
+        elif self.test == 'RLE':
+            self.benchmark_rle()
 
-    def benchmark_rle_1bit(self):
+    def benchmark_rle(self):
         draw = wasp.watch.drawable
         draw.fill(0, 0, 30, 240, 240-30)
         self.scroll.draw()
         t = machine.Timer(id=1, period=8000000)
         t.start()
         for i in range(0, 128, 16):
-            draw.rleblit(self.ICON, (i, 30 + i))
-        elapsed = t.time()
-        t.stop()
-        del t
-        draw.string('{}s'.format(elapsed / 1000000), 12, 24+192)
-
-    def benchmark_rle_2bit(self):
-        draw = wasp.watch.drawable
-        draw.fill(0, 0, 30, 240, 240-30)
-        self.scroll.draw()
-        t = machine.Timer(id=1, period=8000000)
-        t.start()
-        for i in range(0, 128, 16):
-            draw.rle2bit(self.RLE_2BIT, i, 30 + i)
+            draw.blit(self.ICON, i+16, i+32)
         elapsed = t.time()
         t.stop()
         del t
@@ -149,9 +100,7 @@ class TestApp():
         if self.test == 'Crash':
             draw.string("Press button to", 12, 24+24)
             draw.string("throw exception.", 12, 24+48)
-        elif self.test == '1-bit RLE':
-            draw.rleblit(self.ICON, (120-48, 120-32))
-        elif self.test == '2-bit RLE':
-            draw.rle2bit(self.RLE_2BIT, 120-48, 120-32)
+        elif self.test == 'RLE':
+            draw.blit(self.ICON, 120-48, 120-32)
 
         wasp.watch.display.mute(False)
diff --git a/wasp/draw565.py b/wasp/draw565.py
index 9cc4adc..028b920 100644
--- a/wasp/draw565.py
+++ b/wasp/draw565.py
@@ -105,6 +105,15 @@ class Draw565(object):
             bg = self._bgfg >> 16
         self._display.fill(bg, x, y, w, h)
 
+    @micropython.native
+    def blit(self, image, x, y):
+        if len(image) == 3:
+            # Legacy 1-bit image
+            self.rleblit(image, (x, y))
+        else: #elif image[0] == 2:
+            # 2-bit RLE image, (255x255, v1)
+            self._rle2bit(image, x, y)
+
     @micropython.native
     def rleblit(self, image, pos=(0, 0), fg=0xffff, bg=0):
         """Decode and draw a 1-bit RLE image."""
@@ -135,14 +144,20 @@ class Draw565(object):
                 color = bg
 
     @micropython.native
-    def rle2bit(self, image, x, y):
+    def _rle2bit(self, image, x, y):
         """Decode and draw a 2-bit RLE image."""
         display = self._display
         quick_write = display.quick_write
-        (sx, sy, rle) = image
+        sx = image[1]
+        sy = image[2]
+        rle = memoryview(image)[3:]
 
         display.set_window(x, y, sx, sy)
 
+        if sx <= (len(display.linebuffer) / 2) and not bool(sy & 1):
+            sx *= 2
+            sy /= 2
+
         palette = array.array('H', (0, 0xfffe, 0x7bef, 0xffff))
         next_color = 1
         rl = 0
diff --git a/wasp/icons.py b/wasp/icons.py
index 76b5ee7..02c1b91 100644
--- a/wasp/icons.py
+++ b/wasp/icons.py
@@ -4,17 +4,125 @@
 # 1-bit RLE, generated from res/battery.png, 189 bytes
 battery = (36, 48, b'\x97\x0e\x14\x12\x11\x14\x10\x14\x0c\x08\x0c\x08\x08\x08\x0c\x08\x08\x08\x0c\x08\x08\x08\x0c\x08\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x0c\x04\x04\x04\x08\x04\x0b\x05\x04\x04\x08\x04\n\x06\x04\x04\x08\x04\t\x07\x04\x04\x08\x04\x08\x07\x05\x04\x08\x04\x07\x07\x06\x04\x08\x04\x06\x07\x07\x04\x08\x04\x05\x07\x08\x04\x08\x04\x04\x0e\x02\x04\x08\x04\x03\x0f\x02\x04\x08\x04\x02\x10\x02\x04\x08\x04\x02\x10\x02\x04\x08\x04\x02\x0f\x03\x04\x08\x04\x02\x0e\x04\x04\x08\x04\x08\x07\x05\x04\x08\x04\x07\x07\x06\x04\x08\x04\x06\x07\x07\x04\x08\x04\x05\x07\x08\x04\x08\x04\x04\x07\t\x04\x08\x04\x04\x06\n\x04\x08\x04\x04\x05\x0b\x04\x08\x04\x04\x04\x0c\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x04\x14\x04\x08\x1c\x08\x1c\x08\x1c\x08\x1c\x98')
 
-# 1-bit RLE, generated from res/app_icon.png, 441 bytes
-app = (96, 64, b'\x1e$<$<$;&\x97,20/2-4,\x03.\x03,\x03.\x03,\x03.\x03,\x03.\x03,\x03.\x03,\x03\x0c\x03\x10\x03\x0c\x03,\x03\n\x07\x0c\x07\n\x03,\x03\t\x03\x02\x04\n\x04\x02\x03\t\x03,\x03\x08\x02\x07\x02\x08\x02\x07\x02\x08\x03,\x03\x07\x02\t\x02\x06\x02\t\x02\x07\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x05\x02\x0c\x02\x04\x02\x0c\x02\x05\x03,\x03\x05\x02\x0c\x02\x04\x02\x0c\x02\x05\x03,\x03\x05\x03\x0b\x02\x04\x02\x0b\x03\x05\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x01\x07\x03,\x03\x07\x02\n\x02\x04\x02\n\x02\x07\x03+\x04\x08\x02\t\x02\x04\x02\t\x02\x08\x03*\x05\t\x0c\x04\x0c\t\x03*\x05\n\x0b\x04\x0b\n\x03*\x05.\x03*\x05.\x03*\x05.\x03*\x05.\x03*\x05\n\x0b\x04\x0b\n\x03+\x04\t\x0c\x04\x0c\t\x03,\x03\x08\x02\t\x02\x04\x02\t\x02\x08\x03,\x03\x07\x02\n\x02\x04\x02\n\x02\x07\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x01\x07\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x05\x03\x0b\x02\x04\x02\x0b\x03\x05\x03,\x03\x05\x02\x0c\x02\x04\x02\x0c\x02\x05\x03,\x03\x05\x02\x0c\x02\x04\x02\x0c\x02\x05\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x06\x02\x0b\x02\x04\x02\x0b\x02\x06\x03,\x03\x07\x02\t\x02\x06\x02\t\x02\x07\x03,\x03\x08\x02\x07\x02\x08\x02\x07\x02\x08\x03,\x03\t\x03\x02\x04\n\x04\x02\x03\t\x03,\x03\n\x06\x0e\x06\n\x03,\x03\x0c\x03\x10\x03\x0c\x03,\x03.\x03,\x03.\x03,\x03.\x03,\x03.\x03,\x03.\x03,4-2/02,\x97&;$<$<$\x1e')
+# 2-bit RLE, generated from res/app_icon.png, 460 bytes
+app = (
+    b'\x02'
+    b'`@'
+    b'\x1e@md<d<d;f?X\xec2\xf0/'
+    b'\xf2-\xf4,\xc3.\xc3,\xc3.\xc3,\xc3.\xc3,'
+    b'\xc3.\xc3,\xc3.\xc3,\xc3\x0c\x80\xfc\x83\x10\xc0]'
+    b'\xc3\x0c@\xffC,C\n\x87\x0c\xc7\nC,C\t'
+    b'\x83\x02\x84\n\xc4\x02\xc3\tC,C\x08\x82\x07\x82\x08'
+    b'\xc2\x07\xc2\x08C,C\x07\x82\t\x82\x06\xc2\t\xc2\x07'
+    b'C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x06'
+    b'\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x05\x82\x0c\x82\x04'
+    b'\xc2\x0c\xc2\x05C,C\x05\x82\x0c\x82\x04\xc2\x0c\xc2\x05'
+    b'C,C\x05\x83\x0b\x82\x04\xc2\x0b\xc3\x05C,C\x06'
+    b'\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x06\x82\x0b\x82\x04'
+    b'\xc2\x0b\xc1\x07C,C\x07\x82\n\x82\x04\xc2\n\xc2\x07'
+    b'C+D\x08\x82\t\x82\x04\xc2\t\xc2\x08C*E\t'
+    b'\x8c\x04\xcc\tC*E\n\x8b\x04\xcb\nC*E.'
+    b'C*E.C*E.C*E.C*E\n'
+    b'\x80\xe9\x8b\x04\xc0o\xcb\nC+D\t\x8c\x04\xcc\t'
+    b'C,C\x08\x82\t\x82\x04\xc2\t\xc2\x08C,C\x07'
+    b'\x82\n\x82\x04\xc2\n\xc2\x07C,C\x06\x82\x0b\x82\x04'
+    b'\xc2\x0b\xc1\x07C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06'
+    b'C,C\x05\x83\x0b\x82\x04\xc2\x0b\xc3\x05C,C\x05'
+    b'\x82\x0c\x82\x04\xc2\x0c\xc2\x05C,C\x05\x82\x0c\x82\x04'
+    b'\xc2\x0c\xc2\x05C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06'
+    b'C,C\x06\x82\x0b\x82\x04\xc2\x0b\xc2\x06C,C\x07'
+    b'\x82\t\x82\x06\xc2\t\xc2\x07C,C\x08\x82\x07\x82\x08'
+    b'\xc2\x07\xc2\x08C,C\t\x83\x02\x84\n\xc4\x02\xc3\t'
+    b'C,C\n\x86\x0e\xc6\nC,C\x0c\x83\x10\xc3\x0c'
+    b'C,C.C,C.C,C.C,C.'
+    b'C,C.C,t-r/p2l?X@'
+    b'mf;d<d<d\x1e'
+)
 
-# 1-bit RLE, generated from res/clock_icon.png, 301 bytes
-clock = (96, 64, b'\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xcd\x06\r\x06!\x05\x0b\x08\x0c\x08\x0b\n\x1d\t\x07\x0c\n\x08\n\x0c\x1b\x0b\x06\x0e\x08\x03\x02\x03\n\x04\x05\x04\x1a\x04\x03\x04\x06\x02\x08\x04\r\x03\t\x04\x07\x03\x19\x04\x05\x04\x10\x04\x0c\x03\t\x03\t\x02\x19\x03\x07\x03\x11\x03\x0c\x03\t\x03\t\x03\n\x04\t\x04\x07\x04\x10\x03\x0c\x03\t\x03\t\x03\n\x04\t\x03\t\x03\x10\x03\x0c\x03\t\x03\t\x03\n\x04\t\x03\t\x03\x10\x03\x0c\x03\t\x04\x07\x04\n\x04\t\x03\t\x03\x0f\x04\x0c\x03\n\x04\x05\x05\n\x04\t\x03\x03\x02\x04\x03\x0e\x04\r\x03\n\n\x01\x03\x17\x03\x02\x04\x03\x03\r\x05\r\x03\x0b\t\x01\x03\x17\x03\x02\x03\x04\x03\x0c\x05\x0e\x03\r\x05\x03\x03\x17\x03\t\x03\x0b\x05\x0f\x03\x15\x03\x17\x03\t\x03\n\x05\x10\x03\x14\x04\x17\x03\t\x03\t\x05\x11\x03\x14\x03\x18\x04\x07\x04\x08\x04\x13\x03\x14\x03\x19\x03\x07\x03\x08\x04\x14\x03\x13\x04\x0b\x04\n\x03\x06\x04\x07\x04\x15\x03\x0b\x01\x05\x05\x0c\x04\x0b\x04\x03\x04\x07\x03\x12\r\x06\n\r\x04\x0b\x0b\x06\x0f\x07\r\x06\t\x0e\x04\x0c\t\x07\x0f\x07\r\x07\x06\x10\x04\x0e\x05\t\x0f\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xaa')
+# 2-bit RLE, generated from res/clock_icon.png, 288 bytes
+clock = (
+    b'\x02'
+    b'`@'
+    b'?\xff\xff\xff\xff\xff\xff\x8e@\xb6F\r\xc6!E\x0b'
+    b'\xc8\x0cH\x0b\xca\x1dI\x07\xcc\nH\n\xcc\x1bK\x06'
+    b'\xce\x08C\x02C\n\xc4\x05\xc4\x1aD\x03D\x06\xc2\x08'
+    b'\xc4\rC\t\xc4\x07\xc3\x19D\x05D\x10\xc4\x0cC\t'
+    b'\xc3\t\xc2\x19C\x07C\x11\xc3\x0cC\t\xc3\t\xc3\n'
+    b'D\tD\x07D\x10\xc3\x0cC\t\xc3\t\xc3\nD\t'
+    b'C\tC\x10\xc3\x0cC\t\xc3\t\xc3\nD\tC\t'
+    b'C\x10\xc3\x0cC\t\xc4\x07\xc4\nD\tC\tC\x0f'
+    b'\xc4\x0cC\n\xc4\x05\xc5\nD\tC\tC\x0e\xc4\r'
+    b'C\n\xca\x01\xc3\x17C\tC\r\xc5\rC\x0b\xc9\x01'
+    b'\xc3\x17C\tC\x0c\xc5\x0eC\r\xc5\x03\xc3\x17C\t'
+    b'C\x0b\xc5\x0fC\x15\xc3\x17C\tC\n\xc5\x10C\x14'
+    b'\xc4\x17C\tC\t\xc5\x11C\x14\xc3\x18D\x07D\x08'
+    b'\xc4\x13C\x14\xc3\x19C\x07C\x08\xc4\x14C\x13\xc4\x0b'
+    b'D\nC\x06D\x07\xc4\x15C\x0b\xc1\x05\xc5\x0cD\x0b'
+    b'D\x03D\x07\xc3\x12M\x06\xca\rD\x0bK\x06\xcf\x07'
+    b'M\x06\xc9\x0eD\x0cI\x07\xcf\x07M\x07\xc6\x10D\x0e'
+    b'E\t\xcf?\xff\xff\xff\xff\xff\xff\xff\xffk'
+)
 
-# 1-bit RLE, generated from res/torch_icon.png, 283 bytes
-torch = (96, 64, b'\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00e\x06W\nT\x04\x06\x02S\x03\x07\x02S\x02\n\x01\x0b\x029\x05\x08\x02\t\x02\x08\x03:\x07\x06\x02\x0b\x01\x06\x02$(\n\x02\x03\x03%(\x0c\x01+\x02%\x01\x0b\x02+\x02%\x01\x0c\x01+\x02\x05\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x05\x01\x0b\x02+\x02\x04\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x04\x01\x0c\x01+\x02%\x01\x0b\x02\x03\n\x1e\x02\x05\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x05\x01\x0c\x01+\x02\x04\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x04\x01\x0b\x02+\x02%\x01\x0c\x01+\x02%\x01\x0b\x02+(\x0c\x01,(\n\x02\x03\x03L\x02\x0b\x01\x06\x02K\x02\t\x02\x08\x03H\x02\n\x01\x0b\x02G\x03\x07\x02U\x04\x06\x02V\nY\x06\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xff\x00\xe2')
+# 2-bit RLE, generated from res/settings_icon.png, 472 bytes
+settings = (
+    b'\x02'
+    b'`@'
+    b'\x1e@md<d<d;f?X\xec2\xf0/'
+    b'\xf2-\xf4,\xc3.\xc3,\xc3.\xc3,\xc3.\xc3,'
+    b'\xc3\x14\x80\xb7\x86\x14\xc3,\xc3\x13\x88\x13\xc3,\xc3\x13'
+    b'\x88\x13\xc3,\xc3\x12\x83\x04\x83\x12\xc3,\xc3\n\x84\x04'
+    b'\x83\x04\x83\x04\x84\n\xc3,\xc3\t\x86\x01\x85\x04\x85\x01'
+    b'\x86\t\xc3,\xc3\x08\x8c\x05\x8d\x08\xc3,\xc3\x07\x84\x02'
+    b'\x86\x08\x86\x02\x84\x07\xc3,\xc3\x07\x83\x05\x81\x0e\x81\x05'
+    b'\x83\x07\xc3,\xc3\x07\x83\x1a\x83\x07\xc3,\xc3\x07\x84\x18'
+    b'\x84\x07\xc3,\xc3\x08\x83\n\xc0o\xc4\n\x83\x08@\xff'
+    b'C,C\t\x83\x06\xca\x06\x83\tC,C\x08\x83\x06'
+    b'\xcc\x06\x83\x08C,C\x08\x83\x05\xc4\x06\xc4\x05\x83\x08'
+    b'C+D\x06\x85\x04\xc4\x08\xc4\x04\x85\x06C*E\x04'
+    b'\x86\x05\xc3\n\xc3\x05\x86\x04C*E\x03\x87\x05\xc2\x0c'
+    b'\xc2\x05\x87\x03C*E\x03\x83\x08\xc3\x0c\xc3\x08\x83\x03'
+    b'C*E\x03\x83\x08\xc3\x0c\xc3\x08\x83\x03C*E\x03'
+    b'\x83\x08\xc3\x0c\xc3\x08\x83\x03C*E\x03\x83\x08\xc3\x0c'
+    b'\xc3\x08\x83\x03C*E\x03\x86\x06\xc2\x0c\xc2\x05\x87\x03'
+    b'C+D\x04\x86\x05\xc3\n\xc3\x05\x86\x04C,C\x05'
+    b'\x86\x04\xc4\x08\xc4\x04\x85\x06C,C\x08\x83\x05\xc4\x06'
+    b'\xc4\x05\x83\x08C,C\x08\x83\x06\xcc\x06\x83\x08C,'
+    b'C\t\x83\x06\xca\x06\x83\tC,C\x08\x83\n\xc4\n'
+    b'\x83\x08C,C\x07\x84\x18\x84\x07C,C\x07\x83\x1a'
+    b'\x83\x07C,C\x07\x83\x05\x81\x0e\x81\x05\x83\x07C,'
+    b'C\x07\x84\x03\x85\x08\x86\x02\x84\x07C,C\x08\x8d\x04'
+    b'\x8d\x08C,C\t\x86\x01\x85\x04\x85\x01\x86\tC,'
+    b'C\n\x84\x04\x83\x04\x83\x04\x84\nC,C\x12\x83\x04'
+    b'\x83\x12C,C\x13\x88\x13C,C\x13\x88\x13C,'
+    b'C\x14\x86\x14C,C.C,C.C,C.'
+    b'C,t-r/p2l?X\x80m\xa6;\xa4'
+    b'<\xa4<\xa4\x1e'
+)
+# 2-bit RLE, generated from res/torch_icon.png, 247 bytes
+torch = (
+    b'\x02'
+    b'`@'
+    b'?\xff\xff\xff\xff\xff\xff\xff&\xc6\x0c@\xfdB?\n'
+    b'\xca\tD?\x08\xc4\x06\xc2\x07F?\x07\xc3\x07\xc2\x06'
+    b'H?\x06\xc2\n\xc1\x04G\xc2A8\xc5\x08\xc2\t\xc2'
+    b'\x02F\xc3C7\xc7\x06\xc2\x0b\xc1F\xc2F\x1e\xe8\n'
+    b'\xc2C\xc3H\x1d\xe8\x0c\xc1N\x1d\xc2%\xc1\x0b\xc2N'
+    b'\x1d\xc2%\xc1\x0c\xc1N\x1d\xc2\x04\x80m\x9d\x04\xc1\x0b'
+    b'\xc2N\x1d\xc2\x06\x81\x03\x81\x03\x81\x03\x81\x03\x81\x03\x81'
+    b'\x03\x81\x06\xc1\x0c\xc1N\x1d\xc2\x04\x9d\x04\xc1\x0b\xc2C'
+    b'\xcaA\x1d\xc2\x06\x81\x03\x81\x03\x81\x03\x81\x03\x81\x03\x81'
+    b'\x03\x81\x06\xc1\x0c\xc1N\x1d\xc2\x04\x9d\x04\xc1\x0b\xc2N'
+    b'\x1d\xc2%\xc1\x0c\xc1N\x1d\xc2%\xc1\x0b\xc2N\x1d\xe8'
+    b'\x0c\xc1N\x1e\xe8\n\xc2C\xc3H?\x05\xc2\x0b\xc1F'
+    b'\xc2F?\x06\xc2\t\xc2\x02F\xc3C?\x06\xc2\n\xc1'
+    b'\x04G\xc2A?\x07\xc3\x07\xc2\x06H?\x08\xc4\x06\xc2'
+    b'\x07F?\n\xca\tD?\r\xc6\x0cB?\xff\xff\xff'
+    b'\xff\xff\xff\x95'
+)
 
 # 1-bit RLE, generated from res/up_arrow.png, 16 bytes
 up_arrow = (16, 9, b'\x07\x02\r\x04\x0b\x06\t\x08\x07\n\x05\x0c\x03\x0e\x01 ')
 
 # 1-bit RLE, generated from res/down_arrow.png, 17 bytes
 down_arrow = (16, 9, b'\x00 \x01\x0e\x03\x0c\x05\n\x07\x08\t\x06\x0b\x04\r\x02\x07')
+