diff --git a/assets/experiment1.png b/assets/experiment1.png
new file mode 100644
index 0000000000..4e39c9ddcb
Binary files /dev/null and b/assets/experiment1.png differ
diff --git a/assets/experiment1.toif b/assets/experiment1.toif
deleted file mode 100644
index 961bd23576..0000000000
Binary files a/assets/experiment1.toif and /dev/null differ
diff --git a/assets/experiment2.png b/assets/experiment2.png
new file mode 100644
index 0000000000..045207299e
Binary files /dev/null and b/assets/experiment2.png differ
diff --git a/assets/experiment2.toif b/assets/experiment2.toif
deleted file mode 100644
index c808b1312a..0000000000
Binary files a/assets/experiment2.toif and /dev/null differ
diff --git a/assets/experiment3.png b/assets/experiment3.png
new file mode 100644
index 0000000000..6fabbd4a3c
Binary files /dev/null and b/assets/experiment3.png differ
diff --git a/assets/experiment3.toif b/assets/experiment3.toif
deleted file mode 100644
index 7634ef6cb5..0000000000
Binary files a/assets/experiment3.toif and /dev/null differ
diff --git a/assets/experiment7.png b/assets/experiment7.png
new file mode 100644
index 0000000000..c6bc37adaf
Binary files /dev/null and b/assets/experiment7.png differ
diff --git a/assets/experiment7.toif b/assets/experiment7.toif
deleted file mode 100644
index 7663b7b75c..0000000000
Binary files a/assets/experiment7.toif and /dev/null differ
diff --git a/tools/png2toi b/tools/png2toi
index 8bd6cfe3f2..a160113ad3 100755
--- a/tools/png2toi
+++ b/tools/png2toi
@@ -18,10 +18,10 @@ def process_rgb(w, h, pix):
 def process_grayscale(w, h, pix):
     data = bytes()
     for j in range(h):
-            for i in range(w // 2):
-                l1, l2 = pix[i * 2, j], pix[i * 2 + 1, j]
-                c = (l1 & 0xF0) | (l2 >> 4)
-                data += struct.pack('>B', c)
+        for i in range(w // 2):
+            l1, l2 = pix[i * 2, j], pix[i * 2 + 1, j]
+            c = (l1 & 0xF0) | (l2 >> 4)
+            data += struct.pack('>B', c)
     return data
 
 
@@ -55,9 +55,9 @@ def process_image(ifn):
 
     with open(ofn, 'wb') as f:
         if im.mode == 'RGB':
-            f.write(bytes('TOIf', 'ascii'))
+            f.write(b'TOIf')
         else:
-            f.write(bytes('TOIg', 'ascii'))
+            f.write(b'TOIg')
         f.write(struct.pack('<HH', w, h))
         f.write(struct.pack('<I', len(zdata)))
         f.write(zdata)
diff --git a/tools/toi2png b/tools/toi2png
new file mode 100755
index 0000000000..c36fe5c7e8
--- /dev/null
+++ b/tools/toi2png
@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+from PIL import Image
+import sys
+import struct
+import zlib
+
+
+def process_rgb(w, h, data):
+    pix = bytearray(w * h * 3)
+    for i in range(w * h):
+        c = (data[i * 2] << 8) + data[i * 2 + 1]
+        pix[i * 3    ] = (c & 0xF800) >> 8
+        pix[i * 3 + 1] = (c & 0x07C0) >> 3
+        pix[i * 3 + 2] = (c & 0x001F) << 3
+    return bytes(pix)
+
+
+def process_grayscale(w, h, data):
+    pix = bytearray(w * h)
+    for i in range(w * h // 2):
+        pix[i * 2    ] = data[i] & 0xF0
+        pix[i * 2 + 1] = (data[i] & 0x0F) << 4
+    return bytes(pix)
+
+
+def process_image(ifn):
+
+    data = open(ifn, 'rb').read()
+
+    if ifn.endswith('.toif'):
+        if data[:4] != b'TOIf':
+            print('Unknown TOIF header')
+            return 1
+    elif ifn.endswith('.toig'):
+        if data[:4] != b'TOIg':
+            print('Unknown TOIG header')
+            return 2
+    else:
+        print('Unsupported format')
+        return 3
+    ofn = '%s.png' % ifn[:-5]
+
+    w, h = struct.unpack('<HH', data[4:8])
+
+    print('Opened %s ... %d x %d' % (ifn, w, h))
+
+    l = struct.unpack('<I', data[8:12])[0]
+    data = data[12:]
+    if len(data) != l:
+        print('Compressed data length mismatch (%d vs %d)' % (len(data), l))
+        return 4
+    data = zlib.decompress(data, -10)
+
+
+    if ifn.endswith('.toif'):
+        if len(data) != w * h * 2:
+            print('Uncompressed data length mismatch (%d vs %d)' % (len(data), w * h * 2))
+            return 5
+        pix = process_rgb(w, h, data)
+        img = Image.frombuffer('RGB', (w, h), pix, 'raw', 'RGB', 0, 1)
+        img.save(ofn)
+        print('Written %s ...' % ofn)
+
+    if ifn.endswith('.toig'):
+        if len(data) != w * h // 2:
+            print('Uncompressed data length mismatch (%d vs %d)' % (len(data), w * h // 2))
+            return 6
+        pix = process_grayscale(w, h, data)
+        img = Image.frombuffer('L', (w, h), pix, 'raw', 'L', 0, 1)
+        img.save(ofn)
+        print('Written %s ...' % ofn)
+
+
+def main():
+    if len(sys.argv) < 2:
+        print('Usage toi2png image.toi[fg]')
+        return 1
+
+    ifn = sys.argv[1]
+    if not ifn.endswith('.toif') and not ifn.endswith('.toig'):
+        print('Must provide TOIF/TOIG file')
+        return 2
+
+    process_image(ifn)
+
+
+main()