diff --git a/deluge/data/pixmaps/alert.svg b/deluge/data/pixmaps/alert.svg
index 5442fa65e..864a0e10c 100644
--- a/deluge/data/pixmaps/alert.svg
+++ b/deluge/data/pixmaps/alert.svg
@@ -20,7 +20,7 @@
    inkscape:export-xdpi="32.603073"
    inkscape:export-ydpi="32.603073"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:modified="true">
+   sodipodi:modified="TRUE">
   <defs
      id="defs3">
     <linearGradient
@@ -269,9 +269,9 @@
      borderopacity="0.17254902"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="31.666406"
-     inkscape:cy="13.428551"
+     inkscape:zoom="7.4062501"
+     inkscape:cx="11.667315"
+     inkscape:cy="19.059135"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
@@ -334,15 +334,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
        id="path2069"
        sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 35.111358,26.143133 C 28.972772,13.030586 17.560684,17.697957 17.274449,26.949974 C 16.894738,39.223415 34.748874,37.615429 36.715244,41.468778 C 28.821643,47.675479 14.973233,45.226508 10.962289,39.715204 C 6.9574776,34.212326 7.2383598,25.630263 10.784249,19.587632 C 24.158625,0.978654 39.749127,24.383766 35.111358,26.143133 z "
-       id="path2969"
-       sodipodi:nodetypes="cscscc" />
     <path
        style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
        d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
@@ -350,14 +345,16 @@
        sodipodi:nodetypes="ccccc" />
     <text
        xml:space="preserve"
-       style="font-size:51.33017349px;font-style:normal;font-weight:normal;opacity:1;fill:#ff7878;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="4.8416271"
-       y="61.483597"
+       style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ff7878;fill-opacity:1;stroke:#000000;stroke-width:0.70000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="5.0072942"
+       y="59.560848"
        id="text2767"
-       transform="scale(1.6095931,0.621275)"><tspan
+       transform="scale(1.4928735,0.6698491)"
+       sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan2769"
-         x="4.8416271"
-         y="61.483597">!</tspan></text>
+         x="5.0072942"
+         y="59.560848"
+         style="font-size:55.97062302px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;stroke-width:0.70000001;font-family:Bitstream Vera Sans;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-linecap:round">!</tspan></text>
   </g>
 </svg>
diff --git a/deluge/data/pixmaps/alert16.png b/deluge/data/pixmaps/alert16.png
index 1711bfb67..19a27ddb4 100644
Binary files a/deluge/data/pixmaps/alert16.png and b/deluge/data/pixmaps/alert16.png differ
diff --git a/deluge/data/pixmaps/downloading.svg b/deluge/data/pixmaps/downloading.svg
index 4aef7d604..ea371e87b 100644
--- a/deluge/data/pixmaps/downloading.svg
+++ b/deluge/data/pixmaps/downloading.svg
@@ -15,8 +15,8 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="downloading.svg"
-   inkscape:export-filename="/home/andrew/Projects/deluge-icons/downloading16.png.png"
+   sodipodi:docname="downloading-border.svg"
+   inkscape:export-filename="/home/andrew/Projects/deluge-icons/downloading16.png"
    inkscape:export-xdpi="32.603073"
    inkscape:export-ydpi="32.603073"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
@@ -337,28 +337,14 @@
        d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
        id="path2069"
        sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#71c837;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 35.111358,26.143133 C 28.972772,13.030586 17.560684,17.697957 17.274449,26.949974 C 16.894738,39.223415 34.748874,37.615429 36.715244,41.468778 C 28.821643,47.675479 14.973233,45.226508 10.962289,39.715204 C 6.9574776,34.212326 7.2383598,25.630263 10.784249,19.587632 C 24.158625,0.978654 39.749127,24.383766 35.111358,26.143133 z "
-       id="path2969"
-       sodipodi:nodetypes="cscscc" />
     <path
        style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
        d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
        id="path2071"
        sodipodi:nodetypes="ccccc" />
-    <g
-       id="g2640"
-       transform="matrix(-1,0,0,-1,15.102284,9.6874994)"
-       style="fill:#b7e399;fill-opacity:1">
-      <path
-         style="fill:#b7e399;fill-opacity:1"
-         d="M -14.125,-20.5 C -10.833333,-20.5 -7.5416667,-20.5 -4.25,-20.5 C -4.25,-16.291667 -4.25,-12.083333 -4.25,-7.875 C -7.5416667,-7.875 -10.833333,-7.875 -14.125,-7.875 C -14.125,-12.083333 -14.125,-16.291667 -14.125,-20.5 z "
-         id="rect2634" />
-      <path
-         style="fill:#b7e399;fill-opacity:1"
-         d="M 0.87499981,-19.82869 C -5.9734771,-19.841218 -12.821955,-19.853745 -19.670432,-19.866273 C -16.227179,-23.244183 -12.783927,-26.622092 -9.3406748,-30.000001 C -5.9354496,-26.609564 -2.5302253,-23.219127 0.87499981,-19.82869 z "
-         id="path2638" />
-    </g>
+    <path
+       style="fill:#b7e399;fill-opacity:1;stroke:#000000;stroke-opacity:1;marker-end:none;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-linecap:round;stroke-linejoin:round"
+       d="M 19.34375 17.5625 C 19.34375 21.552083 19.34375 25.541668 19.34375 29.53125 C 17.636839 29.528128 15.925661 29.534372 14.21875 29.53125 C 17.623975 32.921687 21.032275 36.297063 24.4375 39.6875 C 27.880752 36.309591 31.337996 32.94041 34.78125 29.5625 C 32.928627 29.559111 31.071373 29.565889 29.21875 29.5625 C 29.21875 25.5625 29.21875 21.562501 29.21875 17.5625 C 25.927083 17.5625 22.635418 17.562501 19.34375 17.5625 z "
+       id="rect2634" />
   </g>
 </svg>
diff --git a/deluge/data/pixmaps/inactive.svg b/deluge/data/pixmaps/inactive.svg
index 884f1e1d3..5edd9bece 100644
--- a/deluge/data/pixmaps/inactive.svg
+++ b/deluge/data/pixmaps/inactive.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="inactive.svg"
+   sodipodi:docname="inactive-border.svg"
    inkscape:export-filename="/home/andrew/Projects/deluge-icons/inactive16.png"
    inkscape:export-xdpi="32.603073"
    inkscape:export-ydpi="32.603073"
@@ -204,15 +204,15 @@
      inkscape:pageshadow="2"
      inkscape:zoom="8"
      inkscape:cx="36.250498"
-     inkscape:cy="37.884169"
+     inkscape:cy="23.072085"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1266"
-     inkscape:window-height="944"
-     inkscape:window-x="12"
-     inkscape:window-y="34"
+     inkscape:window-width="1278"
+     inkscape:window-height="978"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:showpageshadow="false" />
   <metadata
      id="metadata4">
@@ -268,36 +268,31 @@
      inkscape:groupmode="layer">
     <path
        style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
+       d="M 23.854535,1.0445221 L 37.242155,18.355109 C 46.910607,29.935258 41.408532,44.012279 26.685812,45.088879 C 5.971353,45.671043 6.4202348,27.463218 11.166925,18.697769 L 23.854535,1.0445221 z "
        id="path2069"
        sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 35.111358,26.143133 C 28.972772,13.030586 17.560684,17.697957 17.274449,26.949974 C 16.894738,39.223415 34.748874,37.615429 36.715244,41.468778 C 28.821643,47.675479 14.973233,45.226508 10.962289,39.715204 C 6.9574776,34.212326 7.2383598,25.630263 10.784249,19.587632 C 24.158625,0.978654 39.749127,24.383766 35.111358,26.143133 z "
-       id="path2969"
-       sodipodi:nodetypes="cscscc" />
     <path
        style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
        d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
        id="path2071"
        sodipodi:nodetypes="ccccc" />
     <g
-       id="g4419"
-       transform="translate(33.34375,38.875)">
+       id="g3590"
+       transform="matrix(0.9616363,0,0,0.855461,0.9207282,3.9296533)">
       <rect
-         y="-19"
-         x="-16.5"
-         height="14.625"
-         width="5.875"
+         y="19.754131"
+         x="14.548919"
+         height="14.866735"
+         width="7.7589664"
          id="rect4415"
-         style="fill:#cfcfcf;fill-opacity:1" />
+         style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
-         y="-19"
-         x="-8.0625"
-         height="14.625"
-         width="5.875"
+         y="19.754131"
+         x="25.692116"
+         height="14.866735"
+         width="7.7589664"
          id="rect4417"
-         style="fill:#cfcfcf;fill-opacity:1" />
+         style="fill:#cfcfcf;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/deluge/data/pixmaps/seeding.svg b/deluge/data/pixmaps/seeding.svg
index b891cc1ff..0e32ddac2 100644
--- a/deluge/data/pixmaps/seeding.svg
+++ b/deluge/data/pixmaps/seeding.svg
@@ -15,7 +15,7 @@
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/andrew/Projects/deluge-icons"
-   sodipodi:docname="seeding.svg"
+   sodipodi:docname="seeding-border.png.svg"
    inkscape:export-filename="/home/andrew/Projects/deluge-icons/seeding16.png"
    inkscape:export-xdpi="32.603073"
    inkscape:export-ydpi="32.603073"
@@ -275,10 +275,10 @@
      showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="794"
-     inkscape:window-height="622"
-     inkscape:window-x="395"
-     inkscape:window-y="67"
+     inkscape:window-width="1278"
+     inkscape:window-height="978"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:showpageshadow="false" />
   <metadata
      id="metadata4">
@@ -337,28 +337,14 @@
        d="M 23.942923,0.9561338 L 37.330543,18.266721 C 46.998995,29.84687 41.49692,43.923891 26.7742,45.000491 C 6.0597413,45.582655 6.5086231,27.37483 11.255313,18.609381 L 23.942923,0.9561338 z "
        id="path2069"
        sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07523891px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 35.111358,26.143133 C 28.972772,13.030586 17.560684,17.697957 17.274449,26.949974 C 16.894738,39.223415 34.748874,37.615429 36.715244,41.468778 C 28.821643,47.675479 14.973233,45.226508 10.962289,39.715204 C 6.9574776,34.212326 7.2383598,25.630263 10.784249,19.587632 C 24.158625,0.978654 39.749127,24.383766 35.111358,26.143133 z "
-       id="path2969"
-       sodipodi:nodetypes="cscscc" />
     <path
        style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.1000706;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36612022"
        d="M 23.996861,3.5433428 L 36.057351,19.151045 C 44.769741,29.58253 39.419346,42.414092 26.125181,43.508521 C 7.3917365,44.015286 7.4275065,28.119221 12.17284,20.333442 L 23.996861,3.5433428 z "
        id="path2071"
        sodipodi:nodetypes="ccccc" />
-    <g
-       id="g2640"
-       transform="translate(33.647716,44.9375)"
-       style="fill:#93beff;fill-opacity:1">
-      <path
-         style="fill:#93beff;fill-opacity:1"
-         d="M -14.125,-20.5 C -10.833333,-20.5 -7.5416667,-20.5 -4.25,-20.5 C -4.25,-16.291667 -4.25,-12.083333 -4.25,-7.875 C -7.5416667,-7.875 -10.833333,-7.875 -14.125,-7.875 C -14.125,-12.083333 -14.125,-16.291667 -14.125,-20.5 z "
-         id="rect2634" />
-      <path
-         style="fill:#93beff;fill-opacity:1"
-         d="M 0.87499981,-19.82869 C -5.9734771,-19.841218 -12.821955,-19.853745 -19.670432,-19.866273 C -16.227179,-23.244183 -12.783927,-26.622092 -9.3406748,-30.000001 C -5.9354496,-26.609564 -2.5302253,-23.219127 0.87499981,-19.82869 z "
-         id="path2638" />
-    </g>
+    <path
+       style="fill:#93beff;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       d="M 24.3125 14.9375 C 20.869248 18.315409 17.412003 21.684591 13.96875 25.0625 C 15.821373 25.065889 17.678627 25.059111 19.53125 25.0625 C 19.53125 29.0625 19.53125 33.0625 19.53125 37.0625 C 22.822917 37.0625 26.114582 37.0625 29.40625 37.0625 C 29.40625 33.072917 29.40625 29.083333 29.40625 25.09375 C 31.113161 25.096872 32.824339 25.090627 34.53125 25.09375 C 31.126025 21.703313 27.717725 18.327937 24.3125 14.9375 z "
+       id="rect2634" />
   </g>
 </svg>