diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index 21a51ee..c680cff 100644
--- a/ZRCola/locale/ZRCola.pot
+++ b/ZRCola/locale/ZRCola.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-19 14:27+0100\n"
+"POT-Creation-Date: 2021-11-26 16:48+0100\n"
 "PO-Revision-Date: 2019-04-01 19:38+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -47,8 +47,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:221 zrcolagui.cpp:84
+#: zrcolagui.cpp:221
 #, fuzzy
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
@@ -58,8 +58,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:223 zrcolagui.cpp:90
+#: zrcolagui.cpp:223
 #, fuzzy
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@@ -79,8 +79,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:225 zrcolagui.cpp:108
+#: zrcolagui.cpp:225
 #, fuzzy
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@@ -110,8 +110,8 @@ msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 msgid "&ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje &ZRCola"
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:229 zrcolagui.cpp:136
+#: zrcolagui.cpp:229
 #, fuzzy
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
@@ -121,377 +121,397 @@ msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+#, fuzzy
+msgid "Composed Text &Font..."
+msgstr "&Pisava sestavljenega besedila ..."
+
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+#, fuzzy
+msgid "Select font for composed text"
+msgstr "Izberi pisavo za sestavljeno besedilo"
+
+#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 #, fuzzy
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:149 res/zrcolagui.cpp:245 zrcolagui.cpp:149
+#: zrcolagui.cpp:245
+#, fuzzy
 msgid "Highlight Private Use Area Characters"
-msgstr ""
+msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
 #, fuzzy
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
 #, fuzzy
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 #, fuzzy
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 #, fuzzy
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 #, fuzzy
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+msgid "Composed &Text Toolbar"
+msgstr ""
+
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+msgid "Toggle composed text toolbar"
+msgstr ""
+
+#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 #, fuzzy
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 #, fuzzy
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 #, fuzzy
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
 #, fuzzy
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
 #, fuzzy
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
 #, fuzzy
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
 #, fuzzy
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 #, fuzzy
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 #, fuzzy
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
 #, fuzzy
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
 #, fuzzy
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 #, fuzzy
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 #, fuzzy
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
 #, fuzzy
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
 #, fuzzy
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 #, fuzzy
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 #, fuzzy
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 #, fuzzy
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 #, fuzzy
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 #, fuzzy
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 #, fuzzy
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:223 zrcolagui.cpp:223
 #, fuzzy
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:225 zrcolagui.cpp:225
 #, fuzzy
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
 #, fuzzy
 msgid "ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-#, fuzzy
-msgid "PUA Warning"
-msgstr "Opozorilo OZU"
-
-#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#: res/zrcolagui.cpp:236 res/zrcolagui.cpp:248 zrcolagui.cpp:236
+#: zrcolagui.cpp:248
 #, fuzzy
 msgid "Compose"
 msgstr "Sestavljanje"
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:245 zrcolagui.cpp:245
+#, fuzzy
+msgid "PUA Warning"
+msgstr "Opozorilo OZU"
+
+#: res/zrcolagui.cpp:252 zrcolagui.cpp:252
 #, fuzzy
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
+#: res/zrcolagui.cpp:256 zrcolagui.cpp:256
 #, fuzzy
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
+#: res/zrcolagui.cpp:299 zrcolagui.cpp:299
 #, fuzzy
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
+#: res/zrcolagui.cpp:319 zrcolagui.cpp:319
 #, fuzzy
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
+#: res/zrcolagui.cpp:346 zrcolagui.cpp:346
 #, fuzzy
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
+#: res/zrcolagui.cpp:366 zrcolagui.cpp:366
 #, fuzzy
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
+#: res/zrcolagui.cpp:420 zrcolagui.cpp:420
 #, fuzzy
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
+#: res/zrcolagui.cpp:454 zrcolagui.cpp:454
 #, fuzzy
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
+#: res/zrcolagui.cpp:455 zrcolagui.cpp:455
 #, fuzzy
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
+#: res/zrcolagui.cpp:495 zrcolagui.cpp:495
 #, fuzzy
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
+#: res/zrcolagui.cpp:502 zrcolagui.cpp:502
 #, fuzzy
 msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
 
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
+#: res/zrcolagui.cpp:506 zrcolagui.cpp:506
 #, fuzzy
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
+#: res/zrcolagui.cpp:507 zrcolagui.cpp:507
 #, fuzzy
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
+#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
 #, fuzzy
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
+#: res/zrcolagui.cpp:526 zrcolagui.cpp:526
 #, fuzzy
 msgid "All"
 msgstr "Vse"
 
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
+#: res/zrcolagui.cpp:527 zrcolagui.cpp:527
 #, fuzzy
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
+#: res/zrcolagui.cpp:531 zrcolagui.cpp:531
 #, fuzzy
 msgid "None"
 msgstr "Nič"
 
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
+#: res/zrcolagui.cpp:532 zrcolagui.cpp:532
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
+#: res/zrcolagui.cpp:536 zrcolagui.cpp:536
 #, fuzzy
 msgid "Invert"
 msgstr "Obrni"
 
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
+#: res/zrcolagui.cpp:537 zrcolagui.cpp:537
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
+#: res/zrcolagui.cpp:576 zrcolagui.cpp:576
 #, fuzzy
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
+#: res/zrcolagui.cpp:586 zrcolagui.cpp:586
 #, fuzzy
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
+#: res/zrcolagui.cpp:614 zrcolagui.cpp:614
 #, fuzzy
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
+#: res/zrcolagui.cpp:628 zrcolagui.cpp:628
 #, fuzzy
 msgid "Preview"
 msgstr "Predogled"
 
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
+#: res/zrcolagui.cpp:633 zrcolagui.cpp:633
 #, fuzzy
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
+#: res/zrcolagui.cpp:638 zrcolagui.cpp:638
 #, fuzzy
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
+#: res/zrcolagui.cpp:643 zrcolagui.cpp:643
 #, fuzzy
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
+#: res/zrcolagui.cpp:678 zrcolagui.cpp:678
 #, fuzzy
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
+#: res/zrcolagui.cpp:683 zrcolagui.cpp:683
 #, fuzzy
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
+#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
 #, fuzzy
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
+#: res/zrcolagui.cpp:693 zrcolagui.cpp:693
 #, fuzzy
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
 #, fuzzy
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
+#: res/zrcolagui.cpp:702 zrcolagui.cpp:702
 #, fuzzy
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
 #, fuzzy
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
+#: res/zrcolagui.cpp:708 zrcolagui.cpp:708
 #, fuzzy
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
+#: res/zrcolagui.cpp:719 zrcolagui.cpp:719
 #, fuzzy
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
+#: res/zrcolagui.cpp:746 zrcolagui.cpp:746
 #, fuzzy
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
+#: res/zrcolagui.cpp:765 zrcolagui.cpp:765
 #, fuzzy
 msgid "&Insert"
 msgstr "Vstav&i"
 
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
+#: res/zrcolagui.cpp:769 zrcolagui.cpp:769
 #, fuzzy
 msgid "Insert character into decomposed text"
 msgstr "Vstavi znak v razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
+#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
 #, fuzzy
 msgid ""
 "Some character native to specific language you are working with should not decompose to primitives.\n"
@@ -500,22 +520,22 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
+#: res/zrcolagui.cpp:846 zrcolagui.cpp:849
 #, fuzzy
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
+#: res/zrcolagui.cpp:849 zrcolagui.cpp:852
 #, fuzzy
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
+#: res/zrcolagui.cpp:860 zrcolagui.cpp:863
 #, fuzzy
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+#: res/zrcolagui.cpp:865 zrcolagui.cpp:868
 #, fuzzy
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
@@ -524,18 +544,18 @@ msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
 "Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
 
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
+#: res/zrcolagui.cpp:869 zrcolagui.cpp:872
 #, fuzzy
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
+#: res/zrcolagui.cpp:875 zrcolagui.cpp:878
 #, fuzzy
 msgid "Startup"
 msgstr "Zagon"
 
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:74 zrcolafrm.cpp:129
-#: zrcolagui.cpp:927 zrcolagui.h:114
+#: res/zrcolagui.cpp:942 res/zrcolagui.h:120 zrcolaapp.cpp:74 zrcolafrm.cpp:133
+#: zrcolagui.cpp:945 zrcolagui.h:120
 #: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -546,7 +566,7 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
 #, fuzzy
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
@@ -561,62 +581,62 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:961 zrcolagui.cpp:964
 #, fuzzy
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:967 zrcolagui.cpp:970
 #, fuzzy
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:971 zrcolagui.cpp:974
 #, fuzzy
 msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
 #, fuzzy
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1030 zrcolagui.cpp:1033
 #, fuzzy
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1034 zrcolagui.cpp:1037
 #, fuzzy
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1035 zrcolagui.cpp:1038
 #, fuzzy
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:49 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1072 zrcolachrreq.cpp:49 zrcolagui.cpp:1075
 #, fuzzy
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
 #, fuzzy
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1088 zrcolagui.cpp:1091
 #, fuzzy
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1092 zrcolagui.cpp:1095
 #, fuzzy
 msgid ""
 "Please, use the decomposed form.\n"
@@ -625,22 +645,22 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:58 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1100 zrcolachrreq.cpp:58 zrcolagui.cpp:1103
 #, fuzzy
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1102 zrcolagui.cpp:1105
 #, fuzzy
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1108 zrcolagui.cpp:1111
 #, fuzzy
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1115 zrcolagui.cpp:1118
 #, fuzzy
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
@@ -649,12 +669,12 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 #, fuzzy
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1159 zrcolagui.cpp:1162
 #, fuzzy
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
@@ -663,58 +683,58 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
 #, fuzzy
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1184 zrcolagui.cpp:1187
 msgid "→"
 msgstr ""
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1187 zrcolagui.cpp:1190
 msgid "←"
 msgstr ""
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
 #, fuzzy
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1214 zrcolagui.cpp:1217
 msgid "↑"
 msgstr ""
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1217 zrcolagui.cpp:1220
 msgid "↓"
 msgstr ""
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:261 zrcolagui.h:261
 #, fuzzy
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:297 zrcolagui.h:297
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:323 zrcolagui.h:323
 #, fuzzy
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:348 zrcolagui.h:348 zrcolaupdater.cpp:95
 #, fuzzy
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:377 zrcolachrreq.cpp:64 zrcolagui.h:377
 #, fuzzy
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:419 zrcolagui.h:419
 #, fuzzy
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
@@ -753,37 +773,37 @@ msgstr ""
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:95
+#: zrcolafrm.cpp:99
 #, fuzzy
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:108
+#: zrcolafrm.cpp:112
 #, fuzzy
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:225
+#: zrcolafrm.cpp:231
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:225 zrcolafrm.cpp:227
+#: zrcolafrm.cpp:231 zrcolafrm.cpp:233
 #, fuzzy
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:227
+#: zrcolafrm.cpp:233
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:499
+#: zrcolafrm.cpp:544
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:569
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 1bb8329..d47cb12 100644
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-19 14:27+0100\n"
-"PO-Revision-Date: 2021-11-19 14:27+0100\n"
+"POT-Creation-Date: 2021-11-26 16:48+0100\n"
+"PO-Revision-Date: 2021-11-26 16:49+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91592/sl_SI/)\n"
 "Language: sl_SI\n"
@@ -43,8 +43,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:221 zrcolagui.cpp:84
+#: zrcolagui.cpp:221
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 
@@ -52,8 +52,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:223 zrcolagui.cpp:90
+#: zrcolagui.cpp:223
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
@@ -69,8 +69,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:225 zrcolagui.cpp:108
+#: zrcolagui.cpp:225
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
@@ -94,8 +94,8 @@ msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 msgid "&ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje &ZRCola"
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:229 zrcolagui.cpp:136
+#: zrcolagui.cpp:229
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 
@@ -103,304 +103,321 @@ msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+msgid "Composed Text &Font..."
+msgstr "&Pisava sestavljenega besedila ..."
+
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+msgid "Select font for composed text"
+msgstr "Izberi pisavo za sestavljeno besedilo"
+
+#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:149 res/zrcolagui.cpp:245 zrcolagui.cpp:149
+#: zrcolagui.cpp:245
 msgid "Highlight Private Use Area Characters"
 msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+msgid "Composed &Text Toolbar"
+msgstr "Orodna vrs&tica sestavljenega besedila"
+
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+msgid "Toggle composed text toolbar"
+msgstr "Prikaži/skrij orodno vrstico sestavljenega besedila"
+
+#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:223 zrcolagui.cpp:223
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:225 zrcolagui.cpp:225
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
 msgid "ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-msgid "PUA Warning"
-msgstr "Opozorilo OZU"
-
-#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#: res/zrcolagui.cpp:236 res/zrcolagui.cpp:248 zrcolagui.cpp:236
+#: zrcolagui.cpp:248
 msgid "Compose"
 msgstr "Sestavljanje"
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:245 zrcolagui.cpp:245
+msgid "PUA Warning"
+msgstr "Opozorilo OZU"
+
+#: res/zrcolagui.cpp:252 zrcolagui.cpp:252
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
+#: res/zrcolagui.cpp:256 zrcolagui.cpp:256
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
+#: res/zrcolagui.cpp:299 zrcolagui.cpp:299
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
+#: res/zrcolagui.cpp:319 zrcolagui.cpp:319
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
+#: res/zrcolagui.cpp:346 zrcolagui.cpp:346
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
+#: res/zrcolagui.cpp:366 zrcolagui.cpp:366
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
+#: res/zrcolagui.cpp:420 zrcolagui.cpp:420
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
+#: res/zrcolagui.cpp:454 zrcolagui.cpp:454
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
+#: res/zrcolagui.cpp:455 zrcolagui.cpp:455
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
+#: res/zrcolagui.cpp:495 zrcolagui.cpp:495
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
+#: res/zrcolagui.cpp:502 zrcolagui.cpp:502
 msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
 
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
+#: res/zrcolagui.cpp:506 zrcolagui.cpp:506
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
+#: res/zrcolagui.cpp:507 zrcolagui.cpp:507
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
+#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
+#: res/zrcolagui.cpp:526 zrcolagui.cpp:526
 msgid "All"
 msgstr "Vse"
 
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
+#: res/zrcolagui.cpp:527 zrcolagui.cpp:527
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
+#: res/zrcolagui.cpp:531 zrcolagui.cpp:531
 msgid "None"
 msgstr "Nič"
 
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
+#: res/zrcolagui.cpp:532 zrcolagui.cpp:532
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
+#: res/zrcolagui.cpp:536 zrcolagui.cpp:536
 msgid "Invert"
 msgstr "Obrni"
 
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
+#: res/zrcolagui.cpp:537 zrcolagui.cpp:537
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
+#: res/zrcolagui.cpp:576 zrcolagui.cpp:576
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
+#: res/zrcolagui.cpp:586 zrcolagui.cpp:586
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
+#: res/zrcolagui.cpp:614 zrcolagui.cpp:614
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
+#: res/zrcolagui.cpp:628 zrcolagui.cpp:628
 msgid "Preview"
 msgstr "Predogled"
 
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
+#: res/zrcolagui.cpp:633 zrcolagui.cpp:633
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
+#: res/zrcolagui.cpp:638 zrcolagui.cpp:638
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
+#: res/zrcolagui.cpp:643 zrcolagui.cpp:643
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
+#: res/zrcolagui.cpp:678 zrcolagui.cpp:678
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
+#: res/zrcolagui.cpp:683 zrcolagui.cpp:683
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
+#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
+#: res/zrcolagui.cpp:693 zrcolagui.cpp:693
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
+#: res/zrcolagui.cpp:702 zrcolagui.cpp:702
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
+#: res/zrcolagui.cpp:708 zrcolagui.cpp:708
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
+#: res/zrcolagui.cpp:719 zrcolagui.cpp:719
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
+#: res/zrcolagui.cpp:746 zrcolagui.cpp:746
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
+#: res/zrcolagui.cpp:765 zrcolagui.cpp:765
 msgid "&Insert"
 msgstr "Vstav&i"
 
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
+#: res/zrcolagui.cpp:769 zrcolagui.cpp:769
 msgid "Insert character into decomposed text"
 msgstr "Vstavi znak v razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
+#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
 msgid ""
 "Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
@@ -408,19 +425,19 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
+#: res/zrcolagui.cpp:846 zrcolagui.cpp:849
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
+#: res/zrcolagui.cpp:849 zrcolagui.cpp:852
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
+#: res/zrcolagui.cpp:860 zrcolagui.cpp:863
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+#: res/zrcolagui.cpp:865 zrcolagui.cpp:868
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
 "It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
@@ -428,16 +445,16 @@ msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
 "Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
 
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
+#: res/zrcolagui.cpp:869 zrcolagui.cpp:872
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
+#: res/zrcolagui.cpp:875 zrcolagui.cpp:878
 msgid "Startup"
 msgstr "Zagon"
 
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:74 zrcolafrm.cpp:129
-#: zrcolagui.cpp:927 zrcolagui.h:114
+#: res/zrcolagui.cpp:942 res/zrcolagui.h:120 zrcolaapp.cpp:74 zrcolafrm.cpp:133
+#: zrcolagui.cpp:945 zrcolagui.h:120
 #: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -447,7 +464,7 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -461,51 +478,51 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:961 zrcolagui.cpp:964
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:967 zrcolagui.cpp:970
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:971 zrcolagui.cpp:974
 msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1030 zrcolagui.cpp:1033
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1034 zrcolagui.cpp:1037
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1035 zrcolagui.cpp:1038
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:49 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1072 zrcolachrreq.cpp:49 zrcolagui.cpp:1075
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1088 zrcolagui.cpp:1091
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1092 zrcolagui.cpp:1095
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
@@ -513,19 +530,19 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:58 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1100 zrcolachrreq.cpp:58 zrcolagui.cpp:1103
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1102 zrcolagui.cpp:1105
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1108 zrcolagui.cpp:1111
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1115 zrcolagui.cpp:1118
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
@@ -533,11 +550,11 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1159 zrcolagui.cpp:1162
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -545,51 +562,51 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1184 zrcolagui.cpp:1187
 msgid "→"
 msgstr "→"
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1187 zrcolagui.cpp:1190
 msgid "←"
 msgstr "←"
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1214 zrcolagui.cpp:1217
 msgid "↑"
 msgstr "↑"
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1217 zrcolagui.cpp:1220
 msgid "↓"
 msgstr "↓"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:261 zrcolagui.h:261
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:297 zrcolagui.h:297
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:323 zrcolagui.h:323
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:348 zrcolagui.h:348 zrcolaupdater.cpp:95
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:377 zrcolachrreq.cpp:64 zrcolagui.h:377
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:419 zrcolagui.h:419
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
 
@@ -623,31 +640,31 @@ msgstr ", "
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:95
+#: zrcolafrm.cpp:99
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:108
+#: zrcolafrm.cpp:112
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:225
+#: zrcolafrm.cpp:231
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:225 zrcolafrm.cpp:227
+#: zrcolafrm.cpp:231 zrcolafrm.cpp:233
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:227
+#: zrcolafrm.cpp:233
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:499
+#: zrcolafrm.cpp:544
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:569
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
diff --git a/ZRCola/pch.h b/ZRCola/pch.h
index 2848053..0d6b476 100644
--- a/ZRCola/pch.h
+++ b/ZRCola/pch.h
@@ -44,6 +44,7 @@
 #include <wx/clipbrd.h>
 #include <wx/dcclient.h>
 #include <wx/ffile.h>
+#include <wx/fontdlg.h>
 #include <wx/msgdlg.h>
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp
index 608460a..78aa064 100644
--- a/ZRCola/res/ZRCola.fbp
+++ b/ZRCola/res/ZRCola.fbp
@@ -45,7 +45,7 @@
             <property name="minimum_size">150,150</property>
             <property name="name">wxZRColaFrameBase</property>
             <property name="pos"></property>
-            <property name="size">600,400</property>
+            <property name="size">660,450</property>
             <property name="style">wxDEFAULT_FRAME_STYLE</property>
             <property name="subclass"></property>
             <property name="title">ZRCola</property>
@@ -270,6 +270,19 @@
                         <property name="name">separator5</property>
                         <property name="permission">none</property>
                     </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Select font for composed text</property>
+                        <property name="id">wxID_FONT_DESTINATION</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Composed Text &amp;Font...</property>
+                        <property name="name">m_menuItemFontDestination</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                    </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
@@ -331,6 +344,19 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                     </object>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Toggle composed text toolbar</property>
+                        <property name="id">wxID_TOOLBAR_DESTINATION</property>
+                        <property name="kind">wxITEM_CHECK</property>
+                        <property name="label">Composed &amp;Text Toolbar</property>
+                        <property name="name">m_menuItemToolbarDestination</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut"></property>
+                        <property name="unchecked_bitmap"></property>
+                    </object>
                     <object class="separator" expanded="0">
                         <property name="name">separator</property>
                         <property name="permission">none</property>
@@ -687,8 +713,125 @@
                     <property name="window_style"></property>
                     <event name="OnChoice">OnTranslationSeqChoice</event>
                 </object>
-                <object class="toolSeparator" expanded="0">
+            </object>
+            <object class="wxAuiToolBar" expanded="0">
+                <property name="BottomDockable">1</property>
+                <property name="LeftDockable">0</property>
+                <property name="RightDockable">0</property>
+                <property name="TopDockable">1</property>
+                <property name="aui_layer">1</property>
+                <property name="aui_name">toolbarDestination</property>
+                <property name="aui_position"></property>
+                <property name="aui_row">0</property>
+                <property name="best_size"></property>
+                <property name="bg"></property>
+                <property name="bitmapsize">-1,-1</property>
+                <property name="caption">Compose</property>
+                <property name="caption_visible">1</property>
+                <property name="center_pane">0</property>
+                <property name="close_button">1</property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="default_pane">0</property>
+                <property name="dock">Dock</property>
+                <property name="dock_fixed">0</property>
+                <property name="docking">Top</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="floatable">1</property>
+                <property name="font"></property>
+                <property name="gripper">0</property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="label_visible">0</property>
+                <property name="margins"></property>
+                <property name="max_size"></property>
+                <property name="maximize_button">0</property>
+                <property name="maximum_size"></property>
+                <property name="min_size">-1,-1</property>
+                <property name="minimize_button">0</property>
+                <property name="minimum_size"></property>
+                <property name="moveable">1</property>
+                <property name="name">m_toolbarDestination</property>
+                <property name="packing">1</property>
+                <property name="pane_border">1</property>
+                <property name="pane_position">-1,-1</property>
+                <property name="pane_size">-1,-1</property>
+                <property name="permission">protected</property>
+                <property name="pin_button">1</property>
+                <property name="pos"></property>
+                <property name="resize">Resizable</property>
+                <property name="separation">5</property>
+                <property name="show">1</property>
+                <property name="size"></property>
+                <property name="style">wxAUI_TB_HORZ_LAYOUT</property>
+                <property name="subclass"></property>
+                <property name="toolbar_label"></property>
+                <property name="toolbar_pane">1</property>
+                <property name="tooltip"></property>
+                <property name="use_explicit_ids">0</property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <object class="wxFontPickerCtrl" expanded="0">
+                    <property name="BottomDockable">1</property>
+                    <property name="LeftDockable">1</property>
+                    <property name="RightDockable">1</property>
+                    <property name="TopDockable">1</property>
+                    <property name="aui_layer"></property>
+                    <property name="aui_name"></property>
+                    <property name="aui_position"></property>
+                    <property name="aui_row"></property>
+                    <property name="best_size"></property>
+                    <property name="bg"></property>
+                    <property name="caption"></property>
+                    <property name="caption_visible">1</property>
+                    <property name="center_pane">0</property>
+                    <property name="close_button">1</property>
+                    <property name="context_help"></property>
+                    <property name="context_menu">1</property>
+                    <property name="default_pane">0</property>
+                    <property name="dock">Dock</property>
+                    <property name="dock_fixed">0</property>
+                    <property name="docking">Left</property>
+                    <property name="enabled">1</property>
+                    <property name="fg"></property>
+                    <property name="floatable">1</property>
+                    <property name="font"></property>
+                    <property name="gripper">0</property>
+                    <property name="hidden">0</property>
+                    <property name="id">wxID_FONT_DESTINATION</property>
+                    <property name="max_point_size">100</property>
+                    <property name="max_size"></property>
+                    <property name="maximize_button">0</property>
+                    <property name="maximum_size">180,-1</property>
+                    <property name="min_size"></property>
+                    <property name="minimize_button">0</property>
+                    <property name="minimum_size">120,-1</property>
+                    <property name="moveable">1</property>
+                    <property name="name">m_fontpickerDestination</property>
+                    <property name="pane_border">1</property>
+                    <property name="pane_position"></property>
+                    <property name="pane_size"></property>
                     <property name="permission">protected</property>
+                    <property name="pin_button">1</property>
+                    <property name="pos"></property>
+                    <property name="resize">Resizable</property>
+                    <property name="show">1</property>
+                    <property name="size"></property>
+                    <property name="style">wxFNTP_FONTDESC_AS_LABEL</property>
+                    <property name="subclass">; ; forward_declare</property>
+                    <property name="toolbar_pane">0</property>
+                    <property name="tooltip"></property>
+                    <property name="validator_data_type"></property>
+                    <property name="validator_style">wxFILTER_NONE</property>
+                    <property name="validator_type">wxDefaultValidator</property>
+                    <property name="validator_variable"></property>
+                    <property name="value">ZRCola,90,90,20,70,0</property>
+                    <property name="window_extra_style"></property>
+                    <property name="window_name"></property>
+                    <property name="window_style"></property>
+                    <event name="OnFontChanged">OnFontDestinationChanged</event>
                 </object>
                 <object class="tool" expanded="0">
                     <property name="bitmap">Load From Icon Resource; warn_pua.ico; [24; 24]</property>
diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp
index cfbd0cc..1cf3124 100644
--- a/ZRCola/res/zrcolagui.cpp
+++ b/ZRCola/res/zrcolagui.cpp
@@ -142,6 +142,10 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
+	wxMenuItem* m_menuItemFontDestination;
+	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
+	m_menuEdit->Append( m_menuItemFontDestination );
+
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
@@ -162,6 +166,10 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );
 
+	wxMenuItem* m_menuItemToolbarDestination;
+	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
+	m_menuView->Append( m_menuItemToolbarDestination );
+
 	m_menuView->AppendSeparator();
 
 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -224,13 +232,21 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 240,-1 ), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
-	m_toolbarTranslate->AddSeparator();
-
-	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 
+	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
+	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
+	m_fontpickerDestination->SetMaxPointSize( 100 );
+	m_fontpickerDestination->SetMinSize( wxSize( 120,-1 ) );
+	m_fontpickerDestination->SetMaxSize( wxSize( 180,-1 ) );
+
+	m_toolbarDestination->AddControl( m_fontpickerDestination );
+	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
+	m_toolbarDestination->Realize();
+	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
+
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );
 
 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize( wxSize( 150,200 ) ).MinSize( wxSize( 100,100 ) ).Layer( 1 ) );
@@ -249,6 +265,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
+	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }
 
 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -258,6 +275,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
+	m_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 
 	m_mgr.UnInit();
 
diff --git a/ZRCola/res/zrcolagui.h b/ZRCola/res/zrcolagui.h
index c4a3782..7421a4a 100644
--- a/ZRCola/res/zrcolagui.h
+++ b/ZRCola/res/zrcolagui.h
@@ -25,6 +25,7 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
+#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -68,10 +69,12 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
 			wxID_COMPOSITION,
+			wxID_FONT_DESTINATION,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
+			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -97,6 +100,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolSendSource;
 		wxAuiToolBarItem* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
+		wxAuiToolBar* m_toolbarDestination;
+		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -106,12 +111,13 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }
 
 
 	public:
 		wxZRColaComposerPanel* m_panel;
 
-		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,450 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
 		wxAuiManager m_mgr;
 
 		~wxZRColaFrameBase();
diff --git a/ZRCola/zrcolacomppnl.cpp b/ZRCola/zrcolacomppnl.cpp
index 9b5a09a..e54f177 100644
--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -34,8 +34,9 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_destinationChanged(false),
     m_sourceRestyled(false),
     m_destinationRestyled(false),
-    m_styleNormal(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
-    m_stylePUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleSource(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleDestination(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleDestinationPUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
     m_selSource(0, 0),
     m_selDestination(0, 0),
     wxZRColaComposerPanelBase(parent)
@@ -197,6 +198,41 @@ void wxZRColaComposerPanel::SynchronizePanels()
 }
 
 
+void wxZRColaComposerPanel::SetDestinationFont(const wxFont& font, int flags)
+{
+    m_styleDestination.SetFont(font, flags);
+    m_styleDestinationPUA.SetFont(font, flags);
+}
+
+
+void wxZRColaComposerPanel::RestyleSource()
+{
+    m_sourceRestyled = true;
+    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleSource);
+    m_sourceRestyled = false;
+}
+
+
+void wxZRColaComposerPanel::RestyleDestination()
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_destinationRestyled = true;
+    if (app->m_mainWnd->m_warnPUA) {
+        wxString src = m_destination->GetValue();
+        size_t len = src.Length();
+        for (size_t i = 0, j; i < len;) {
+            bool pua_i = is_pua(src[i]);
+            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
+            m_destination->SetStyle((long)i, (long)j, pua_i ? m_styleDestinationPUA : m_styleDestination);
+            i = j;
+        }
+    } else
+        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleDestination);
+    m_destinationRestyled = false;
+}
+
+
 void wxZRColaComposerPanel::OnSourcePaint(wxPaintEvent& event)
 {
     event.Skip();
@@ -263,10 +299,7 @@ void wxZRColaComposerPanel::OnSourceText(wxCommandEvent& event)
 
     // Set the flag the source text changed to trigger idle-time translation.
     m_sourceChanged = true;
-
-    m_sourceRestyled = true;
-    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleNormal);
-    m_sourceRestyled = false;
+    RestyleSource();
 }
 
 
@@ -336,21 +369,7 @@ void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)
 
     // Set the flag the destination text changed to trigger idle-time inverse translation.
     m_destinationChanged = true;
-
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    m_destinationRestyled = true;
-    if (app->m_mainWnd->m_warnPUA) {
-        wxString src = m_destination->GetValue();
-        size_t len = src.Length();
-        for (size_t i = 0, j; i < len;) {
-            bool pua_i = is_pua(src[i]);
-            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
-            m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
-            i = j;
-        }
-    } else
-        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleNormal);
-    m_destinationRestyled = false;
+    RestyleDestination();
 }
 
 
diff --git a/ZRCola/zrcolacomppnl.h b/ZRCola/zrcolacomppnl.h
index 5d26f37..1cd7613 100644
--- a/ZRCola/zrcolacomppnl.h
+++ b/ZRCola/zrcolacomppnl.h
@@ -51,6 +51,9 @@ public:
 
     void RestoreFromStateFile();
     void SynchronizePanels();
+    void SetDestinationFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE));
+    void RestyleSource();
+    void RestyleDestination();
 
     friend class wxPersistentZRColaComposerPanel;   // Allow saving/restoring window state.
 
@@ -76,8 +79,9 @@ protected:
         m_sourceRestyled,                           ///< Boolean flag to mark source text is being restyled
         m_destinationRestyled;                      ///< Boolean flag to mark destination text is being restyled
     wxTextAttr
-        m_styleNormal,                              ///< Normal text style
-        m_stylePUA;                                 ///< PUA character text style
+        m_styleSource,                              ///< Normal source text style
+        m_styleDestination,                         ///< Normal destination text style
+        m_styleDestinationPUA;                      ///< PUA character destination text style
     std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
     std::pair<long, long>
         m_selSource,                                ///< Character index of selected text in source text control
diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp
index 7cc73bd..ee85668 100644
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -43,6 +43,7 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_SEND_ABORT                                       , wxZRColaFrame::OnSendAbort                  )
 
     EVT_MENU           (wxID_COMPOSITION                                      , wxZRColaFrame::OnComposition                )
+    EVT_MENU           (wxID_FONT_DESTINATION                                 , wxZRColaFrame::OnFontDestination            )
     EVT_MENU           (wxID_WARN_PUA                                         , wxZRColaFrame::OnWarnPUA                    )
     EVT_MENU_RANGE     (wxID_TRANSLATION_SEQ_DEFAULT, wxID_TRANSLATION_SEQ_END, wxZRColaFrame::OnTranslationSeqMenu         )
 
@@ -52,6 +53,8 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_TOOLBAR_EDIT                                     , wxZRColaFrame::OnToolbarEdit                )
     EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslateUpdate     )
     EVT_MENU           (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslate           )
+    EVT_UPDATE_UI      (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestinationUpdate   )
+    EVT_MENU           (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestination         )
     EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
     EVT_MENU           (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalog      )
     EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG                          , wxZRColaFrame::OnPanelCharacterCatalogFocus )
@@ -75,6 +78,7 @@ wxZRColaFrame::wxZRColaFrame() :
     m_settings(NULL),
     m_chrReq(NULL),
     m_composition(true),
+    m_fontDestination(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola")),
     m_warnPUA(false),
     m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
     m_transeq(NULL),
@@ -196,6 +200,8 @@ wxZRColaFrame::wxZRColaFrame() :
         m_toolComposition->SetState(m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED);
     }
 
+    m_fontpickerDestination->SetSelectedFont(m_fontDestination);
+    m_panel->SetDestinationFont(m_fontDestination);
     if (m_warnPUA) {
         m_menuItemWarnPUA->Check(true);
         m_toolWarnPUA->SetState(m_toolWarnPUA->GetState() | wxAUI_BUTTON_STATE_CHECKED);
@@ -367,16 +373,41 @@ void wxZRColaFrame::OnComposition(wxCommandEvent& event)
 }
 
 
+void wxZRColaFrame::OnFontDestinationChanged(wxFontPickerEvent& event)
+{
+    m_fontDestination = event.GetFont();
+    m_panel->SetDestinationFont(m_fontDestination);
+    m_panel->RestyleDestination();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnFontDestination(wxCommandEvent& event)
+{
+    wxFontData data;
+    data.SetInitialFont(m_fontDestination);
+    wxFontDialog dlg(this, data);
+    if (dlg.ShowModal() == wxID_OK)
+    {
+        data = dlg.GetFontData();
+        m_fontDestination = data.GetChosenFont();
+        m_fontpickerDestination->SetSelectedFont(m_fontDestination);
+        m_panel->SetDestinationFont(m_fontDestination);
+        m_panel->RestyleDestination();
+    }
+
+    event.Skip();
+}
+
+
 void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
 {
     m_warnPUA = !m_warnPUA;
     m_menuItemWarnPUA->Check(m_warnPUA);
     m_toolWarnPUA->SetState((m_toolWarnPUA->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_warnPUA ? wxAUI_BUTTON_STATE_CHECKED : 0));
-    m_toolbarTranslate->Refresh();
-
-    // Notify destination text something changed and should re-paint.
-    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
-    m_panel->m_destination->ProcessWindowEvent(event2);
+    m_toolbarDestination->Refresh();
+    m_panel->RestyleDestination();
 
     event.Skip();
 }
@@ -443,6 +474,20 @@ void wxZRColaFrame::OnToolbarTranslate(wxCommandEvent& event)
 }
 
 
+void wxZRColaFrame::OnToolbarDestinationUpdate(wxUpdateUIEvent& event)
+{
+    event.Check(m_mgr.GetPane(m_toolbarDestination).IsShown());
+}
+
+
+void wxZRColaFrame::OnToolbarDestination(wxCommandEvent& event)
+{
+    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarDestination);
+    paneInfo.Show(!paneInfo.IsShown());
+    m_mgr.Update();
+}
+
+
 void wxZRColaFrame::OnTranslationSeqMenu(wxCommandEvent& event)
 {
     int idx = event.GetId() - wxID_TRANSLATION_SEQ_DEFAULT;
@@ -758,9 +803,19 @@ void wxPersistentZRColaFrame::Save() const
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("composition"), wnd->m_composition);
-    SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
     SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
 
+    #pragma warning(push)
+    #pragma warning(disable: 26812) // wxWidgets font enums are unscoped.
+    SaveValue(wxT("fontDestinationSize"        ), wnd->m_fontDestination.GetPointSize());
+    SaveValue(wxT("fontDestinationFamily"      ), wnd->m_fontDestination.GetFamily());
+    SaveValue(wxT("fontDestinationStyle"       ), wnd->m_fontDestination.GetStyle());
+    SaveValue(wxT("fontDestinationWeight"      ), wnd->m_fontDestination.GetWeight());
+    SaveValue(wxT("fontDestinationIsUnderlined"), wnd->m_fontDestination.GetUnderlined());
+    SaveValue(wxT("fontDestinationFace"        ), wnd->m_fontDestination.GetFaceName());
+    #pragma warning(pop)
+    SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
+
     wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
 }
@@ -782,6 +837,19 @@ bool wxPersistentZRColaFrame::Restore()
         wnd->m_composition = b;
     else
         wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
+
+    int fontSize = 20, fontFamily = wxFONTFAMILY_DEFAULT, fontStyle = wxFONTSTYLE_NORMAL, fontWeight = wxFONTWEIGHT_NORMAL;
+    bool fontIsUnderlined = false;
+    wxString fontFace(wxT("ZRCola"));
+    if (RestoreValue(wxT("fontDestinationSize"        ), &fontSize) &&
+        RestoreValue(wxT("fontDestinationFamily"      ), &fontFamily) &&
+        RestoreValue(wxT("fontDestinationStyle"       ), &fontStyle) &&
+        RestoreValue(wxT("fontDestinationWeight"      ), &fontWeight) &&
+        RestoreValue(wxT("fontDestinationIsUnderlined"), &fontIsUnderlined) &&
+        RestoreValue(wxT("fontDestinationFace"        ), &fontFace))
+        wnd->m_fontDestination = wxFont(fontSize, (wxFontFamily)fontFamily, (wxFontStyle)fontStyle, (wxFontWeight)fontWeight, fontIsUnderlined, fontFace);
+    else
+        wnd->m_fontDestination = wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"));
     if (RestoreValue(wxT("warnPUA"), &b))
         wnd->m_warnPUA = b;
     else
diff --git a/ZRCola/zrcolafrm.h b/ZRCola/zrcolafrm.h
index 0101df1..eff3b83 100644
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -91,6 +91,8 @@ protected:
     void OnCopySourceAndReturn(wxCommandEvent& event);
     void OnSendAbort(wxCommandEvent& event);
     void OnComposition(wxCommandEvent& event);
+    virtual void OnFontDestinationChanged(wxFontPickerEvent& event);
+    void OnFontDestination(wxCommandEvent& event);
     void OnWarnPUA(wxCommandEvent& event);
     void OnSettings(wxCommandEvent& event);
     virtual void OnIdle(wxIdleEvent& event);
@@ -100,6 +102,8 @@ protected:
     void OnToolbarEdit(wxCommandEvent& event);
     void OnToolbarTranslateUpdate(wxUpdateUIEvent& event);
     void OnToolbarTranslate(wxCommandEvent& event);
+    void OnToolbarDestinationUpdate(wxUpdateUIEvent& event);
+    void OnToolbarDestination(wxCommandEvent& event);
     void OnTranslationSeqMenu(wxCommandEvent& event);
     virtual void OnTranslationSeqChoice(wxCommandEvent& event);
     void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
@@ -149,6 +153,7 @@ protected:
     wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
     wxZRColaSettings *m_settings;       ///< Configuration dialog
     bool m_composition;                 ///< Is (de)composition enabled?
+    wxFont m_fontDestination;           ///< Destination window font
     bool m_warnPUA;                     ///< Mark Private-Use-Area characters in destination text
     ZRCola::transeqid_t m_transeq_id;   ///< Translation sequence ID
     wxZRColaTranslationSeq *m_transeq;  ///< Custom translation sequence dialog
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index 8609b8b..976d0fa 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -30,7 +30,7 @@ delete old;
 static wxFBContextSensitiveHelpSetter s_wxFBSetTheHelpProvider;
 ///////////////////////////////////////////////////////////////////////////
 
-wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize(600, 400)), style, name )
+wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize( 660,450 )), style, name )
 {
 	this->SetSizeHints( FromDIP(wxSize( 150,150 )), wxDefaultSize );
 	m_mgr.SetManagedWindow(this);
@@ -142,6 +142,10 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
+	wxMenuItem* m_menuItemFontDestination;
+	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
+	m_menuEdit->Append( m_menuItemFontDestination );
+
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
@@ -162,6 +166,10 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );
 
+	wxMenuItem* m_menuItemToolbarDestination;
+	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
+	m_menuView->Append( m_menuItemToolbarDestination );
+
 	m_menuView->AppendSeparator();
 
 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -224,13 +232,21 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 240,-1 )), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
-	m_toolbarTranslate->AddSeparator();
-
-	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 
+	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
+	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
+	m_fontpickerDestination->SetMaxPointSize( 100 );
+	m_fontpickerDestination->SetMinSize( FromDIP(wxSize( 120,-1 )) );
+	m_fontpickerDestination->SetMaxSize( FromDIP(wxSize( 180,-1 )) );
+
+	m_toolbarDestination->AddControl( m_fontpickerDestination );
+	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
+	m_toolbarDestination->Realize();
+	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
+
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );
 
 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize(FromDIP(wxSize( 150,200 )) ).MinSize( FromDIP(wxSize( 100,100 )) ).Layer( 1 ) );
@@ -249,6 +265,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
+	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }
 
 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -258,6 +275,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
+	m_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 
 	m_mgr.UnInit();
 
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index 2699f64..944901b 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -25,6 +25,7 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
+#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -68,10 +69,12 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
 			wxID_COMPOSITION,
+			wxID_FONT_DESTINATION,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
+			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -97,6 +100,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolSendSource;
 		wxAuiToolBarItem* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
+		wxAuiToolBar* m_toolbarDestination;
+		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -106,6 +111,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }
 
 
 	public: