diff --git a/icons/hi128-apps-partitionmanager.png b/icons/128-apps-partitionmanager.png
similarity index 100%
rename from icons/hi128-apps-partitionmanager.png
rename to icons/128-apps-partitionmanager.png
diff --git a/icons/hi16-apps-partitionmanager.png b/icons/16-apps-partitionmanager.png
similarity index 100%
rename from icons/hi16-apps-partitionmanager.png
rename to icons/16-apps-partitionmanager.png
diff --git a/icons/hi22-apps-partitionmanager.png b/icons/22-apps-partitionmanager.png
similarity index 100%
rename from icons/hi22-apps-partitionmanager.png
rename to icons/22-apps-partitionmanager.png
diff --git a/icons/hi32-apps-partitionmanager.png b/icons/32-apps-partitionmanager.png
similarity index 100%
rename from icons/hi32-apps-partitionmanager.png
rename to icons/32-apps-partitionmanager.png
diff --git a/icons/hi48-apps-partitionmanager.png b/icons/48-apps-partitionmanager.png
similarity index 100%
rename from icons/hi48-apps-partitionmanager.png
rename to icons/48-apps-partitionmanager.png
diff --git a/icons/hi64-apps-partitionmanager.png b/icons/64-apps-partitionmanager.png
similarity index 100%
rename from icons/hi64-apps-partitionmanager.png
rename to icons/64-apps-partitionmanager.png
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 6ad3aa2..7cdbe71 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,10 +1,11 @@
 # collect the needed icon files
-set (PARTITIONMANAGER_ICONS
-   hi16-apps-partitionmanager.png
-   hi22-apps-partitionmanager.png
-   hi32-apps-partitionmanager.png
-   hi48-apps-partitionmanager.png
-   hi64-apps-partitionmanager.png
-   hi128-apps-partitionmanager.png
+set (PARTITIONMANAGER_OXYGEN_ICONS
+   16-apps-partitionmanager.png
+   22-apps-partitionmanager.png
+   32-apps-partitionmanager.png
+   48-apps-partitionmanager.png
+   64-apps-partitionmanager.png
+   128-apps-partitionmanager.png
 )
-ecm_install_icons(ICONS ${PARTITIONMANAGER_ICONS} DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS sc-apps-partitionmanager.svg DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS ${PARTITIONMANAGER_OXYGEN_ICONS} DESTINATION ${ICON_INSTALL_DIR} THEME oxygen)
diff --git a/icons/sc-apps-partitionmanager.svg b/icons/sc-apps-partitionmanager.svg
new file mode 100644
index 0000000..d72aaaa
--- /dev/null
+++ b/icons/sc-apps-partitionmanager.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="gparted.svg">
+  <defs
+     id="defs5455">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4221">
+      <stop
+         style="stop-color:#06a370;stop-opacity:1"
+         offset="0"
+         id="stop4223" />
+      <stop
+         style="stop-color:#22d1b0;stop-opacity:1"
+         offset="1"
+         id="stop4225" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4213">
+      <stop
+         style="stop-color:#728790;stop-opacity:1"
+         offset="0"
+         id="stop4215" />
+      <stop
+         style="stop-color:#85969e;stop-opacity:1"
+         offset="1"
+         id="stop4217" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4213"
+       id="linearGradient4219"
+       x1="24.000042"
+       y1="41"
+       x2="24.000042"
+       y2="7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4221"
+       id="linearGradient4227"
+       x1="24.000042"
+       y1="36"
+       x2="24.000042"
+       y2="12"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4271"
+       id="linearGradient4235"
+       x1="24.000042"
+       y1="44"
+       x2="24.000042"
+       y2="4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4400"
+       id="linearGradient4265"
+       x1="15"
+       y1="15"
+       x2="44"
+       y2="43.999973"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4400">
+      <stop
+         style="stop-color:#020303;stop-opacity:1"
+         offset="0"
+         id="stop4402" />
+      <stop
+         style="stop-color:#424649;stop-opacity:0"
+         offset="1"
+         id="stop4404" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4271">
+      <stop
+         style="stop-color:#2a2c2f;stop-opacity:1"
+         offset="0"
+         id="stop4273" />
+      <stop
+         style="stop-color:#424649;stop-opacity:1"
+         offset="1"
+         id="stop4275" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.852368"
+     inkscape:cx="20.513324"
+     inkscape:cy="21.232124"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="670"
+     inkscape:window-x="-4"
+     inkscape:window-y="29"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="1.1650391e-05,47.999996"
+       orientation="4,0"
+       id="guide4146" />
+    <sodipodi:guide
+       position="1.1650391e-05,43.999996"
+       orientation="0,48"
+       id="guide4148" />
+    <sodipodi:guide
+       position="48.000012,43.999996"
+       orientation="-4,0"
+       id="guide4150" />
+    <sodipodi:guide
+       position="48.000012,47.999996"
+       orientation="0,-48"
+       id="guide4152" />
+    <sodipodi:guide
+       position="1.1650391e-05,4.0000264"
+       orientation="4,0"
+       id="guide4154" />
+    <sodipodi:guide
+       position="1.1650391e-05,2.6367188e-05"
+       orientation="0,48"
+       id="guide4156" />
+    <sodipodi:guide
+       position="48.000012,2.6367188e-05"
+       orientation="-4,0"
+       id="guide4158" />
+    <sodipodi:guide
+       position="48.000012,4.0000264"
+       orientation="0,-48"
+       id="guide4160" />
+    <sodipodi:guide
+       position="48.000012,48.000026"
+       orientation="0,-4"
+       id="guide4162" />
+    <sodipodi:guide
+       position="44.000012,48.000026"
+       orientation="48,0"
+       id="guide4164" />
+    <sodipodi:guide
+       position="44.000012,2.6367188e-05"
+       orientation="0,4"
+       id="guide4166" />
+    <sodipodi:guide
+       position="48.000012,2.6367188e-05"
+       orientation="-48,0"
+       id="guide4168" />
+    <sodipodi:guide
+       position="4.0000422,48.000026"
+       orientation="0,-4"
+       id="guide4170" />
+    <sodipodi:guide
+       position="4.2167969e-05,48.000026"
+       orientation="48,0"
+       id="guide4172" />
+    <sodipodi:guide
+       position="4.2167969e-05,2.6367188e-05"
+       orientation="0,4"
+       id="guide4174" />
+    <sodipodi:guide
+       position="4.0000422,2.6367188e-05"
+       orientation="-48,0"
+       id="guide4176" />
+    <sodipodi:guide
+       position="4.0000422,43.999996"
+       orientation="39.999969,0"
+       id="guide4175" />
+    <sodipodi:guide
+       position="4.0000422,4.0000264"
+       orientation="0,20"
+       id="guide4177" />
+    <sodipodi:guide
+       position="24.000042,4.0000264"
+       orientation="-39.999969,0"
+       id="guide4179" />
+    <sodipodi:guide
+       position="24.000042,43.999996"
+       orientation="0,-20"
+       id="guide4181" />
+    <sodipodi:guide
+       position="4.0000422,23.999843"
+       orientation="20,0"
+       id="guide4185" />
+    <sodipodi:guide
+       position="44.000012,3.9998433"
+       orientation="-20,0"
+       id="guide4189" />
+    <sodipodi:guide
+       position="44.000012,23.999843"
+       orientation="0,-39.999969"
+       id="guide4191" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-499.798)">
+    <path
+       style="opacity:1;fill:url(#linearGradient4235);fill-opacity:1.0;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
+       d="M 24 4 C 12.920008 4 4 12.920008 4 24 L 5 24 L 11 24 C 11 16.798008 16.798008 11 24 11 L 24 4 z M 37 24 C 37 31.201992 31.201992 37 24 37 L 24 44 C 35.079992 44 44 35.079992 44 24 L 37 24 z "
+       id="rect4176"
+       transform="translate(384.57143,499.798)" />
+    <path
+       style="opacity:1;fill:url(#linearGradient4219);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
+       d="M 24 7 C 14.582008 7 7 14.582008 7 24 C 7 33.417992 14.582008 41 24 41 C 33.417992 41 41 33.417992 41 24 L 34 24 C 34 29.539995 29.539996 34 24 34 C 18.460004 34 14 29.539995 14 24 C 14 18.460005 18.460004 14 24 14 L 24 7 z "
+       transform="translate(384.57143,499.798)"
+       id="rect4181" />
+    <path
+       style="fill:url(#linearGradient4265);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.2"
+       d="M 22 15 L 15 22 L 17.679688 32 L 16.039062 32.976562 L 16 33 L 24 41 L 26.800781 43.800781 C 35.629889 42.573458 42.573458 35.629889 43.800781 26.800781 L 41 24 L 37 24 L 36 24 C 36 20.402991 34.424754 17.195729 31.933594 15 L 22 15 z M 24 17 C 27.878 17 31 20.122 31 24 C 31 27.878 27.878 31 24 31 C 20.122 31 17 27.878 17 24 C 17 20.122 20.122 17 24 17 z "
+       transform="translate(384.57143,499.798)"
+       id="path4237" />
+    <path
+       style="opacity:1;fill:url(#linearGradient4227);fill-opacity:1;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
+       d="M 24 12 C 17.352 12 12 17.352 12 24 C 12 30.648 17.352 36 24 36 C 30.648 36 36 30.648 36 24 C 36 17.352 30.648 12 24 12 z M 24 17 C 27.878 17 31 20.122 31 24 C 31 27.878 27.878 31 24 31 C 20.122 31 17 27.878 17 24 C 17 20.122 20.122 17 24 17 z "
+       transform="translate(384.57143,499.798)"
+       id="rect4197" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:0.11764706;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
+       d="M 4.0253906 23 C 4.0091961 23.331609 4 23.664236 4 24 L 5 24 L 7 24 L 7 23 L 5 23 L 4.0253906 23 z M 43.974609 24 C 43.456395 34.611263 34.744226 43 24 43 L 24 44 C 35.079992 44 44 35.079992 44 24 L 43.974609 24 z "
+       transform="translate(384.57143,499.798)"
+       id="path4184" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:0.11764706;stroke:none;stroke-width:2.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.55026455"
+       d="M 7 24 C 7 33.417992 14.582008 41 24 41 C 33.417992 41 41 33.417992 41 24 L 40.949219 24 C 40.431855 32.945983 33.080119 40 24 40 C 14.921042 40 7.5828628 32.944531 7.0644531 24 L 7 24 z "
+       transform="translate(384.57143,499.798)"
+       id="path4186" />
+  </g>
+</svg>