diff --git a/Makefile b/Makefile
index 5d339c7..aa8768a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ APPVERSION_N=0
 APPVERSION_P=1
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
-ICONNAME=icon_pgp.gif
+ICONNAME=images/icon_pgp.gif
 
 
 ################
diff --git a/images/icon_openpgp.xcf b/images/icon_openpgp.xcf
deleted file mode 100644
index 8186a0e..0000000
Binary files a/images/icon_openpgp.xcf and /dev/null differ
diff --git a/icon_pgp.gif b/images/icon_pgp.gif
similarity index 100%
rename from icon_pgp.gif
rename to images/icon_pgp.gif
diff --git a/images/manager_gnupg.svg b/images/manager_gnupg.svg
deleted file mode 100644
index d692911..0000000
--- a/images/manager_gnupg.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 16.933334 16.933333"
-   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
-   height="60"
-   width="60"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="manager_gnupg.svg"><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="1050"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="4.4750243"
-     inkscape:cx="88.359197"
-     inkscape:cy="-14.875335"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     units="px" /><metadata
-     id="metadata53"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs4"><font
-       vert-adv-y="90"
-       vert-origin-y="90"
-       vert-origin-x="45"
-       horiz-adv-x="90"
-       horiz-origin-y="0"
-       horiz-origin-x="0"
-       font-weight="400"
-       font-variant="normal"
-       id="FontID0"
-       style="font-variant:normal;font-weight:400"><font-face
-         id="font-face7"
-         font-family="CastleT" /><missing-glyph
-         id="missing-glyph9"><path
-           id="path11"
-           d="M0 0z" /></missing-glyph><glyph
-         id="glyph13"
-         horiz-adv-x="647"
-         unicode="G"><path
-           id="path15"
-           d="M567.332 640.168l0 -82.5004c-61.1653,41.6666 -121.666,62.4986 -181.665,62.4986 -65.0016,0 -117.669,-22.1653 -157.668,-66.4985 -25.0004,-27.667 -42.1672,-58.0006 -51.1656,-91.3329 -11.5015,-40.0012 -17.1667,-84.3343 -17.1667,-132.833 0,-99.8357 22.4999,-174.334 67.3312,-223.168 37.8352,-41.3345 87.5015,-62.0005 149.001,-62.0005 35.8328,0 70.1663,9.33303 103,27.9991l0 260.168c0,11.9996 -1.33329,22.6659 -3.83383,32.1675l115.999 0c-2.49806,-10.1682 -3.83135,-20.8345 -3.83135,-32.1675l0 -256.334c0.332083,-14.9983 2.49806,-28.3337 6.33189,-39.9987 -59.832,-19.6673 -103.499,-32.1675 -130.999,-37.6667 -27.501,-5.50168 -60.5011,-8.3343 -99.0005,-8.3343 -69.3336,0 -125.832,12.3342 -169.833,37.1661 -52.8335,29.5009 -92.3316,73.0014 -118.665,130.335 -23.1665,50.1644 -34.668,107.999 -34.668,173.333 0,116.333 36.1674,205.832 108.334,268.665 58.3327,51.1681 135.666,76.6667 232,76.6667 58.5012,0 120.668,-11.9996 186.5,-36.1649z" /></glyph><glyph
-         id="glyph17"
-         horiz-adv-x="514"
-         unicode="P"><path
-           id="path19"
-           d="M185.999 286.499l0 -254.331c0,-9.33303 1.66785,-20.1679 4.83504,-32.1675l-120.502 0c2.8351,10.1657 4.33443,20.8345 4.33443,32.1675l0 601.666c0,11.9996 -1.49933,22.8345 -4.33443,32.6656l213.334 0c52.0008,0 96.1679,-10.4978 132.333,-31.3323 55.334,-32.4996 83.001,-83.4992 83.001,-152.833 0,-76.8327 -33.6668,-132.167 -101,-166 -39.5006,-19.8333 -86.5003,-29.8355 -141.165,-29.8355l-70.8354 0zm0 51.3342l59.4999 0c32.6681,0 58.8333,5.83376 78.6666,17.5013 18.8346,11.499 33.8353,28.3312 44.8337,50.8336 11.1669,22.4999 16.6686,47.3318 16.6686,74.8328 0,42.1672 -11.6675,75.4994 -34.8341,99.8332 -23.3326,24.1653 -55.334,36.3334 -95.9994,36.3334l-68.8355 0 0 -279.334z" /></glyph><glyph
-         id="glyph21"
-         horiz-adv-x="558"
-         unicode="n"><path
-           id="path23"
-           d="M62.5011 520.501l103.999 0 0 -72.6668c15.6674,24.3313 31.3323,42.1647 47.3343,53.6662 29.999,20.832 67.8318,31.1663 113.833,31.1663 59.1654,0 104.165,-17.9994 134.667,-54.1668 19.4988,-23.1665 29.3324,-55.334 29.3324,-96.666l0 -349.667c0,-10.6663 1.33329,-21.5012 3.83383,-32.1675l-109.667 0c2.50054,8.16578 3.83383,18.8321 3.83383,32.1675l0 334.5c0,29.667 -8.66887,52.4989 -25.8356,68.833 -17.3328,16.1655 -41.9986,24.3338 -73.8316,24.3338 -39.6666,0 -69.6681,-11.0009 -89.8335,-33.1662 -21.1666,-23.3351 -31.8329,-53.5001 -31.8329,-90.1681l0 -304.332c0,-11.333 1.33329,-22.0018 3.83135,-32.1675l-109.664 0c2.49806,9.49907 3.83135,20.1679 3.83135,32.1675l0 456.667c0,10.9984 -1.33329,21.4987 -3.83135,31.6669z" /></glyph><glyph
-         id="glyph25"
-         horiz-adv-x="555"
-         unicode="u"><path
-           id="path27"
-           d="M388.667 0l0 71.3335c-18.5,-25.501 -36.4994,-43.6665 -53.6662,-54.8334 -27.3349,-17.1667 -61.8344,-25.8331 -103.166,-25.8331 -55.6661,0 -98.4999,15.8334 -128.333,47.3318 -24.8344,26.1677 -37.1686,63.6683 -37.1686,112.834l0 338.002c0,10.9984 -1.33329,21.4987 -3.83135,31.6669l109.664 0c-2.49806,-9.16699 -3.83135,-19.6673 -3.83135,-31.6669l0 -326.669c0,-27.9991 6.66645,-50.333 19.9994,-66.9991 17.6673,-21.1666 44.0011,-31.6669 79.1672,-31.6669 35.6668,0 64.3325,10.1657 86.3318,30.4996 22.0018,20.3339 33.0002,46.8337 33.0002,79.3333l0 315.502c0,11.333 -1.33329,21.8332 -3.83383,31.6669l109.667 0c-2.49806,-8.50035 -3.83135,-19.0006 -3.83135,-31.6669l0 -456.667c0,-10.3342 1.33329,-21.1666 3.83135,-32.1675l-103.999 0z" /></glyph></font><style
-       id="style29"
-       type="text/css">
-   
-    @font-face { font-family:&quot;CastleT&quot;;src:url(&quot;#FontID0&quot;) format(svg)}
-    .fil1 {fill:white}
-    .fil0 {fill:#0093DD}
-    .fnt1 {font-weight:normal;font-size:40.3513;font-family:'CastleT'}
-    .fnt0 {font-weight:normal;font-size:40.7083;font-family:'CastleT'}
-   
-  </style><metadata
-       id="CorelCorpID_0Corel-Layer" /></defs><rect
-     style="fill:#0093dd;fill-opacity:1;stroke:none;stroke-width:0.28200001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect4148"
-     width="14.111113"
-     height="14.111112"
-     x="1.411111"
-     y="1.4111104"
-     ry="3.582052"
-     inkscape:export-xdpi="90"
-     inkscape:export-ydpi="90" /><path
-     d="m 3.688443,8.1049789 0.6719912,0 0,-2.0227925 c 0,-2.267611 1.839022,-4.1066317 4.1066108,-4.1066317 2.267659,0 4.106564,1.8390207 4.106564,4.1066317 l 0,2.0028107 c -0.0097,0.0067 -0.01937,0.013404 -0.02888,0.020011 l 7e-5,0 -0.0062,0.00383 -7.1e-4,4.788e-4 -7.12e-4,4.021e-4 -7.09e-4,4.5e-4 -0.0031,0.00191 -0.0037,0.00287 -7.1e-4,4.979e-4 -0.004,0.00287 -1.88e-4,1.436e-4 -0.0016,9.575e-4 -9.57e-4,5.84e-4 -0.0019,9.575e-4 -4.74e-4,3.159e-4 -0.0024,0.00191 -2.3e-5,0 -0.0024,0.00191 -0.0033,0.00191 -0.0016,9.574e-4 -0.0014,8.713e-4 -0.0012,7.372e-4 -0.0037,0.00287 -0.0036,0.00191 -1.65e-4,1.148e-4 -0.0047,0.00287 -9.57e-4,6.606e-4 -0.0057,0.00383 -4.73e-4,3.351e-4 -0.0023,0.00191 -7e-5,4.79e-5 -9.58e-4,5.649e-4 -0.0074,0.00479 -0.0012,7.564e-4 -0.0016,9.574e-4 -7.1e-4,4.5e-4 -4.74e-4,3.543e-4 -0.0038,0.00287 -4.73e-4,2.202e-4 -9.4e-5,6.7e-5 -2.36e-4,1.436e-4 -0.0043,0.00287 -9.57e-4,5.936e-4 -0.0014,9e-4 -0.0014,8.234e-4 -9.58e-4,6.415e-4 -0.0023,0.00191 -0.0022,9.574e-4 -1.65e-4,6.7e-5 -0.0023,0.00191 -2.37e-4,1.724e-4 -0.0022,9.574e-4 -7.09e-4,4.213e-4 -0.0016,9.574e-4 -0.0012,6.702e-4 -0.0012,7.564e-4 -0.0014,9e-4 -9.58e-4,5.17e-4 -0.01248,0.00766 -0.0026,0.00191 -7.1e-4,4.021e-4 -0.0067,0.00383 -4.73e-4,3.351e-4 -0.0076,0.00479 -1.9e-4,1.149e-4 -4.74e-4,3.351e-4 -0.0022,9.574e-4 -1.18e-4,6.71e-5 -0.0022,9.574e-4 -2.37e-4,1.436e-4 -0.0019,9.575e-4 -0.0019,9.574e-4 -2.37e-4,1.628e-4 -9.57e-4,6.127e-4 -0.0033,0.00191 -0.0016,9.575e-4 -0.0025,0.00191 -0.0074,0.00479 -0.0074,0.00479 -0.0074,0.00479 -0.0074,0.00383 -0.01491,0.00862 -0.0075,0.00479 -0.0076,0.00479 -0.0031,0.00191 -0.01967,0.011394 -0.0076,0.00479 -0.0077,0.00479 -0.0077,0.00479 -0.01015,0.00574 -0.01326,0.00766 -0.0078,0.00479 -0.03054,0.017138 -0.0014,7.181e-4 -0.008,0.00479 -0.008,0.00479 -0.0019,9.575e-4 -0.01073,0.00574 -0.02407,0.013213 -0.01131,0.0067 c -0.01156,0.0067 -0.02322,0.012542 -0.03501,0.018957 l -0.003,0.00191 -0.0055,0.00287 -0.01714,0.00862 -0.0086,0.00479 -0.0014,7.564e-4 -0.01584,0.00862 -7.1e-5,4.78e-5 -0.0087,0.00479 -0.0025,9.574e-4 -0.0151,0.00766 -0.0088,0.00479 -0.0081,0.00383 c -0.01105,0.00574 -0.02223,0.011489 -0.0335,0.017138 l -0.0092,0.00479 c -0.01323,0.0067 -0.0266,0.013404 -0.04012,0.020202 l -1.17e-4,4.79e-5 c -0.0129,0.0067 -0.02592,0.01283 -0.03909,0.01934 l -0.01307,0.0067 c -0.0143,0.0067 -0.02871,0.013979 -0.04331,0.020968 l -7.2e-5,0 C 11.038534,8.8839556 9.730676,9.298462 7.2478575,9.4766902 5.4692233,9.6044798 4.3909642,10.387325 3.6876781,11.332093 l 0,-3.2235715 z m 2.563566,0 4.430049,0 0,-2.0227925 c 0,-1.2231829 -0.991878,-2.2150569 -2.215013,-2.2150569 -1.2231107,0 -2.215036,0.991874 -2.215036,2.2150569 z m 5.738593,0.31903 c -0.01326,0.0067 -0.02659,0.013404 -0.04012,0.020202 M 10.327357,2.9690468 C 9.8007399,2.6543731 9.1850879,2.4733204 8.5272059,2.4733204 c -1.8033243,0 -3.2897683,1.3586901 -3.4919787,3.1078259 C 5.5638818,3.92719 7.1135546,2.7291017 8.9426821,2.7291017 c 0.4858772,0 0.9520606,0.084734 1.3846749,0.2399451 z m 2.918299,5.9102173 0,5.7962909 -8.1765999,0 c 0.9013536,-0.501145 1.5731078,-0.450114 2.6856927,-0.414937 1.5151103,0.04787 3.1892532,-0.586789 4.0126062,-1.427215 0.823449,-0.840511 -0.07452,-0.19887 -1.006649,0.03763 -0.9322701,0.236326 -2.7361859,0.261488 -3.9419916,-0.05544 3.7977786,0.0518 5.2758186,-1.176737 6.1151746,-2.276965 0.839309,-1.1001993 -0.363018,-0.19101 -1.141914,0.188272 -0.778849,0.379636 -2.1372482,0.650851 -3.6309594,0.453062 2.2610074,-0.0048 3.9813584,-1.134571 5.0846404,-2.3006329 z"
-     style="font-weight:normal;font-size:40.35129929px;font-family:CastleT;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="path4161"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccsssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsssccccscsccccsscccccc"
-     inkscape:export-xdpi="90"
-     inkscape:export-ydpi="90" /></svg>
\ No newline at end of file