diff --git a/icons/16x16/geany.png b/icons/16x16/geany.png
index db12d8dea..dd6f0c2df 100644
Binary files a/icons/16x16/geany.png and b/icons/16x16/geany.png differ
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index ccf9a2a9e..54194bee7 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,4 +1,9 @@
-icons_actionsdir = $(datadir)/icons/hicolor/32x32/actions
+iconsdir = $(datadir)/icons/hicolor/32x32
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
+
+dist_icons_apps_DATA = \
+ geany.png
dist_icons_actions_DATA = \
geany-build.png \
diff --git a/icons/32x32/geany.png b/icons/32x32/geany.png
new file mode 100644
index 000000000..10d4d091e
Binary files /dev/null and b/icons/32x32/geany.png differ
diff --git a/icons/48x48/geany.png b/icons/48x48/geany.png
index 422d09a89..cdff98e30 100644
Binary files a/icons/48x48/geany.png and b/icons/48x48/geany.png differ
diff --git a/icons/geany.ico b/icons/geany.ico
index 65129534b..70779daa4 100644
Binary files a/icons/geany.ico and b/icons/geany.ico differ
diff --git a/icons/scalable/geany.svg b/icons/scalable/geany.svg
index 3dcd4d452..3823b3175 100644
--- a/icons/scalable/geany.svg
+++ b/icons/scalable/geany.svg
@@ -1,8 +1,9 @@
+
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.178571,0.17857129)" />
+ gridtolerance="10000"
+ showgrid="false"
+ inkscape:window-maximized="0">
@@ -492,170 +495,267 @@
+ id="layer7"
+ inkscape:label="Plate"
+ style="display:inline">
+ style="opacity:0.6;color:#000000;fill:url(#radialGradient7112);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.48304588px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 41.000002,41.499999 c 0,3.588 -7.840001,6.499999 -17.500001,6.499999 C 13.84,47.999998 6,45.087999 6,41.499999 6,37.912 13.84,35 23.500001,35 c 9.66,0 17.500001,2.912 17.500001,6.499999 z"
+ id="path6721"
+ inkscape:connector-curvature="0" />
+ style="color:#000000;fill:url(#linearGradient3233);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.9999997px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 37.499999,40.5 c 0,2.76 -6.496,5 -14.5,5 -8.003999,0 -14.4999997,-2.24 -14.4999997,-5 0,-2.76 6.4960007,-5 14.4999997,-5 8.004,0 14.5,2.24 14.5,5 z"
+ id="path3580"
+ inkscape:connector-curvature="0" />
+ style="color:#000000;fill:none;stroke:url(#linearGradient4751);stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 36.5,40.045839 c 0,2.458697 -6.048,4.454159 -13.499998,4.454159 -7.452001,0 -13.5000024,-1.995462 -13.5000024,-4.454159 0,-2.458697 6.0480014,-4.454161 13.5000024,-4.454161 7.451998,0 13.499998,1.995464 13.499998,4.454161 z"
+ id="path4362"
+ inkscape:connector-curvature="0" />
+
+
+ style="opacity:0.2;color:#000000;fill:url(#radialGradient7116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 31.999998,40.5 c 0,1.932 -3.583999,3.5 -7.999999,3.5 C 19.583999,44 16,42.432 16,40.5 16,38.568 19.583999,37 23.999999,37 c 4.416,0 7.999999,1.568 7.999999,3.5 z"
+ id="path7114"
+ inkscape:connector-curvature="0" />
-
+ style="color:#000000;fill:#c4a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.38169873px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 30,38.999999 C 30,40.656 26.864,42 23,42 19.136,42 16,40.656 16,38.999999 16,37.344 19.136,36 23,36 c 3.864,0 7,1.344 7,2.999999 z"
+ id="path3578"
+ inkscape:connector-curvature="0" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="opacity:0.1;color:#000000;fill:url(#radialGradient5545);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 28,18 c 0,1.104 -2.016,2 -4.5,2 -2.483999,0 -4.499999,-0.896 -4.499999,-2 0,-1.103999 2.016,-1.999999 4.499999,-1.999999 2.484,0 4.5,0.896 4.5,1.999999 z"
+ id="path5154"
+ inkscape:connector-curvature="0" />
+ style="color:#000000;fill:url(#radialGradient5934);fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 26.500001,14.000002 c 0,-1.380001 -1.568002,-2.5 -3.5,-2.5 -1.932,0 -3.499999,1.119999 -3.499999,2.5 0,1.379998 1.567999,4.5 3.499999,4.5 1.931998,0 3.5,-3.120002 3.5,-4.5 z"
+ id="path2201"
+ inkscape:connector-curvature="0" />
+ style="color:#000000;fill:none;stroke:url(#radialGradient3185);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 25.500002,14.285716 C 25.500002,13.300001 24.38,12.500001 23,12.500001 c -1.379997,0 -2.499998,0.8 -2.499998,1.785715 0,0.985713 1.120001,3.214285 2.499998,3.214285 1.38,0 2.500002,-2.228572 2.500002,-3.214285 z"
+ id="path2204"
+ inkscape:connector-curvature="0" />
+
+
+ style="fill:#edd400;fill-opacity:1;stroke:#c4a000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;display:inline"
+ d="m 41,10.5 c -3.601,0 -5.642857,3.345429 -5.642857,6.946429 l 1,2.357143 c -2e-6,-2.965529 1.845858,-6.392857 4.892858,-6.392857 3.046998,0 4.160713,2.467506 4.249999,5.433035 l 0,9.0625 C 45.121824,32.616353 38.114594,33.546278 34.4375,34.25 33.989858,34.905095 32.974684,35.478537 32.464286,36 37.337556,34.679542 46.983231,34.613084 47.5,28 l 0,-11 C 47.232143,13.220429 44.601,10.5 41,10.5 z"
+ id="rect19335"
+ sodipodi:nodetypes="cccsccccccc"
+ inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
+ style="opacity:0.8;fill:none;stroke:url(#linearGradient19742);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+ d="M 35.910713,17.339286 C 37.749999,9.8749998 46.249999,11.392857 46.517857,18 l 4e-6,10.803571 c -0.357148,2.857144 -4.714291,5.017857 -11.714291,6.017857"
+ id="path19353"
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0" />
+
+
-
-
-
-
+ transform="matrix(1.8,0,0,1.5,-1.6,-21.5)"
+ d="m 7,18 a 2.5,3 0 1 1 -5,0 2.5,3 0 1 1 5,0 z"
+ sodipodi:ry="3"
+ sodipodi:rx="2.5"
+ sodipodi:cy="18"
+ sodipodi:cx="4.5"
+ id="path18109"
+ style="color:#000000;fill:url(#radialGradient18124);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.54772246px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ sodipodi:type="arc"
+ style="color:#000000;fill:url(#radialGradient18126);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.6846531px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path18105"
+ sodipodi:cx="4.5"
+ sodipodi:cy="18"
+ sodipodi:rx="2.5"
+ sodipodi:ry="3"
+ d="m 7,18 a 2.5,3 0 1 1 -5,0 2.5,3 0 1 1 5,0 z"
+ transform="matrix(1.4,0,0,1.1666666,-1.8,-10.499998)" />
+ transform="matrix(1,0,0,0.8333334,1,-0.5000017)"
+ d="m 7,18 a 2.5,3 0 1 1 -5,0 2.5,3 0 1 1 5,0 z"
+ sodipodi:ry="3"
+ sodipodi:rx="2.5"
+ sodipodi:cy="18"
+ sodipodi:cx="4.5"
+ id="path18101"
+ style="color:#000000;fill:url(#radialGradient18128);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.91287076px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ style="color:#000000;fill:none;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 6.5,0.5 c -2.76,0 -5,2.24 -5,5 0,0.7052919 0.1736534,1.3600729 0.4375,1.96875 C 1.0683042,8.2026828 0.5,9.2741795 0.5,10.5 c 0,1.503057 0.8357443,2.785297 2.0625,3.46875 C 2.5302393,14.144924 2.5,14.314551 2.5,14.5 c 0,0.473227 0.1170765,0.914313 0.3125,1.3125 C 2.033208,16.236011 1.5,17.051249 1.5,18 1.5,19.38 2.62,20.5 4,20.5 5.38,20.5 6.5,19.38 6.5,18 6.5,17.770954 6.464025,17.554539 6.40625,17.34375 7.61269,16.955089 8.5,15.835151 8.5,14.5 8.5,13.807159 8.269939,13.164285 7.875,12.65625 8.269345,12.036545 8.5,11.288446 8.5,10.5 8.5,10.361396 8.4512825,10.228735 8.4375,10.09375 10.231875,9.334375 11.5,7.5699998 11.5,5.5 c 0,-2.7599999 -2.2400001,-5.00000001 -5,-5 z"
+ id="path18113"
+ inkscape:connector-curvature="0" />
+
+
+
+
+
+
+
+
+
diff --git a/wscript b/wscript
index c68e35382..fd535428d 100644
--- a/wscript
+++ b/wscript
@@ -157,6 +157,7 @@ geany_icons = {
'hicolor/32x32/actions': ['32x32/geany-build.png',
'32x32/geany-close-all.png',
'32x32/geany-save-all.png'],
+ 'hicolor/32x32/apps': ['32x32/geany.png'],
'hicolor/48x48/actions': ['48x48/geany-build.png',
'48x48/geany-close-all.png',
'48x48/geany-save-all.png'],