diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp
index f0f9f22..574d80c 100644
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -2358,7 +2358,7 @@
                                                 <property name="style"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">Full or partial terms from Unicode character description (in English) to search for</property>
                                                 <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
@@ -2449,7 +2449,7 @@
                                                 <property name="style"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">List of Unicode character categories to search in</property>
                                                 <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
@@ -2839,7 +2839,7 @@
                                                 <property name="size">-1,-1</property>
                                                 <property name="subclass">wxZRColaCharGrid; zrcolachrgrid.h</property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">Character search results</property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style">wxSTATIC_BORDER</property>
@@ -2996,7 +2996,7 @@
                                                 <property name="size">-1,35</property>
                                                 <property name="subclass">wxZRColaCharGrid; zrcolachrgrid.h</property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">List of recently inserted characters</property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style">wxSTATIC_BORDER</property>
@@ -3084,7 +3084,7 @@
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER|wxALL</property>
+                                            <property name="flag">wxEXPAND</property>
                                             <property name="proportion">0</property>
                                             <object class="wxBoxSizer" expanded="0">
                                                 <property name="minimum_size"></property>
@@ -3093,7 +3093,7 @@
                                                 <property name="permission">none</property>
                                                 <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
-                                                    <property name="flag">wxALIGN_CENTER</property>
+                                                    <property name="flag">wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxTOP</property>
                                                     <property name="proportion">0</property>
                                                     <object class="wxStaticText" expanded="0">
                                                         <property name="BottomDockable">1</property>
@@ -3176,7 +3176,7 @@
                                                 </object>
                                                 <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
-                                                    <property name="flag">wxALIGN_CENTER</property>
+                                                    <property name="flag">wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP</property>
                                                     <property name="proportion">0</property>
                                                     <object class="wxTextCtrl" expanded="0">
                                                         <property name="BottomDockable">1</property>
@@ -3227,7 +3227,7 @@
                                                         <property name="style"></property>
                                                         <property name="subclass"></property>
                                                         <property name="toolbar_pane">0</property>
-                                                        <property name="tooltip"></property>
+                                                        <property name="tooltip">Unicode hexadecimal code</property>
                                                         <property name="validator_data_type"></property>
                                                         <property name="validator_style">wxFILTER_NONE</property>
                                                         <property name="validator_type">wxDefaultValidator</property>
@@ -3265,6 +3265,97 @@
                                                         <event name="OnUpdateUI"></event>
                                                     </object>
                                                 </object>
+                                                <object class="sizeritem" expanded="0">
+                                                    <property name="border">5</property>
+                                                    <property name="flag">wxALL|wxEXPAND</property>
+                                                    <property name="proportion">1</property>
+                                                    <object class="wxTextCtrl" 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_ANY</property>
+                                                        <property name="max_size"></property>
+                                                        <property name="maximize_button">0</property>
+                                                        <property name="maximum_size"></property>
+                                                        <property name="maxlength"></property>
+                                                        <property name="min_size"></property>
+                                                        <property name="minimize_button">0</property>
+                                                        <property name="minimum_size"></property>
+                                                        <property name="moveable">1</property>
+                                                        <property name="name">m_shortcut</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">wxTE_CENTRE|wxTE_READONLY</property>
+                                                        <property name="subclass"></property>
+                                                        <property name="toolbar_pane">0</property>
+                                                        <property name="tooltip">Keyboard shortcut in Composer window</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"></property>
+                                                        <property name="window_extra_style"></property>
+                                                        <property name="window_name"></property>
+                                                        <property name="window_style"></property>
+                                                        <event name="OnChar"></event>
+                                                        <event name="OnEnterWindow"></event>
+                                                        <event name="OnEraseBackground"></event>
+                                                        <event name="OnKeyDown"></event>
+                                                        <event name="OnKeyUp"></event>
+                                                        <event name="OnKillFocus"></event>
+                                                        <event name="OnLeaveWindow"></event>
+                                                        <event name="OnLeftDClick"></event>
+                                                        <event name="OnLeftDown"></event>
+                                                        <event name="OnLeftUp"></event>
+                                                        <event name="OnMiddleDClick"></event>
+                                                        <event name="OnMiddleDown"></event>
+                                                        <event name="OnMiddleUp"></event>
+                                                        <event name="OnMotion"></event>
+                                                        <event name="OnMouseEvents"></event>
+                                                        <event name="OnMouseWheel"></event>
+                                                        <event name="OnPaint"></event>
+                                                        <event name="OnRightDClick"></event>
+                                                        <event name="OnRightDown"></event>
+                                                        <event name="OnRightUp"></event>
+                                                        <event name="OnSetFocus"></event>
+                                                        <event name="OnSize"></event>
+                                                        <event name="OnText"></event>
+                                                        <event name="OnTextEnter"></event>
+                                                        <event name="OnTextMaxLen"></event>
+                                                        <event name="OnTextURL"></event>
+                                                        <event name="OnUpdateUI"></event>
+                                                    </object>
+                                                </object>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -3349,7 +3440,7 @@
                                                 <property name="size"></property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">Character preview</property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style">wxSTATIC_BORDER</property>
@@ -3463,7 +3554,7 @@
                                                 <property name="style">wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY</property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">Unicode character description</property>
                                                 <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
@@ -3554,7 +3645,7 @@
                                                 <property name="style">wxTE_CENTRE|wxTE_READONLY</property>
                                                 <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">Unicode character category</property>
                                                 <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
@@ -3873,7 +3964,7 @@
                                                 <property name="size">-1,-1</property>
                                                 <property name="subclass">wxZRColaCharGrid; zrcolachrgrid.h</property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
+                                                <property name="tooltip">List of related characters</property>
                                                 <property name="window_extra_style"></property>
                                                 <property name="window_name"></property>
                                                 <property name="window_style">wxSTATIC_BORDER</property>
diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index 9c00165..64e598e 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: 2016-05-27 09:29+0200\n"
+"POT-Creation-Date: 2016-05-31 08:25+0200\n"
 "PO-Revision-Date: 2016-05-13 15:52+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -235,7 +235,7 @@ msgstr "Prilepi izbor"
 msgid "Edit"
 msgstr "Urejanje"
 
-#: zrcolagui.cpp:170 zrcolagui.h:236
+#: zrcolagui.cpp:170 zrcolagui.h:238
 #, fuzzy
 msgid "Character Selector"
 msgstr "Izbirnik znaka"
@@ -290,72 +290,119 @@ msgstr "Unicode sestavljenega"
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: zrcolagui.cpp:427
+#: zrcolagui.cpp:418
+msgid ""
+"Full or partial terms from Unicode character description (in English) to "
+"search for"
+msgstr ""
+
+#: zrcolagui.cpp:424
+msgid "List of Unicode character categories to search in"
+msgstr ""
+
+#: zrcolagui.cpp:431
 #, fuzzy
 msgid "All"
 msgstr "Vse"
 
-#: zrcolagui.cpp:428
-msgid "Select all categories"
-msgstr ""
-
 #: zrcolagui.cpp:432
 #, fuzzy
+msgid "Select all categories"
+msgstr "Izberi vse kategorije"
+
+#: zrcolagui.cpp:436
+#, fuzzy
 msgid "None"
 msgstr "Nič"
 
-#: zrcolagui.cpp:433
-msgid "Clear category selection"
-msgstr ""
-
 #: zrcolagui.cpp:437
 #, fuzzy
+msgid "Clear category selection"
+msgstr "Počisti izbor kategorij"
+
+#: zrcolagui.cpp:441
+#, fuzzy
 msgid "Invert"
 msgstr "Obrni"
 
-#: zrcolagui.cpp:438
+#: zrcolagui.cpp:442
+#, fuzzy
 msgid "Invert category selection"
+msgstr "Obrni izbor kategorij"
+
+#: zrcolagui.cpp:475
+msgid "Character search results"
 msgstr ""
 
-#: zrcolagui.cpp:480
+#: zrcolagui.cpp:485
 #, fuzzy
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:513
+msgid "List of recently inserted characters"
+msgstr ""
+
+#: zrcolagui.cpp:527
 #, fuzzy
 msgid "Preview"
 msgstr "Predogled:"
 
-#: zrcolagui.cpp:526
+#: zrcolagui.cpp:532
 #, fuzzy
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:576
+#: zrcolagui.cpp:537
+msgid "Unicode hexadecimal code"
+msgstr ""
+
+#: zrcolagui.cpp:542
+msgid "Keyboard shortcut in Composer window"
+msgstr ""
+
+#: zrcolagui.cpp:577
+msgid "Character preview"
+msgstr ""
+
+#: zrcolagui.cpp:582
+msgid "Unicode character description"
+msgstr ""
+
+#: zrcolagui.cpp:587
+msgid "Unicode character category"
+msgstr ""
+
+#: zrcolagui.cpp:594
 #, fuzzy
 msgid "« Back"
 msgstr "< &Nazaj"
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:596
+#, fuzzy
 msgid "To previously viewed character"
-msgstr ""
+msgstr "Na prejšnji prikazan znak"
 
-#: zrcolagui.cpp:582
+#: zrcolagui.cpp:600
 #, fuzzy
 msgid "Forward »"
-msgstr "&Naprej"
+msgstr "Naprej »"
 
-#: zrcolagui.cpp:584
+#: zrcolagui.cpp:602
+#, fuzzy
 msgid "To following viewed character"
-msgstr ""
+msgstr "Na naslednji prikazan znak"
 
-#: zrcolagui.cpp:595
+#: zrcolagui.cpp:613
 #, fuzzy
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: zrcolagui.cpp:705
+#: zrcolagui.cpp:640
+msgid "List of related characters"
+msgstr ""
+
+#: zrcolagui.cpp:727
 #, fuzzy
 msgid ""
 "Some character native to specific language you are working with should not "
@@ -366,22 +413,22 @@ msgstr ""
 "razstaviti v dele.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: zrcolagui.cpp:709
+#: zrcolagui.cpp:731
 #, fuzzy
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: zrcolagui.cpp:712
+#: zrcolagui.cpp:734
 #, fuzzy
 msgid "&Manually select the language from the list below:"
 msgstr "Ročno izberi jezik na spodnje&m spisku:"
 
-#: zrcolagui.cpp:724
+#: zrcolagui.cpp:746
 #, fuzzy
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: zrcolagui.cpp:729
+#: zrcolagui.cpp:751
 #, fuzzy
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
@@ -392,17 +439,17 @@ msgstr ""
 "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
 "bližnjic Win+F5 in Win+F6."
 
-#: zrcolagui.cpp:733
+#: zrcolagui.cpp:755
 #, fuzzy
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.cpp:740
+#: zrcolagui.cpp:762
 #, fuzzy
 msgid "Startup"
 msgstr "Zagon"
 
-#: zrcolagui.cpp:819
+#: zrcolagui.cpp:841
 #, fuzzy
 msgid ""
 "Editor: Janoš Ježovnik\n"
@@ -413,22 +460,22 @@ msgstr ""
 "Razvoj: Amebis d. o. o.\n"
 "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
 
-#: zrcolagui.cpp:827
+#: zrcolagui.cpp:849
 #, fuzzy
 msgid "www.zrc-sazu.si"
 msgstr "www.zrc-sazu.si"
 
-#: zrcolagui.cpp:866
+#: zrcolagui.cpp:888
 #, fuzzy
 msgid "Log"
 msgstr "Dnevnik"
 
-#: zrcolagui.cpp:882
+#: zrcolagui.cpp:904
 #, fuzzy
 msgid "&Update"
 msgstr "&Posodobi"
 
-#: zrcolagui.cpp:887
+#: zrcolagui.cpp:909
 #, fuzzy
 msgid "&Close"
 msgstr "&Zapri"
@@ -447,17 +494,17 @@ msgstr ""
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.h:273
+#: zrcolagui.h:275
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: zrcolagui.h:297
+#: zrcolagui.h:299
 #, fuzzy
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: zrcolagui.h:320
+#: zrcolagui.h:322
 #, fuzzy
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po
index bf72fde..64c48a6 100644
--- a/ZRCola/locale/de_DE.po
+++ b/ZRCola/locale/de_DE.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-05-27 09:31+0200\n"
-"PO-Revision-Date: 2016-05-27 09:31+0200\n"
+"POT-Creation-Date: 2016-05-31 08:29+0200\n"
+"PO-Revision-Date: 2016-05-31 08:29+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: de_DE\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -203,7 +203,7 @@ msgstr "Auswahl einfügen"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: zrcolagui.cpp:170 zrcolagui.h:236
+#: zrcolagui.cpp:170 zrcolagui.h:238
 msgid "Character Selector"
 msgstr ""
 
@@ -248,126 +248,170 @@ msgstr ""
 msgid "&Browse"
 msgstr "Durchsuchen"
 
-#: zrcolagui.cpp:427
+#: zrcolagui.cpp:418
+msgid ""
+"Full or partial terms from Unicode character description (in English) to "
+"search for"
+msgstr ""
+
+#: zrcolagui.cpp:424
+msgid "List of Unicode character categories to search in"
+msgstr ""
+
+#: zrcolagui.cpp:431
 #, fuzzy
 msgid "All"
 msgstr "Alle"
 
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:432
 msgid "Select all categories"
 msgstr ""
 
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:436
 #, fuzzy
 msgid "None"
 msgstr "Kein"
 
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:437
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Auswahl kopieren"
 
-#: zrcolagui.cpp:437
+#: zrcolagui.cpp:441
 msgid "Invert"
 msgstr ""
 
-#: zrcolagui.cpp:438
+#: zrcolagui.cpp:442
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"
 
-#: zrcolagui.cpp:480
+#: zrcolagui.cpp:475
+#, fuzzy
+msgid "Character search results"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.cpp:485
 msgid "Re&cently Used"
 msgstr ""
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:513
+msgid "List of recently inserted characters"
+msgstr ""
+
+#: zrcolagui.cpp:527
 #, fuzzy
 msgid "Preview"
 msgstr " Vorschau"
 
-#: zrcolagui.cpp:526
+#: zrcolagui.cpp:532
 #, fuzzy
 msgid "U+"
 msgstr "Hilfeverzeichnis %u nicht gefunden."
 
-#: zrcolagui.cpp:576
+#: zrcolagui.cpp:537
+msgid "Unicode hexadecimal code"
+msgstr ""
+
+#: zrcolagui.cpp:542
+msgid "Keyboard shortcut in Composer window"
+msgstr ""
+
+#: zrcolagui.cpp:577
+#, fuzzy
+msgid "Character preview"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.cpp:582
+msgid "Unicode character description"
+msgstr ""
+
+#: zrcolagui.cpp:587
+msgid "Unicode character category"
+msgstr ""
+
+#: zrcolagui.cpp:594
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:596
 msgid "To previously viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:582
+#: zrcolagui.cpp:600
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"
 
-#: zrcolagui.cpp:584
+#: zrcolagui.cpp:602
 msgid "To following viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:595
+#: zrcolagui.cpp:613
 msgid "Re&lated"
 msgstr ""
 
-#: zrcolagui.cpp:705
+#: zrcolagui.cpp:640
+msgid "List of related characters"
+msgstr ""
+
+#: zrcolagui.cpp:727
 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."
 msgstr ""
 
-#: zrcolagui.cpp:709
+#: zrcolagui.cpp:731
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""
 
-#: zrcolagui.cpp:712
+#: zrcolagui.cpp:734
 msgid "&Manually select the language from the list below:"
 msgstr ""
 
-#: zrcolagui.cpp:724
+#: zrcolagui.cpp:746
 msgid "Text Language"
 msgstr ""
 
-#: zrcolagui.cpp:729
+#: zrcolagui.cpp:751
 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."
 msgstr ""
 
-#: zrcolagui.cpp:733
+#: zrcolagui.cpp:755
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: zrcolagui.cpp:740
+#: zrcolagui.cpp:762
 msgid "Startup"
 msgstr ""
 
-#: zrcolagui.cpp:819
+#: zrcolagui.cpp:841
 msgid ""
 "Editor: Janoš Ježovnik\n"
 "Development: Amebis d. o. o.\n"
 "Development and maintenance (2004-2015): dr. Peter Weiss"
 msgstr ""
 
-#: zrcolagui.cpp:827
+#: zrcolagui.cpp:849
 msgid "www.zrc-sazu.si"
 msgstr ""
 
-#: zrcolagui.cpp:866
+#: zrcolagui.cpp:888
 #, fuzzy
 msgid "Log"
 msgstr "&Log"
 
-#: zrcolagui.cpp:882
+#: zrcolagui.cpp:904
 #, fuzzy
 msgid "&Update"
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
 
-#: zrcolagui.cpp:887
+#: zrcolagui.cpp:909
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"
@@ -382,15 +426,15 @@ msgstr ""
 msgid "Start ZRCola automatically on logon"
 msgstr ""
 
-#: zrcolagui.h:273
+#: zrcolagui.h:275
 msgid "Settings"
 msgstr ""
 
-#: zrcolagui.h:297
+#: zrcolagui.h:299
 msgid "About ZRCola"
 msgstr ""
 
-#: zrcolagui.h:320
+#: zrcolagui.h:322
 msgid "Product Update"
 msgstr ""
 
diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po
index 231e845..2acac96 100644
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-05-27 09:31+0200\n"
-"PO-Revision-Date: 2016-05-27 09:31+0200\n"
+"POT-Creation-Date: 2016-05-31 08:29+0200\n"
+"PO-Revision-Date: 2016-05-31 08:29+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: zrcolagui.cpp:170 zrcolagui.h:236
+#: zrcolagui.cpp:170 zrcolagui.h:238
 msgid "Character Selector"
 msgstr ""
 
@@ -234,117 +234,161 @@ msgstr ""
 msgid "&Browse"
 msgstr ""
 
-#: zrcolagui.cpp:427
+#: zrcolagui.cpp:418
+msgid ""
+"Full or partial terms from Unicode character description (in English) to "
+"search for"
+msgstr ""
+
+#: zrcolagui.cpp:424
+msgid "List of Unicode character categories to search in"
+msgstr ""
+
+#: zrcolagui.cpp:431
 #, fuzzy
 msgid "All"
 msgstr "Alt"
 
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:432
 msgid "Select all categories"
 msgstr ""
 
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:436
 msgid "None"
 msgstr ""
 
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:437
 msgid "Clear category selection"
 msgstr ""
 
-#: zrcolagui.cpp:437
+#: zrcolagui.cpp:441
 msgid "Invert"
 msgstr ""
 
-#: zrcolagui.cpp:438
+#: zrcolagui.cpp:442
 msgid "Invert category selection"
 msgstr ""
 
-#: zrcolagui.cpp:480
+#: zrcolagui.cpp:475
+#, fuzzy
+msgid "Character search results"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.cpp:485
 msgid "Re&cently Used"
 msgstr ""
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:513
+msgid "List of recently inserted characters"
+msgstr ""
+
+#: zrcolagui.cpp:527
 msgid "Preview"
 msgstr ""
 
-#: zrcolagui.cpp:526
+#: zrcolagui.cpp:532
 msgid "U+"
 msgstr ""
 
-#: zrcolagui.cpp:576
+#: zrcolagui.cpp:537
+msgid "Unicode hexadecimal code"
+msgstr ""
+
+#: zrcolagui.cpp:542
+msgid "Keyboard shortcut in Composer window"
+msgstr ""
+
+#: zrcolagui.cpp:577
+#, fuzzy
+msgid "Character preview"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.cpp:582
+msgid "Unicode character description"
+msgstr ""
+
+#: zrcolagui.cpp:587
+msgid "Unicode character category"
+msgstr ""
+
+#: zrcolagui.cpp:594
 msgid "« Back"
 msgstr ""
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:596
 msgid "To previously viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:582
+#: zrcolagui.cpp:600
 msgid "Forward »"
 msgstr ""
 
-#: zrcolagui.cpp:584
+#: zrcolagui.cpp:602
 msgid "To following viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:595
+#: zrcolagui.cpp:613
 msgid "Re&lated"
 msgstr ""
 
-#: zrcolagui.cpp:705
+#: zrcolagui.cpp:640
+msgid "List of related characters"
+msgstr ""
+
+#: zrcolagui.cpp:727
 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."
 msgstr ""
 
-#: zrcolagui.cpp:709
+#: zrcolagui.cpp:731
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""
 
-#: zrcolagui.cpp:712
+#: zrcolagui.cpp:734
 msgid "&Manually select the language from the list below:"
 msgstr ""
 
-#: zrcolagui.cpp:724
+#: zrcolagui.cpp:746
 msgid "Text Language"
 msgstr ""
 
-#: zrcolagui.cpp:729
+#: zrcolagui.cpp:751
 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."
 msgstr ""
 
-#: zrcolagui.cpp:733
+#: zrcolagui.cpp:755
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: zrcolagui.cpp:740
+#: zrcolagui.cpp:762
 msgid "Startup"
 msgstr ""
 
-#: zrcolagui.cpp:819
+#: zrcolagui.cpp:841
 msgid ""
 "Editor: Janoš Ježovnik\n"
 "Development: Amebis d. o. o.\n"
 "Development and maintenance (2004-2015): dr. Peter Weiss"
 msgstr ""
 
-#: zrcolagui.cpp:827
+#: zrcolagui.cpp:849
 msgid "www.zrc-sazu.si"
 msgstr ""
 
-#: zrcolagui.cpp:866
+#: zrcolagui.cpp:888
 msgid "Log"
 msgstr ""
 
-#: zrcolagui.cpp:882
+#: zrcolagui.cpp:904
 msgid "&Update"
 msgstr ""
 
-#: zrcolagui.cpp:887
+#: zrcolagui.cpp:909
 msgid "&Close"
 msgstr ""
 
@@ -358,15 +402,15 @@ msgstr ""
 msgid "Start ZRCola automatically on logon"
 msgstr ""
 
-#: zrcolagui.h:273
+#: zrcolagui.h:275
 msgid "Settings"
 msgstr ""
 
-#: zrcolagui.h:297
+#: zrcolagui.h:299
 msgid "About ZRCola"
 msgstr ""
 
-#: zrcolagui.h:320
+#: zrcolagui.h:322
 msgid "Product Update"
 msgstr ""
 
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 911ae8d..652e11d 100644
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-05-27 09:30+0200\n"
-"PO-Revision-Date: 2016-05-27 09:31+0200\n"
+"POT-Creation-Date: 2016-05-31 08:26+0200\n"
+"PO-Revision-Date: 2016-05-31 08:29+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: sl_SI\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:809 zrcolagui.h:102
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:831 zrcolagui.h:102
 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
@@ -193,7 +193,7 @@ msgstr "Prilepi izbor"
 msgid "Edit"
 msgstr "Urejanje"
 
-#: zrcolagui.cpp:170 zrcolagui.h:236
+#: zrcolagui.cpp:170 zrcolagui.h:238
 msgid "Character Selector"
 msgstr "Izbirnik znaka"
 
@@ -237,63 +237,106 @@ msgstr "Unicode sestavljenega"
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: zrcolagui.cpp:427
+#: zrcolagui.cpp:418
+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"
+
+#: zrcolagui.cpp:424
+msgid "List of Unicode character categories to search in"
+msgstr "Seznam kategorij znaka Unicode za iskanje"
+
+#: zrcolagui.cpp:431
 msgid "All"
 msgstr "Vse"
 
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:432
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:436
 msgid "None"
 msgstr "Nič"
 
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:437
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: zrcolagui.cpp:437
+#: zrcolagui.cpp:441
 msgid "Invert"
 msgstr "Obrni"
 
-#: zrcolagui.cpp:438
+#: zrcolagui.cpp:442
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: zrcolagui.cpp:480
+#: zrcolagui.cpp:475
+msgid "Character search results"
+msgstr "Rezultati iskanja znakov"
+
+#: zrcolagui.cpp:485
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:513
+msgid "List of recently inserted characters"
+msgstr "Seznam nedavno vstavljenih znakov"
+
+#: zrcolagui.cpp:527
 msgid "Preview"
 msgstr "Predogled"
 
-#: zrcolagui.cpp:526
+#: zrcolagui.cpp:532
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:576
+#: zrcolagui.cpp:537
+msgid "Unicode hexadecimal code"
+msgstr "Šestnajstiška koda Unicode"
+
+#: zrcolagui.cpp:542
+msgid "Keyboard shortcut in Composer window"
+msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
+
+#: zrcolagui.cpp:577
+msgid "Character preview"
+msgstr "Predogled znaka"
+
+#: zrcolagui.cpp:582
+msgid "Unicode character description"
+msgstr "Opis znaka Unicode"
+
+#: zrcolagui.cpp:587
+msgid "Unicode character category"
+msgstr "Kategorija znaka Unicode"
+
+#: zrcolagui.cpp:594
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:596
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: zrcolagui.cpp:582
+#: zrcolagui.cpp:600
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: zrcolagui.cpp:584
+#: zrcolagui.cpp:602
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: zrcolagui.cpp:595
+#: zrcolagui.cpp:613
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: zrcolagui.cpp:705
+#: zrcolagui.cpp:640
+msgid "List of related characters"
+msgstr "Seznam sorodnih znakov"
+
+#: zrcolagui.cpp:727
 msgid ""
 "Some character native to specific language you are working with should not "
 "decompose to primitives.\n"
@@ -303,19 +346,19 @@ msgstr ""
 "razstaviti v dele.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: zrcolagui.cpp:709
+#: zrcolagui.cpp:731
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: zrcolagui.cpp:712
+#: zrcolagui.cpp:734
 msgid "&Manually select the language from the list below:"
 msgstr "Ročno izberi jezik na spodnje&m spisku:"
 
-#: zrcolagui.cpp:724
+#: zrcolagui.cpp:746
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: zrcolagui.cpp:729
+#: zrcolagui.cpp:751
 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 "
@@ -325,15 +368,15 @@ msgstr ""
 "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
 "bližnjic Win+F5 in Win+F6."
 
-#: zrcolagui.cpp:733
+#: zrcolagui.cpp:755
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.cpp:740
+#: zrcolagui.cpp:762
 msgid "Startup"
 msgstr "Zagon"
 
-#: zrcolagui.cpp:819
+#: zrcolagui.cpp:841
 msgid ""
 "Editor: Janoš Ježovnik\n"
 "Development: Amebis d. o. o.\n"
@@ -343,19 +386,19 @@ msgstr ""
 "Razvoj: Amebis d. o. o.\n"
 "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
 
-#: zrcolagui.cpp:827
+#: zrcolagui.cpp:849
 msgid "www.zrc-sazu.si"
 msgstr "www.zrc-sazu.si"
 
-#: zrcolagui.cpp:866
+#: zrcolagui.cpp:888
 msgid "Log"
 msgstr "Dnevnik"
 
-#: zrcolagui.cpp:882
+#: zrcolagui.cpp:904
 msgid "&Update"
 msgstr "&Posodobi"
 
-#: zrcolagui.cpp:887
+#: zrcolagui.cpp:909
 msgid "&Close"
 msgstr "&Zapri"
 
@@ -371,15 +414,15 @@ msgstr ""
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.h:273
+#: zrcolagui.h:275
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: zrcolagui.h:297
+#: zrcolagui.h:299
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: zrcolagui.h:320
+#: zrcolagui.h:322
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp
index 7ecd66b..c2815eb 100644
--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -83,6 +83,21 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                 const ZRCola::character_db::character &chr = app->m_chr_db.idxChr[start];
                 // Update characted description.
                 m_description->SetValue(wxString(chr.data, chr.desc_len));
+                {
+                    // See if this character has a key sequence registered.
+                    ZRCola::keyseq_db::indexKey::size_type start;
+                    char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
+                    ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_char;
+                    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
+                        ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
+                        wxString ks_str;
+                        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
+                            m_shortcut->SetValue(ks_str);
+                        else
+                            m_shortcut->SetValue(wxEmptyString);
+                    } else
+                        m_shortcut->SetValue(wxEmptyString);
+                }
                 {
                     char cc[sizeof(ZRCola::chrcat_db::chrcat)] = {};
                     ((ZRCola::chrcat_db::chrcat*)cc)->id = chr.cat;
@@ -98,6 +113,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                 m_gridRelated->SetCharacters(wxString(chr.data + chr.desc_len, chr.rel_len));
             } else {
                 m_description->SetValue(wxEmptyString);
+                m_shortcut->SetValue(wxEmptyString);
                 m_category->SetValue(wxEmptyString);
                 m_gridRelated->ClearGrid();
             }
@@ -344,7 +360,6 @@ void wxZRColaCharSelect::OnNavigateForward(wxHyperlinkEvent& event)
 }
 
 
-
 void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)
 {
     if (m_unicodeChanged) return;
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index 8159050..11d1423 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -415,10 +415,14 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_search->ShowSearchButton( true );
 	#endif
 	m_search->ShowCancelButton( true );
+	m_search->SetToolTip( _("Full or partial terms from Unicode character description (in English) to search for") );
+	
 	sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 );
 	
 	wxArrayString m_categoriesChoices;
 	m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 );
+	m_categories->SetToolTip( _("List of Unicode character categories to search in") );
+	
 	sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizerCategoriesCtrl;
@@ -468,6 +472,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
 	m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+	m_gridResults->SetToolTip( _("Character search results") );
 	m_gridResults->SetMinSize( wxSize( 560,35 ) );
 	m_gridResults->SetMaxSize( wxSize( 560,-1 ) );
 	
@@ -505,6 +510,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
 	m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridRecent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+	m_gridRecent->SetToolTip( _("List of recently inserted characters") );
 	
 	sbSizerRecent->Add( m_gridRecent, 0, wxALL|wxEXPAND, 5 );
 	
@@ -525,15 +531,22 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	
 	m_labelUnicode = new wxStaticText( sbSizerPreview->GetStaticBox(), wxID_ANY, _("U+"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_labelUnicode->Wrap( -1 );
-	bSizerUnicode->Add( m_labelUnicode, 0, wxALIGN_CENTER, 5 );
+	bSizerUnicode->Add( m_labelUnicode, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxTOP, 5 );
 	
 	m_unicode = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), 0 );
-	bSizerUnicode->Add( m_unicode, 0, wxALIGN_CENTER, 5 );
+	m_unicode->SetToolTip( _("Unicode hexadecimal code") );
+	
+	bSizerUnicode->Add( m_unicode, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP, 5 );
+	
+	m_shortcut = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY );
+	m_shortcut->SetToolTip( _("Keyboard shortcut in Composer window") );
+	
+	bSizerUnicode->Add( m_shortcut, 1, wxALL|wxEXPAND, 5 );
 	
 	
-	sbSizerPreview->Add( bSizerUnicode, 0, wxALIGN_CENTER|wxALL, 5 );
+	sbSizerPreview->Add( bSizerUnicode, 0, wxEXPAND, 5 );
 	
-	m_gridPreview = new wxGrid( sbSizerPreview->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+	m_gridPreview = new wxGrid( sbSizerPreview->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER );
 	
 	// Grid
 	m_gridPreview->CreateGrid( 1, 1 );
@@ -561,13 +574,18 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("00 ZRCola") ) );
 	m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+	m_gridPreview->SetToolTip( _("Character preview") );
 	
 	sbSizerPreview->Add( m_gridPreview, 0, wxALL|wxEXPAND, 5 );
 	
 	m_description = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY );
+	m_description->SetToolTip( _("Unicode character description") );
+	
 	sbSizerPreview->Add( m_description, 1, wxALL|wxEXPAND, 5 );
 	
 	m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY );
+	m_category->SetToolTip( _("Unicode character category") );
+	
 	sbSizerPreview->Add( m_category, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizerNavigateButtons;
@@ -619,6 +637,8 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Cell Defaults
 	m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
 	m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	m_gridRelated->SetToolTip( _("List of related characters") );
+	
 	sbSizerRelated->Add( m_gridRelated, 1, wxALL|wxEXPAND, 5 );
 	
 	
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index 818b5fa..684c9d0 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -201,6 +201,7 @@ class wxZRColaCharSelectBase : public wxDialog
 		wxZRColaCharGrid* m_gridRecent;
 		wxStaticText* m_labelUnicode;
 		wxTextCtrl* m_unicode;
+		wxTextCtrl* m_shortcut;
 		wxGrid* m_gridPreview;
 		wxTextCtrl* m_description;
 		wxTextCtrl* m_category;