diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9035b6227..c53f0eb72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - ESP32 Core3 SPI ethernet support for all models
 - Berry class `int64` made immutable (#20727)
 - LVGL make lv_touch_3_buttons more responsive (#20728)
+- HASPmota fix and improve demo with pixel-perfect fonts
 
 ### Fixed
 
diff --git a/tasmota/berry/haspmota_src/haspmota_demo.tapp b/tasmota/berry/haspmota_src/haspmota_demo.tapp
index b7571d884..3bc54997f 100644
Binary files a/tasmota/berry/haspmota_src/haspmota_demo.tapp and b/tasmota/berry/haspmota_src/haspmota_demo.tapp differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/Berkelium64.lvfont b/tasmota/berry/haspmota_src/haspmota_demo/Berkelium64.lvfont
new file mode 100644
index 000000000..073d1e37e
Binary files /dev/null and b/tasmota/berry/haspmota_src/haspmota_demo/Berkelium64.lvfont differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/PrintChar21.lvfont b/tasmota/berry/haspmota_src/haspmota_demo/PrintChar21.lvfont
new file mode 100644
index 000000000..f2ff7c4f9
Binary files /dev/null and b/tasmota/berry/haspmota_src/haspmota_demo/PrintChar21.lvfont differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/Shaston320.lvfont b/tasmota/berry/haspmota_src/haspmota_demo/Shaston320.lvfont
new file mode 100644
index 000000000..4470f039f
Binary files /dev/null and b/tasmota/berry/haspmota_src/haspmota_demo/Shaston320.lvfont differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/m3x6.lvfont b/tasmota/berry/haspmota_src/haspmota_demo/m3x6.lvfont
new file mode 100644
index 000000000..08dca3ca1
Binary files /dev/null and b/tasmota/berry/haspmota_src/haspmota_demo/m3x6.lvfont differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/m5x7.lvfont b/tasmota/berry/haspmota_src/haspmota_demo/m5x7.lvfont
new file mode 100644
index 000000000..a4e170e9f
Binary files /dev/null and b/tasmota/berry/haspmota_src/haspmota_demo/m5x7.lvfont differ
diff --git a/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl b/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
index 9f1cb4ef1..dc4dfa188 100644
--- a/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
+++ b/tasmota/berry/haspmota_src/haspmota_demo/pages.jsonl
@@ -10,14 +10,6 @@
 {"id":102,"obj":"btn","x":120,"y":210,"w":80,"h":25,"action":"back","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF015","text_font":"montserrat-20"}
 {"id":103,"obj":"btn","x":220,"y":210,"w":80,"h":25,"action":"next","bg_color":"#1fa3ec","radius":10,"border_side":1,"text":"\uF054","text_font":"montserrat-20"}
 
-{"page":2,"comment":"---------- Page 2 ----------"}
-{"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
-
-{"comment":"---------- Wifi status ----------"}
-{"id":20,"obj":"lv_wifi_graph","x":257,"y":25,"w":60,"h":40,"radius":0}
-{"id":21,"obj":"lv_tasmota_info","x":3,"y":25,"w":251,"h":40,"radius":0}
-{"id":22,"obj":"lv_tasmota_log","x":3,"y":68,"w":314,"h":90,"radius":0,"text_font":12}
-
 {"page":1,"comment":"---------- Page 1 ----------"}
 {"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
 
@@ -30,6 +22,14 @@
 {"id":12,"obj":"label","x":172,"y":75,"w":140,"text":"y=","align":0,"text_rule":"MPU9250#AY","text_rule_format":"y=%6.3f","text_rule_formula":"val / 1000"}
 {"id":13,"obj":"label","x":172,"y":95,"w":140,"text":"z=","align":0,"text_rule":"MPU9250#AZ","text_rule_format":"z=%6.3f","text_rule_formula":"val / 1000"}
 
+{"page":2,"comment":"---------- Page 2 ----------"}
+{"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
+
+{"comment":"---------- Wifi status ----------"}
+{"id":20,"obj":"lv_wifi_graph","x":257,"y":25,"w":60,"h":40,"radius":0}
+{"id":21,"obj":"lv_tasmota_info","x":3,"y":25,"w":251,"h":40,"radius":0}
+{"id":22,"obj":"lv_tasmota_log","x":3,"y":68,"w":314,"h":90,"radius":0,"text_font":12}
+
 {"page":3,"comment":"---------- Page 3 - qrcode ----------"}
 {"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
 {"id":1,"obj":"qrcode","qr_text":"https://github.com/arendst/Tasmota","x":85,"y":40,"qr_size":150}
@@ -48,4 +48,15 @@
 {"id":13,"obj":"img","parentid":10,"src":"A:/haspmota_demo.tapp#watch_ren_sec_240.png","x":110,"y":10}
 {"id":15,"obj":"label","parentid":10,"x":184,"y":112,"w":18,"h":16,"text":"","align":1,"text_font":"montserrat-14"}
 
-{"comment":"--- Trigger sensors every 2 seconds ---","berry_run":"tasmota.add_cron('*/2 * * * * *', def () tasmota.publish_rule(tasmota.read_sensors()) end, 'oh_every_5_s')"}
+{"page":10,"comment":"---------- Page 10 ----------"}
+{"id":0,"bg_color":"#0000A0","bg_grad_color":"#000000","bg_grad_dir":1,"text_color":"#FFFFFF"}
+
+{"id":5,"obj":"label","x":2,"y":30,"w":316,"text":"Berkalium 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:/haspmota_demo.tapp#Berkelium64.lvfont"}
+{"id":6,"obj":"label","x":2,"y":55,"w":316,"text":"PrintChar21 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:/haspmota_demo.tapp#PrintChar21.lvfont"}
+{"id":7,"obj":"label","x":2,"y":80,"w":316,"text":"Shaston320 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:/haspmota_demo.tapp#Shaston320.lvfont"}
+{"id":8,"obj":"label","x":2,"y":105,"w":316,"text":"m5x7 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:/haspmota_demo.tapp#m5x7.lvfont"}
+{"id":9,"obj":"label","x":2,"y":130,"w":316,"text":"m3x6 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"A:/haspmota_demo.tapp#m3x6.lvfont"}
+
+{"id":99,"obj":"label","x":2,"y":170,"w":316,"text":"unscii-8 192.168.x.x ABCDEF\nThe quick brown fox jumps over the lazy dog","text_font":"unscii-8"}
+
+{"comment":"--- Trigger sensors every 2 seconds ---","berry_run":"tasmota.add_cron('*/2 * * * * *', def () var s = tasmota.read_sensors() if (s) tasmota.publish_rule(s) end end, 'hm_every_5_s')"}