diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 1111c85ea50fafcbbf86585b25b67c362eca918b..c976ce8636c144b55809b6555a73342377bfdf49 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,5 +1,6 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
+	wmtweak.png							\
 	xfce4-keys.png							\
 	xfce4-workspaces.png						\
 	xfwm4.png
diff --git a/icons/48x48/wmtweak.png b/icons/48x48/wmtweak.png
new file mode 100644
index 0000000000000000000000000000000000000000..c686dc19058069820ce51dff93eea4678cd017f4
Binary files /dev/null and b/icons/48x48/wmtweak.png differ
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 7dd6ac7174ca1d04b4fe456d93e99eb2023e5069..ff10f41a689901465be1cd3c426ca8a8ea638088 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -1,5 +1,6 @@
 iconsdir = $(datadir)/icons/hicolor/scalable/apps
 icons_DATA =								\
+	wmtweak.svg							\
 	xfce4-workspaces.svg						\
 	xfwm4.svg
 
diff --git a/icons/scalable/wmtweak.svg b/icons/scalable/wmtweak.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c23bd34325c2d3e9467aaed88facfe671fa161b3
--- /dev/null
+++ b/icons/scalable/wmtweak.svg
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.42"
+   sodipodi:docname="wmtweak.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/icons/scalable"
+   height="128pt"
+   width="128pt"
+   sodipodi:version="0.32"
+   id="svg639"
+   inkscape:export-filename="/home/ofourdan/src/svn/xfwm4/trunk/icons/scalable/wmtweak.png"
+   inkscape:export-xdpi="27.000000"
+   inkscape:export-ydpi="27.000000">
+  <metadata
+     id="metadata34">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs641">
+    <linearGradient
+       id="linearGradient851">
+      <stop
+         id="stop1476"
+         offset="0.0000000"
+         style="stop-color:#7590ae;stop-opacity:1.0000000;" />
+      <stop
+         id="stop1478"
+         offset="0.53934306"
+         style="stop-color:#bac7d6;stop-opacity:1.0000000;" />
+      <stop
+         id="stop853"
+         offset="1"
+         style="stop-color:#fff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.822977,0.000000,0.000000,0.354236,3.461540,-5.548885)"
+       y2="46.570889"
+       x2="29.795527"
+       y1="70.621834"
+       x1="29.795525"
+       id="linearGradient620"
+       xlink:href="#linearGradient851" />
+    <linearGradient
+       id="linearGradient2849">
+      <stop
+         style="stop-color:#e7e7e7;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2851" />
+      <stop
+         style="stop-color:#f3f3f3;stop-opacity:1.0000000;"
+         offset="0.47142857"
+         id="stop2855" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2853" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2849"
+       id="linearGradient2847"
+       gradientTransform="matrix(1.145396,0.000000,0.000000,0.873061,3.800529,-5.877335)"
+       x1="68.142937"
+       y1="21.376766"
+       x2="68.142937"
+       y2="139.01520"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1918">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.31372550;"
+         offset="0.0000000"
+         id="stop1919" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop1921" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient1918"
+       id="radialGradient1502"
+       cx="41.875938"
+       cy="37.865574"
+       r="12.562782"
+       fx="42.023737"
+       fy="37.865574"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4111">
+      <stop
+         style="stop-color:#e6da1e;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4112" />
+      <stop
+         style="stop-color:#7d760f;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4113" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4111"
+       id="linearGradient2312"
+       x1="16.883859"
+       y1="28.772741"
+       x2="12.516754"
+       y2="2.6018223"
+       gradientTransform="scale(1.016203,0.984055)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4114">
+      <stop
+         style="stop-color:#e6da1e;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop4115" />
+      <stop
+         style="stop-color:#fff99b;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4116" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4114"
+       id="linearGradient2222"
+       x1="10.686180"
+       y1="22.702703"
+       x2="11.660023"
+       y2="4.1041272"
+       gradientTransform="scale(1.016203,0.984055)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient850">
+      <stop
+         id="stop851"
+         offset="0.0000000"
+         style="stop-color:#c7454d;stop-opacity:1.0000000;" />
+      <stop
+         id="stop854"
+         offset="0.78970802"
+         style="stop-color:#bc8197;stop-opacity:1.0000000;" />
+      <stop
+         id="stop852"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient643">
+      <stop
+         id="stop644"
+         offset="0"
+         style="stop-color:#57524f;stop-opacity:1.0000;" />
+      <stop
+         id="stop645"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="-1.3055907"
+       x2="3.8204696"
+       y1="51.064175"
+       x1="3.8204696"
+       id="linearGradient646"
+       xlink:href="#linearGradient643"
+       gradientTransform="matrix(19.91532,-3.228943e-7,3.739230e-7,1.747474e-2,-281.0021,30.44866)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient850"
+       id="linearGradient10532"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.613170,-3.184570e-6,4.906397e-8,0.172346,-26.99647,125.1564)"
+       x1="3.8204696"
+       y1="51.064175"
+       x2="3.8204696"
+       y2="-1.3055907" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:current-layer="svg639"
+     inkscape:window-y="28"
+     inkscape:window-x="161"
+     inkscape:window-height="653"
+     inkscape:window-width="1242"
+     inkscape:cy="80.000000"
+     inkscape:cx="83.389831"
+     inkscape:zoom="2.9500000"
+     gridspacingy="1mm"
+     gridspacingx="1mm"
+     showgrid="true"
+     snaptogrid="true"
+     id="base" />
+  <path
+     sodipodi:type="arc"
+     style="fill:url(#radialGradient1502);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:1.0000000pt"
+     id="path1934"
+     sodipodi:cx="41.875938"
+     sodipodi:cy="37.865574"
+     sodipodi:rx="12.562782"
+     sodipodi:ry="12.562782"
+     d="M 54.438721 37.865574 A 12.562782 12.562782 0 1 1  29.313156,37.865574 A 12.562782 12.562782 0 1 1  54.438721 37.865574 z"
+     transform="matrix(4.209791,0.000000,0.000000,0.930239,-71.91864,110.2921)" />
+  <rect
+     y="12.982353"
+     x="13.270085"
+     height="105.52209"
+     width="139.56152"
+     id="rect615"
+     style="font-size:12.000000px;fill:url(#linearGradient2847);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.6025023;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000" />
+  <rect
+     y="13.310812"
+     x="12.931100"
+     height="15.412274"
+     width="139.56152"
+     id="rect616"
+     style="font-size:12.000000px;fill:url(#linearGradient620);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.4016683;stroke-linecap:round;stroke-linejoin:round" />
+  <polygon
+     sodipodi:type="star"
+     style="fill:url(#linearGradient2222);fill-rule:evenodd;stroke:url(#linearGradient2312);stroke-width:1.0000000pt"
+     id="polygon3715"
+     sodipodi:sides="5"
+     sodipodi:cx="15.909903"
+     sodipodi:cy="14.311068"
+     sodipodi:r1="12.135305"
+     sodipodi:r2="5.8249464"
+     sodipodi:arg1="0.99289439"
+     sodipodi:arg2="1.6212129"
+     inkscape:flatsided="false"
+     points="22.539029,24.475728 15.616353,20.128613 8.2912488,23.756794 10.286377,15.829606 4.5721892,9.9841873 12.727922,9.4320308 16.521464,2.1911819 19.566856,9.7771189 27.625582,11.147447 21.352005,16.387970 22.539029,24.475728 "
+     transform="matrix(4.854898,-0.256658,0.262512,4.746651,15.00852,25.09829)"
+     inkscape:rounded="0.0000000"
+     inkscape:randomized="0.0000000"
+     d="M 22.539029,24.475728 L 15.616353,20.128613 L 8.2912488,23.756794 L 10.286377,15.829606 L 4.5721892,9.9841873 L 12.727922,9.4320308 L 16.521464,2.1911819 L 19.566856,9.7771189 L 27.625582,11.147447 L 21.352005,16.387970 L 22.539029,24.475728 z " />
+  <rect
+     y="125.63660"
+     x="-72.396210"
+     height="8.2698183"
+     width="110.76650"
+     id="rect654"
+     style="font-size:12.000000px;fill:url(#linearGradient10532);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.5166175;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1.0000000"
+     transform="matrix(0.824555,-0.565782,0.521708,0.853124,0.000000,0.000000)" />
+</svg>
diff --git a/mcs-plugin/wmtweak_plugin.c b/mcs-plugin/wmtweak_plugin.c
index 50c7125734168a4ad6a5d063cfff6d0a524d1260..f617f65474ce549794f34ba987f8f1efcc3c8681 100644
--- a/mcs-plugin/wmtweak_plugin.c
+++ b/mcs-plugin/wmtweak_plugin.c
@@ -499,7 +499,7 @@ mcs_plugin_init (McsPlugin * mcs_plugin)
     mcs_plugin->plugin_name = g_strdup (PLUGIN_NAME);
     mcs_plugin->caption = g_strdup (_("Window Manager Tweak"));
     mcs_plugin->run_dialog = run_dialog;
-    mcs_plugin->icon = xfce_themed_icon_load ("xfwm4", 48);
+    mcs_plugin->icon = xfce_themed_icon_load ("wmtweak", 48);
     mcs_manager_notify (mcs_plugin->manager, CHANNEL);
 
     return (MCS_PLUGIN_INIT_OK);