diff --git a/core/generator_pdf/generator_pdf.cpp b/core/generator_pdf/generator_pdf.cpp
index 68498a3d4..1d7e60d31 100644
--- a/core/generator_pdf/generator_pdf.cpp
+++ b/core/generator_pdf/generator_pdf.cpp
@@ -893,6 +893,11 @@ void PDFGenerator::addAnnotations( Page * pdfPage, KPDFPage * page )
                 t->textType = TextAnnotation::Linked;
                 // -> textIcon
                 XPDFReader::lookupName( annotDict, "Name", t->textIcon );
+                if ( !t->textIcon.isEmpty() )
+                {
+                    t->textIcon = t->textIcon.lower();
+                    t->textIcon.remove( ' ' );
+                }
                 // request for postprocessing window geometry
                 PostProcessText request;
                 request.textAnnotation = t;
diff --git a/ui/data/Makefile.am b/ui/data/Makefile.am
index 85d0f7244..07da4a779 100644
--- a/ui/data/Makefile.am
+++ b/ui/data/Makefile.am
@@ -1,6 +1,15 @@
-pics_DATA = highlight_green.png highlight_orange.png highlight_pink.png \
-            highlight_yellow.png pencil.png pinnote.png coprex-white.png
-picsdir = $(kde_datadir)/kpdf/pics
+# install annotation tool images
+toolpicsdir = $(kde_datadir)/kpdf/pics
+toolpics_DATA = tool_eraser.png tool_hl_orange.png tool_hl_pink.png \
+                tool_hl_yellow.png tool_ink_green.png tool_note.png
 
-xml_DATA = tools.xml
+# install annotation page images
+annpicsdir = $(kde_datadir)/kpdf/pics
+annpics_DATA = checkmark.png circle.png comment.png cross.png help.png \
+               insert.png key.png newparagraph.png note.png paragraph.png \
+               rightarrow.png rightpointer.png star.png uparrow.png \
+               upleftarrow.png
+
+# install annotator xml tools description
 xmldir = $(kde_datadir)/kpdf
+xml_DATA = tools.xml
diff --git a/ui/data/checkmark.png b/ui/data/checkmark.png
new file mode 100644
index 000000000..0f33b7dcd
Binary files /dev/null and b/ui/data/checkmark.png differ
diff --git a/ui/data/circle.png b/ui/data/circle.png
new file mode 100644
index 000000000..ec95f6348
Binary files /dev/null and b/ui/data/circle.png differ
diff --git a/ui/data/comment.png b/ui/data/comment.png
new file mode 100644
index 000000000..d97750d3d
Binary files /dev/null and b/ui/data/comment.png differ
diff --git a/ui/data/cross.png b/ui/data/cross.png
new file mode 100644
index 000000000..8b318d9f2
Binary files /dev/null and b/ui/data/cross.png differ
diff --git a/ui/data/help.png b/ui/data/help.png
new file mode 100644
index 000000000..1ef1b676b
Binary files /dev/null and b/ui/data/help.png differ
diff --git a/ui/data/highlight_green.png b/ui/data/highlight_green.png
deleted file mode 100644
index ebdb24888..000000000
Binary files a/ui/data/highlight_green.png and /dev/null differ
diff --git a/ui/data/insert.png b/ui/data/insert.png
new file mode 100644
index 000000000..14238be87
Binary files /dev/null and b/ui/data/insert.png differ
diff --git a/ui/data/key.png b/ui/data/key.png
new file mode 100644
index 000000000..ffc49a62a
Binary files /dev/null and b/ui/data/key.png differ
diff --git a/ui/data/newparagraph.png b/ui/data/newparagraph.png
new file mode 100644
index 000000000..20573f8f4
Binary files /dev/null and b/ui/data/newparagraph.png differ
diff --git a/ui/data/note.png b/ui/data/note.png
new file mode 100644
index 000000000..73c5c477b
Binary files /dev/null and b/ui/data/note.png differ
diff --git a/ui/data/paragraph.png b/ui/data/paragraph.png
new file mode 100644
index 000000000..5a9bdd121
Binary files /dev/null and b/ui/data/paragraph.png differ
diff --git a/ui/data/rightarrow.png b/ui/data/rightarrow.png
new file mode 100644
index 000000000..80e925fdd
Binary files /dev/null and b/ui/data/rightarrow.png differ
diff --git a/ui/data/rightpointer.png b/ui/data/rightpointer.png
new file mode 100644
index 000000000..88f1f3fb5
Binary files /dev/null and b/ui/data/rightpointer.png differ
diff --git a/ui/data/sources/checkmark.svgz b/ui/data/sources/checkmark.svgz
new file mode 100644
index 000000000..6698603a3
Binary files /dev/null and b/ui/data/sources/checkmark.svgz differ
diff --git a/ui/data/sources/circle.svgz b/ui/data/sources/circle.svgz
new file mode 100644
index 000000000..334f2be2f
Binary files /dev/null and b/ui/data/sources/circle.svgz differ
diff --git a/ui/data/sources/comment.svgz b/ui/data/sources/comment.svgz
new file mode 100644
index 000000000..57775fb5b
Binary files /dev/null and b/ui/data/sources/comment.svgz differ
diff --git a/ui/data/sources/cross.svgz b/ui/data/sources/cross.svgz
new file mode 100644
index 000000000..9325c5d01
Binary files /dev/null and b/ui/data/sources/cross.svgz differ
diff --git a/ui/data/sources/help.svgz b/ui/data/sources/help.svgz
new file mode 100644
index 000000000..02df8e860
Binary files /dev/null and b/ui/data/sources/help.svgz differ
diff --git a/ui/data/sources/insert.svgz b/ui/data/sources/insert.svgz
new file mode 100644
index 000000000..0bd6e2911
Binary files /dev/null and b/ui/data/sources/insert.svgz differ
diff --git a/ui/data/sources/key.svgz b/ui/data/sources/key.svgz
new file mode 100644
index 000000000..8394542e9
Binary files /dev/null and b/ui/data/sources/key.svgz differ
diff --git a/ui/data/sources/newparagraph.svgz b/ui/data/sources/newparagraph.svgz
new file mode 100644
index 000000000..b91e2add0
Binary files /dev/null and b/ui/data/sources/newparagraph.svgz differ
diff --git a/ui/data/sources/note.svgz b/ui/data/sources/note.svgz
new file mode 100644
index 000000000..b36c6e87d
Binary files /dev/null and b/ui/data/sources/note.svgz differ
diff --git a/ui/data/sources/paragraph.svgz b/ui/data/sources/paragraph.svgz
new file mode 100644
index 000000000..bb39694fe
Binary files /dev/null and b/ui/data/sources/paragraph.svgz differ
diff --git a/ui/data/sources/rightarrow.svgz b/ui/data/sources/rightarrow.svgz
new file mode 100644
index 000000000..1cd9836f8
Binary files /dev/null and b/ui/data/sources/rightarrow.svgz differ
diff --git a/ui/data/sources/rightpointer.svgz b/ui/data/sources/rightpointer.svgz
new file mode 100644
index 000000000..9c5df8fa2
Binary files /dev/null and b/ui/data/sources/rightpointer.svgz differ
diff --git a/ui/data/sources/star.svgz b/ui/data/sources/star.svgz
new file mode 100644
index 000000000..659a0c850
Binary files /dev/null and b/ui/data/sources/star.svgz differ
diff --git a/ui/data/sources/uparrow.svgz b/ui/data/sources/uparrow.svgz
new file mode 100644
index 000000000..54d908dbc
Binary files /dev/null and b/ui/data/sources/uparrow.svgz differ
diff --git a/ui/data/sources/upleftarrow.svgz b/ui/data/sources/upleftarrow.svgz
new file mode 100644
index 000000000..e4575b4f7
Binary files /dev/null and b/ui/data/sources/upleftarrow.svgz differ
diff --git a/ui/data/star.png b/ui/data/star.png
new file mode 100644
index 000000000..9b9111ce9
Binary files /dev/null and b/ui/data/star.png differ
diff --git a/ui/data/coprex-white.png b/ui/data/tool_eraser.png
similarity index 100%
rename from ui/data/coprex-white.png
rename to ui/data/tool_eraser.png
diff --git a/ui/data/highlight_orange.png b/ui/data/tool_hl_orange.png
similarity index 100%
rename from ui/data/highlight_orange.png
rename to ui/data/tool_hl_orange.png
diff --git a/ui/data/highlight_pink.png b/ui/data/tool_hl_pink.png
similarity index 100%
rename from ui/data/highlight_pink.png
rename to ui/data/tool_hl_pink.png
diff --git a/ui/data/highlight_yellow.png b/ui/data/tool_hl_yellow.png
similarity index 100%
rename from ui/data/highlight_yellow.png
rename to ui/data/tool_hl_yellow.png
diff --git a/ui/data/pencil.png b/ui/data/tool_ink_green.png
similarity index 100%
rename from ui/data/pencil.png
rename to ui/data/tool_ink_green.png
diff --git a/ui/data/pinnote.png b/ui/data/tool_note.png
similarity index 100%
rename from ui/data/pinnote.png
rename to ui/data/tool_note.png
diff --git a/ui/data/tools.xml b/ui/data/tools.xml
index e03efd763..1903060f2 100644
--- a/ui/data/tools.xml
+++ b/ui/data/tools.xml
@@ -17,47 +17,40 @@ Engine/Annotation Types [specific attributes]:
     Geom
 -->
 <annotatingTools>
-  <tool id="1" name="Yellow Highlighter" pixmap="highlight_yellow">
+  <tool id="1" name="Yellow Highlighter" pixmap="tool_hl_yellow">
     <tooltip>this ..</tooltip>
     <engine type="SmoothLine" color="#FFFF00">
       <annotation type="Highlight" color="#FFFF00" />
     </engine>
     <shortcut>1</shortcut>
   </tool>
-  <tool id="2" name="Pink Highlighter" pixmap="highlight_pink">
+  <tool id="2" name="Pink Highlighter" pixmap="tool_hl_pink">
     <tooltip>.. is ..</tooltip>
     <engine type="SmoothLine" color="#FF0080">
       <annotation type="Ink" color="#FF0080" />
     </engine>
     <shortcut>2</shortcut>
   </tool>
-  <tool id="3" name="Yellow Highlighter" pixmap="highlight_yellow">
-    <tooltip>.. a ..</tooltip>
-    <engine type="TwoPoints" color="#F8FF00" block="true">
-      <annotation type="Highlight" color="#F8FF00" />
-    </engine>
-    <shortcut>3</shortcut>
-  </tool>
-  <tool id="4" name="note" pixmap="pinnote">
+  <tool id="3" name="note" pixmap="pinnote">
     <tooltip>.. tooltip ..</tooltip>
-    <engine type="PickPoint" color="#FF00FF" hoverIcon="pinnote">
+    <engine type="PickPoint" color="#FF00FF" hoverIcon="too_note">
       <annotation type="Text" color="#FF00FF" />
     </engine>
   </tool>
-  <tool id="5" name="Straight Yellow Line" pixmap="color_line">
+  <tool id="4" name="Straight Yellow Line" pixmap="tool_ink_green">
     <tooltip>.. test</tooltip>
     <engine type="TwoPoints" color="#FFE000">
       <annotation type="Line" width="4" color="#FFE000" />
     </engine>
     <shortcut>5</shortcut>
   </tool>
-  <tool id="6" name="Arrowed Black Line" pixmap="color_line">
+  <tool id="5" name="Arrowed Black Line" pixmap="color_line">
     <engine type="TwoPoints">
       <annotation type="Line" />
     </engine>
     <shortcut>6</shortcut>
   </tool>
-  <tool id="7" name="Warning Stamp" pixmap="messagebox_warning">
+  <tool id="6" name="Warning Stamp" pixmap="messagebox_warning">
     <engine type="PickPoint" hoverIcon="messagebox_warning">
       <annotation type="Stamp" icon="messagebox_warning" />
     </engine>
diff --git a/ui/data/uparrow.png b/ui/data/uparrow.png
new file mode 100644
index 000000000..9413950f3
Binary files /dev/null and b/ui/data/uparrow.png differ
diff --git a/ui/data/upleftarrow.png b/ui/data/upleftarrow.png
new file mode 100644
index 000000000..641e6c511
Binary files /dev/null and b/ui/data/upleftarrow.png differ