diff --git a/deluge/scripts/create_deluge_pngs b/deluge/scripts/create_deluge_pngs
new file mode 100755
index 000000000..fed4f4e63
--- /dev/null
+++ b/deluge/scripts/create_deluge_pngs
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# A script to convert the Deluge svg icons to png.
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+data_dir="$DIR/../ui/data"
+
+# Create deluge png icon pack for all sizes.
+for size in 16 22 24 32 36 48 64 72 96 128 192 256; do
+ mkdir -p $data_dir/icons/hicolor/${size}x${size}/apps
+ in_svg=$data_dir/pixmaps/deluge.svg
+ out_png=$data_dir/icons/hicolor/${size}x${size}/apps/deluge.png
+ rsvg-convert -w ${size} -h ${size} -o $out_png $in_svg; done
+
+# Create deluge.ico icon from pngs.
+for size in 16 32 64 128 256; do
+ ico_infiles+="$data_dir/icons/hicolor/${size}x${size}/apps/deluge.png "; done
+convert $ico_infiles $data_dir/pixmaps/deluge.ico
+
+# Copy of deluge.svg to icon pack.
+mkdir -p $data_dir/icons/hicolor/scalable/apps/
+cp $data_dir/pixmaps/deluge.svg $data_dir/icons/hicolor/scalable/apps/deluge.svg
+
+# Create 48px deluge.png.
+rsvg-convert -w 48 -h 48 -o $data_dir/pixmaps/deluge.png $data_dir/pixmaps/deluge.svg
+
+# Create 16px png from deluge and status svgs.
+for file in $data_dir/pixmaps/*.svg; do
+ rsvg-convert -w 16 -h 16 -o ${file%.*}16.png $file; done
+
+# Copy 16px deluge and status pngs to webui icons folder.
+for icon in $data_dir/pixmaps/*16.png; do
+ iconname=$(basename $icon)
+ cp $icon $data_dir/../web/icons/${iconname::-6}.png; done
+rm $data_dir/../web/icons/tracker*.png
+
+# Create apple and android touch icons with background colour.
+rsvg-convert -w 192 -h 192 -b '#abcdf7' -o $data_dir/../web/icons/deluge-android-192.png $data_dir/pixmaps/deluge.svg
+rsvg-convert -w 180 -h 180 -b '#abcdf7' -o $data_dir/../web/icons/deluge-apple-180.png $data_dir/pixmaps/deluge.svg
diff --git a/deluge/scripts/createicons b/deluge/scripts/createicons
deleted file mode 100755
index a643db205..000000000
--- a/deluge/scripts/createicons
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-data_dir="$DIR/../ui/data"
-for size in 16 22 24 32 36 48 64 72 96 128 192 256; do
- mkdir -p $data_dir/icons/hicolor/${size}x${size}/apps;
- rsvg-convert -w ${size} -h ${size} -o $data_dir/icons/hicolor/${size}x${size}/apps/deluge.png $data_dir/pixmaps/deluge.svg;
- mkdir -p $data_dir/icons/hicolor/scalable/apps/;
- cp $data_dir/pixmaps/deluge.svg $data_dir/icons/hicolor/scalable/apps/deluge.svg;
-done
diff --git a/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png b/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png
index 9c5f2d8e8..181e6da8a 100644
Binary files a/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png and b/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png b/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png
index 9fb667e69..fdc689cf7 100644
Binary files a/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png and b/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png b/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png
index 3621202ea..43d2875e3 100644
Binary files a/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png and b/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png b/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png
index cd17db7a8..68dfbf4c7 100644
Binary files a/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png and b/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png b/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png
index d4324ae5c..b67ba114a 100644
Binary files a/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png and b/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png b/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png
index 08273197e..1c71a1446 100644
Binary files a/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png and b/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png b/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png
index 2933b8a18..f16876b54 100644
Binary files a/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png and b/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png b/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png
index 734de001e..1f1c7c7e6 100644
Binary files a/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png and b/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png b/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png
index 8dc740b58..a72c7b665 100644
Binary files a/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png and b/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/512x512/apps/deluge.png b/deluge/ui/data/icons/hicolor/512x512/apps/deluge.png
new file mode 100644
index 000000000..c4bf1ed3b
Binary files /dev/null and b/deluge/ui/data/icons/hicolor/512x512/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png b/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png
index 7498e8aa1..53f30620a 100644
Binary files a/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png and b/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png b/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png
index 3ad867312..ad8629577 100644
Binary files a/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png and b/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png b/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png
index 959b77720..a697a810d 100644
Binary files a/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png and b/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png differ
diff --git a/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg b/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg
index 69e59776d..22350ce15 100644
--- a/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg
+++ b/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg
@@ -1,8 +1,9 @@
+
diff --git a/deluge/ui/data/pixmaps/active.svg b/deluge/ui/data/pixmaps/active.svg
index b6df4a4de..2e6116a66 100644
--- a/deluge/ui/data/pixmaps/active.svg
+++ b/deluge/ui/data/pixmaps/active.svg
@@ -1,150 +1,612 @@
+
diff --git a/deluge/ui/data/pixmaps/active16.png b/deluge/ui/data/pixmaps/active16.png
index 1d6764051..6a2eda14b 100644
Binary files a/deluge/ui/data/pixmaps/active16.png and b/deluge/ui/data/pixmaps/active16.png differ
diff --git a/deluge/ui/data/pixmaps/alert.svg b/deluge/ui/data/pixmaps/alert.svg
index ad69bb3f3..8f738729a 100644
--- a/deluge/ui/data/pixmaps/alert.svg
+++ b/deluge/ui/data/pixmaps/alert.svg
@@ -1,96 +1,512 @@
+
diff --git a/deluge/ui/data/pixmaps/alert16.png b/deluge/ui/data/pixmaps/alert16.png
index acfe643ca..057fb4b7b 100644
Binary files a/deluge/ui/data/pixmaps/alert16.png and b/deluge/ui/data/pixmaps/alert16.png differ
diff --git a/deluge/ui/data/pixmaps/all.svg b/deluge/ui/data/pixmaps/all.svg
index 92c78f0a2..6dd99c9d5 100644
--- a/deluge/ui/data/pixmaps/all.svg
+++ b/deluge/ui/data/pixmaps/all.svg
@@ -1,191 +1,826 @@
+
diff --git a/deluge/ui/data/pixmaps/all16.png b/deluge/ui/data/pixmaps/all16.png
index a16dc6dd5..d8c18d23b 100644
Binary files a/deluge/ui/data/pixmaps/all16.png and b/deluge/ui/data/pixmaps/all16.png differ
diff --git a/deluge/ui/data/pixmaps/checking.svg b/deluge/ui/data/pixmaps/checking.svg
index c3675e320..4d64b7e76 100644
--- a/deluge/ui/data/pixmaps/checking.svg
+++ b/deluge/ui/data/pixmaps/checking.svg
@@ -1,88 +1,504 @@
+
diff --git a/deluge/ui/data/pixmaps/checking16.png b/deluge/ui/data/pixmaps/checking16.png
index 9359b48a9..55cf186d6 100644
Binary files a/deluge/ui/data/pixmaps/checking16.png and b/deluge/ui/data/pixmaps/checking16.png differ
diff --git a/deluge/ui/data/pixmaps/deluge-about.png b/deluge/ui/data/pixmaps/deluge-about.png
index 63aef4fbb..39322eb71 100644
Binary files a/deluge/ui/data/pixmaps/deluge-about.png and b/deluge/ui/data/pixmaps/deluge-about.png differ
diff --git a/deluge/ui/data/pixmaps/deluge.ico b/deluge/ui/data/pixmaps/deluge.ico
index c78828c0f..2ccbe0346 100644
Binary files a/deluge/ui/data/pixmaps/deluge.ico and b/deluge/ui/data/pixmaps/deluge.ico differ
diff --git a/deluge/ui/data/pixmaps/deluge.png b/deluge/ui/data/pixmaps/deluge.png
index 3cc443361..a72c7b665 100644
Binary files a/deluge/ui/data/pixmaps/deluge.png and b/deluge/ui/data/pixmaps/deluge.png differ
diff --git a/deluge/ui/data/pixmaps/deluge.svg b/deluge/ui/data/pixmaps/deluge.svg
index 69e59776d..22350ce15 100644
--- a/deluge/ui/data/pixmaps/deluge.svg
+++ b/deluge/ui/data/pixmaps/deluge.svg
@@ -1,8 +1,9 @@
+
diff --git a/deluge/ui/data/pixmaps/deluge.xpm b/deluge/ui/data/pixmaps/deluge.xpm
deleted file mode 100644
index ad20e6016..000000000
--- a/deluge/ui/data/pixmaps/deluge.xpm
+++ /dev/null
@@ -1,433 +0,0 @@
-/* XPM */
-static char * deluge_xpm[] = {
-"32 32 398 2",
-" c None",
-". c #7B869E",
-"+ c #7B869D",
-"@ c #A5ADBE",
-"# c #A7AFBE",
-"$ c #8894A9",
-"% c #A4ADBD",
-"& c #A7AFBF",
-"* c #95A0B4",
-"= c #6F7E99",
-"- c #A0AABD",
-"; c #8594AD",
-"> c #8A98B1",
-", c #A7B3C6",
-"' c #8496AF",
-") c #5B6F90",
-"! c #8F9EB6",
-"~ c #8194AF",
-"{ c #7C91AF",
-"] c #8096B3",
-"^ c #859BB8",
-"/ c #A0B1C8",
-"( c #728CAD",
-"_ c #758BAA",
-": c #849AB7",
-"< c #6F8AAE",
-"[ c #7591B3",
-"} c #7995B8",
-"| c #7A97B9",
-"1 c #86A0C0",
-"2 c #93ABC7",
-"3 c #6585AE",
-"4 c #5A78A0",
-"5 c #879FBE",
-"6 c #6485AF",
-"7 c #698CB5",
-"8 c #6E91BA",
-"9 c #7295BD",
-"0 c #7497BF",
-"a c #7296BF",
-"b c #89A6C8",
-"c c #809FC4",
-"d c #436B9C",
-"e c #7B99BE",
-"f c #5378A6",
-"g c #446A9A",
-"h c #4B6F9C",
-"i c #5577A2",
-"j c #6183AE",
-"k c #6D92BD",
-"l c #7097C3",
-"m c #6E96C1",
-"n c #8DACCF",
-"o c #6C93BF",
-"p c #587DA9",
-"q c #446592",
-"r c #1B4075",
-"s c #204478",
-"t c #2F5081",
-"u c #496791",
-"v c #4F6B94",
-"w c #5879A4",
-"x c #6B93BE",
-"y c #6E97C2",
-"z c #8EADCF",
-"A c #5E89BA",
-"B c #3E669A",
-"C c #567198",
-"D c #24477A",
-"E c #315281",
-"F c #365685",
-"G c #3A5A86",
-"H c #405E8A",
-"I c #567197",
-"J c #577298",
-"K c #516E97",
-"L c #6187B3",
-"M c #7098C4",
-"N c #85A7CC",
-"O c #5280B6",
-"P c #305C92",
-"Q c #5A759B",
-"R c #2B4D7E",
-"S c #3B5A88",
-"T c #4C6991",
-"U c #597397",
-"V c #60799D",
-"W c #5C769A",
-"X c #587298",
-"Y c #637C9E",
-"Z c #5D769B",
-"` c #526F96",
-" . c #5B84B0",
-".. c #759BC6",
-"+. c #7398C4",
-"@. c #325D95",
-"#. c #4C6A94",
-"$. c #3B5B87",
-"%. c #44628C",
-"&. c #5B7599",
-"*. c #6D84A5",
-"=. c #647D9F",
-"-. c #6784A8",
-";. c #7194BD",
-">. c #769EC9",
-",. c #709AC4",
-"'. c #7293B8",
-"). c #6D86A9",
-"!. c #526E96",
-"~. c #5782B1",
-"{. c #7A9EC8",
-"]. c #5D8ABC",
-"^. c #325485",
-"/. c #4F6C94",
-"(. c #3D5C88",
-"_. c #5E779B",
-":. c #7489A8",
-"<. c #667FA1",
-"[. c #8BA3C1",
-"}. c #8BAED4",
-"|. c #83A9D3",
-"1. c #82A8D2",
-"2. c #7FA6D1",
-"3. c #7CA4CE",
-"4. c #7AA0CC",
-"5. c #708EB4",
-"6. c #5F789C",
-"7. c #4E6C96",
-"8. c #5986B9",
-"9. c #7FA2CA",
-"0. c #4B7CB2",
-"a. c #2B5387",
-"b. c #567199",
-"c. c #305282",
-"d. c #506B93",
-"e. c #7187A5",
-"f. c #6F85A3",
-"g. c #8EA4BF",
-"h. c #9DBBDC",
-"i. c #8EB2D9",
-"j. c #8DB1D8",
-"k. c #8AAED6",
-"l. c #84AAD3",
-"m. c #7EA5D0",
-"n. c #779FCC",
-"o. c #6C8BB0",
-"p. c #5E779A",
-"q. c #5178A6",
-"r. c #5C89BC",
-"s. c #7198C4",
-"t. c #325486",
-"u. c #4C6993",
-"v. c #5E789B",
-"w. c #778CA8",
-"x. c #7389A7",
-"y. c #B6CADF",
-"z. c #9ABBDF",
-"A. c #9BBCE0",
-"B. c #9ABCDF",
-"C. c #97B9DE",
-"D. c #93B6DB",
-"E. c #8CB1D8",
-"F. c #85ABD4",
-"G. c #7CA4CF",
-"H. c #749BC9",
-"I. c #6783A6",
-"J. c #56739C",
-"K. c #5283B8",
-"L. c #6F96C3",
-"M. c #4E7BAE",
-"N. c #42618D",
-"O. c #3E5C88",
-"P. c #667E9F",
-"Q. c #7288A7",
-"R. c #8EA1BA",
-"S. c #B9CFE7",
-"T. c #A6C5E6",
-"U. c #A7C6E6",
-"V. c #A5C4E6",
-"W. c #A1C1E3",
-"X. c #93B6DC",
-"Y. c #8AAFD7",
-"Z. c #80A7D1",
-"`. c #769FCC",
-" + c #6992BF",
-".+ c #5D789D",
-"++ c #5483B9",
-"@+ c #5281B7",
-"#+ c #688FBB",
-"$+ c #557198",
-"%+ c #1E4277",
-"&+ c #3F5E88",
-"*+ c #687FA0",
-"=+ c #6F85A5",
-"-+ c #A0B2C8",
-";+ c #BFD5ED",
-">+ c #B3CFED",
-",+ c #B2CFED",
-"'+ c #AFCCEB",
-")+ c #A9C8E8",
-"!+ c #A2C2E4",
-"~+ c #99BADF",
-"{+ c #78A1CD",
-"]+ c #6C97C6",
-"^+ c #5D88B7",
-"/+ c #4779B2",
-"(+ c #7295BE",
-"_+ c #3C6699",
-":+ c #2B4F83",
-"<+ c #59749A",
-"[+ c #657D9E",
-"}+ c #6C83A3",
-"|+ c #A3B4CA",
-"1+ c #C7DDF2",
-"2+ c #BFD9F4",
-"3+ c #BDD7F2",
-"4+ c #B8D3F0",
-"5+ c #B0CDEC",
-"6+ c #9CBDE0",
-"7+ c #91B4DA",
-"8+ c #79A1CD",
-"9+ c #5F8DBF",
-"0+ c #4578B1",
-"a+ c #6B90BA",
-"b+ c #446A9B",
-"c+ c #2D5184",
-"d+ c #577299",
-"e+ c #305181",
-"f+ c #5B749A",
-"g+ c #6C82A2",
-"h+ c #98AAC3",
-"i+ c #D2E5F6",
-"j+ c #CAE2FA",
-"k+ c #C6DEF8",
-"l+ c #BED8F3",
-"m+ c #B4D0EE",
-"n+ c #9EBEE1",
-"o+ c #92B5DB",
-"p+ c #78A0CD",
-"q+ c #6B96C5",
-"r+ c #5D8BBE",
-"s+ c #5081B7",
-"t+ c #4276AF",
-"u+ c #6489B4",
-"v+ c #4B6E9B",
-"w+ c #2C5284",
-"x+ c #234679",
-"y+ c #4C6990",
-"z+ c #6C82A3",
-"A+ c #738AA9",
-"B+ c #D9E9F9",
-"C+ c #D3E9FF",
-"D+ c #CCE3FB",
-"E+ c #C2DBF5",
-"F+ c #B6D2EF",
-"G+ c #AAC8E8",
-"H+ c #9DBEE1",
-"I+ c #90B3DA",
-"J+ c #759ECB",
-"K+ c #6893C4",
-"L+ c #5A89BC",
-"M+ c #4D7EB5",
-"N+ c #3F73AD",
-"O+ c #6386B1",
-"P+ c #486A96",
-"Q+ c #2A5082",
-"R+ c #58739A",
-"S+ c #375685",
-"T+ c #5F789B",
-"U+ c #ADBED3",
-"V+ c #D4E9FE",
-"W+ c #CFE6FD",
-"X+ c #C2DCF6",
-"Y+ c #A8C7E7",
-"Z+ c #719BC9",
-"`+ c #6490C1",
-" @ c #5685BA",
-".@ c #487AB2",
-"+@ c #3F70A8",
-"@@ c #6B8BB2",
-"#@ c #3F608D",
-"$@ c #536F97",
-"%@ c #1F4377",
-"&@ c #224679",
-"*@ c #46638D",
-"=@ c #6880A0",
-"-@ c #6F86A5",
-";@ c #BBCDE0",
-">@ c #CEE4FC",
-",@ c #C0DAF4",
-"'@ c #A5C4E5",
-")@ c #96B9DD",
-"!@ c #88AED6",
-"~@ c #7CA3CE",
-"{@ c #719BC8",
-"]@ c #6692C2",
-"^@ c #5987BA",
-"/@ c #4C7CB3",
-"(@ c #4672A5",
-"_@ c #728DB1",
-":@ c #385884",
-"<@ c #3C5C89",
-"[@ c #385886",
-"}@ c #26497B",
-"|@ c #4B6790",
-"1@ c #6980A1",
-"2@ c #768BA9",
-"3@ c #9CB1CA",
-"4@ c #B9D3EE",
-"5@ c #ADCAEA",
-"6@ c #9EBFE2",
-"7@ c #90B4DA",
-"8@ c #87ACD5",
-"9@ c #7EA4CE",
-"0@ c #749CC8",
-"a@ c #6993C1",
-"b@ c #5C89BB",
-"c@ c #4F7DB1",
-"d@ c #5D80AC",
-"e@ c #617EA4",
-"f@ c #3A547B",
-"g@ c #2A4C7E",
-"h@ c #1C4176",
-"i@ c #27497B",
-"j@ c #45628D",
-"k@ c #60799C",
-"l@ c #7288A6",
-"m@ c #7D91AD",
-"n@ c #859FBE",
-"o@ c #93B4D7",
-"p@ c #8FB2D8",
-"q@ c #86ABD2",
-"r@ c #7EA4CD",
-"s@ c #759CC8",
-"t@ c #6A94C2",
-"u@ c #5C89BA",
-"v@ c #547EAE",
-"w@ c #7994B6",
-"x@ c #44628A",
-"y@ c #375786",
-"z@ c #476590",
-"A@ c #4C6890",
-"B@ c #5B7498",
-"C@ c #667EA0",
-"D@ c #6F86A7",
-"E@ c #738CAD",
-"F@ c #7592B7",
-"G@ c #779AC1",
-"H@ c #779DC7",
-"I@ c #6993C0",
-"J@ c #5B86B6",
-"K@ c #7B97BB",
-"L@ c #5A769E",
-"M@ c #394E6E",
-"N@ c #21426C",
-"O@ c #45638E",
-"P@ c #496691",
-"Q@ c #1D4176",
-"R@ c #41608B",
-"S@ c #4C6891",
-"T@ c #506D95",
-"U@ c #4E6B94",
-"V@ c #4B6A95",
-"W@ c #5176A3",
-"X@ c #7C99BC",
-"Y@ c #6280A8",
-"Z@ c #3E567A",
-"`@ c #25446F",
-" # c #395987",
-".# c #214579",
-"+# c #294C7E",
-"@# c #315383",
-"## c #3D5C8A",
-"$# c #43618D",
-"%# c #5C769C",
-"&# c #6D84A6",
-"*# c #405E8B",
-"=# c #375179",
-"-# c #1B304F",
-";# c #2E5181",
-"># c #415F8C",
-",# c #547098",
-"'# c #486590",
-")# c #43618E",
-"!# c #476690",
-"~# c #6981A4",
-"{# c #677FA3",
-"]# c #496690",
-"^# c #2E5283",
-"/# c #294467",
-"(# c #32507C",
-"_# c #325684",
-":# c #335484",
-"<# c #3F5E8B",
-"[# c #3E5F8D",
-"}# c #345887",
-"|# c #305383",
-"1# c #2A4466",
-" ",
-" . + ",
-" @ # ",
-" $ % & * ",
-" = - ; > , ' ",
-" ) ! ~ { ] ^ / ( ",
-" _ : < [ } | 1 2 3 ",
-" 4 5 6 7 8 9 0 a b c ",
-" d e f g h i j k l m n o ",
-" p q r r s t u v w x y z A ",
-" B C r D E F G H I J K L M N O ",
-" P Q R S T U V W I X Y Z ` ...+. ",
-" @.#.$.%.&.*.=.-.;.>.,.'.).V !.~.{.]. ",
-" ^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0. ",
-" a.b.c.d.e.f.g.h.i.i.j.k.l.m.n.o.p.q.r.s. ",
-" t.u.F v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M. ",
-" N.c.O.P.Q.R.S.T.U.V.W.A.X.Y.Z.`. +.+++@+#+ ",
-" $+%+&+*+=+-+;+>+,+'+)+!+~+i.|.{+]+^+++/+(+_+ ",
-" :+<+r G [+}+|+1+2+3+4+5+T.6+7+F.8+]+9+K.0+a+b+ ",
-" c+d+r e+f+g+h+i+j+k+l+m+)+n+o+l.p+q+r+s+t+u+v+ ",
-" w+Q r x+y+z+A+B+C+D+E+F+G+H+I+|.J+K+L+M+N+O+P+ ",
-" Q+R+r r S+T+*+U+V+W+X+F+Y+A.j.2.Z+`+ @.@+@@@#@ ",
-" $@%@r &@*@=@-@;@>@,@,+'@)@!@~@{@]@^@/@(@_@:@ ",
-" <@[@r r }@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@ ",
-" g@b.h@r r i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@ ",
-" y@z@r r r %@y@A@B@C@D@E@F@G@H@I@J@K@L@M@ ",
-" N@O@P@Q@r r r s e+R@S@T@` U@V@W@X@Y@Z@ ",
-" `@ #Q y@Q@r r .#+#@#[@##$#%#&#*#=# ",
-" -#;#>#d+,#'#)#!#u.Q ~#{#]#^#/# ",
-" (#_#:# #<#$#[#}#|#1# ",
-" ",
-" "};
diff --git a/deluge/ui/data/pixmaps/deluge16.png b/deluge/ui/data/pixmaps/deluge16.png
index e39cd0c7e..fdc689cf7 100644
Binary files a/deluge/ui/data/pixmaps/deluge16.png and b/deluge/ui/data/pixmaps/deluge16.png differ
diff --git a/deluge/ui/data/pixmaps/dht.svg b/deluge/ui/data/pixmaps/dht.svg
index 6e423defc..f145d0b63 100644
--- a/deluge/ui/data/pixmaps/dht.svg
+++ b/deluge/ui/data/pixmaps/dht.svg
@@ -1,5 +1,6 @@
+
diff --git a/deluge/ui/data/pixmaps/dht16.png b/deluge/ui/data/pixmaps/dht16.png
index 5e60b5227..f51627b2a 100644
Binary files a/deluge/ui/data/pixmaps/dht16.png and b/deluge/ui/data/pixmaps/dht16.png differ
diff --git a/deluge/ui/data/pixmaps/downloading.svg b/deluge/ui/data/pixmaps/downloading.svg
index 43b6d4616..d48cb6901 100644
--- a/deluge/ui/data/pixmaps/downloading.svg
+++ b/deluge/ui/data/pixmaps/downloading.svg
@@ -1,90 +1,515 @@
+
diff --git a/deluge/ui/data/pixmaps/downloading16.png b/deluge/ui/data/pixmaps/downloading16.png
index ca69760b8..57486aefa 100644
Binary files a/deluge/ui/data/pixmaps/downloading16.png and b/deluge/ui/data/pixmaps/downloading16.png differ
diff --git a/deluge/ui/data/pixmaps/inactive.svg b/deluge/ui/data/pixmaps/inactive.svg
index eb3340cd4..644f5f36e 100644
--- a/deluge/ui/data/pixmaps/inactive.svg
+++ b/deluge/ui/data/pixmaps/inactive.svg
@@ -1,101 +1,492 @@
+
diff --git a/deluge/ui/data/pixmaps/inactive16.png b/deluge/ui/data/pixmaps/inactive16.png
index a9c4ddea0..3a94cdab8 100644
Binary files a/deluge/ui/data/pixmaps/inactive16.png and b/deluge/ui/data/pixmaps/inactive16.png differ
diff --git a/deluge/ui/data/pixmaps/queued.svg b/deluge/ui/data/pixmaps/queued.svg
index adb1b93e5..a3c2d1cea 100644
--- a/deluge/ui/data/pixmaps/queued.svg
+++ b/deluge/ui/data/pixmaps/queued.svg
@@ -1,87 +1,532 @@
+
diff --git a/deluge/ui/data/pixmaps/queued16.png b/deluge/ui/data/pixmaps/queued16.png
index dd9b46b5c..c64b0a64d 100644
Binary files a/deluge/ui/data/pixmaps/queued16.png and b/deluge/ui/data/pixmaps/queued16.png differ
diff --git a/deluge/ui/data/pixmaps/seeding.svg b/deluge/ui/data/pixmaps/seeding.svg
index 811246644..e98b4a04c 100644
--- a/deluge/ui/data/pixmaps/seeding.svg
+++ b/deluge/ui/data/pixmaps/seeding.svg
@@ -1,90 +1,509 @@
+
diff --git a/deluge/ui/data/pixmaps/seeding16.png b/deluge/ui/data/pixmaps/seeding16.png
index 97190800a..2f6d526ff 100644
Binary files a/deluge/ui/data/pixmaps/seeding16.png and b/deluge/ui/data/pixmaps/seeding16.png differ
diff --git a/deluge/ui/data/pixmaps/traffic.svg b/deluge/ui/data/pixmaps/traffic.svg
index 3ec71eb3d..bea6164ec 100644
--- a/deluge/ui/data/pixmaps/traffic.svg
+++ b/deluge/ui/data/pixmaps/traffic.svg
@@ -1,5 +1,6 @@
+
diff --git a/deluge/ui/data/pixmaps/traffic16.png b/deluge/ui/data/pixmaps/traffic16.png
index d563d2dc8..9098c35fe 100644
Binary files a/deluge/ui/data/pixmaps/traffic16.png and b/deluge/ui/data/pixmaps/traffic16.png differ
diff --git a/deluge/ui/web/icons/active.png b/deluge/ui/web/icons/active.png
index 1d6764051..6a2eda14b 100644
Binary files a/deluge/ui/web/icons/active.png and b/deluge/ui/web/icons/active.png differ
diff --git a/deluge/ui/web/icons/alert.png b/deluge/ui/web/icons/alert.png
index acfe643ca..057fb4b7b 100644
Binary files a/deluge/ui/web/icons/alert.png and b/deluge/ui/web/icons/alert.png differ
diff --git a/deluge/ui/web/icons/all.png b/deluge/ui/web/icons/all.png
index a16dc6dd5..d8c18d23b 100644
Binary files a/deluge/ui/web/icons/all.png and b/deluge/ui/web/icons/all.png differ
diff --git a/deluge/ui/web/icons/apple-pre-114.png b/deluge/ui/web/icons/apple-pre-114.png
deleted file mode 100644
index 57c34e8c3..000000000
Binary files a/deluge/ui/web/icons/apple-pre-114.png and /dev/null differ
diff --git a/deluge/ui/web/icons/apple-pre-57.png b/deluge/ui/web/icons/apple-pre-57.png
deleted file mode 100644
index 97447894c..000000000
Binary files a/deluge/ui/web/icons/apple-pre-57.png and /dev/null differ
diff --git a/deluge/ui/web/icons/apple-pre-72.png b/deluge/ui/web/icons/apple-pre-72.png
deleted file mode 100644
index 1f70d0ecf..000000000
Binary files a/deluge/ui/web/icons/apple-pre-72.png and /dev/null differ
diff --git a/deluge/ui/web/icons/checking.png b/deluge/ui/web/icons/checking.png
index 9359b48a9..55cf186d6 100644
Binary files a/deluge/ui/web/icons/checking.png and b/deluge/ui/web/icons/checking.png differ
diff --git a/deluge/ui/web/icons/deluge-android-192.png b/deluge/ui/web/icons/deluge-android-192.png
new file mode 100644
index 000000000..18f602224
Binary files /dev/null and b/deluge/ui/web/icons/deluge-android-192.png differ
diff --git a/deluge/ui/web/icons/deluge-apple-180.png b/deluge/ui/web/icons/deluge-apple-180.png
new file mode 100644
index 000000000..64c7b9379
Binary files /dev/null and b/deluge/ui/web/icons/deluge-apple-180.png differ
diff --git a/deluge/ui/web/icons/deluge.png b/deluge/ui/web/icons/deluge.png
index e39cd0c7e..fdc689cf7 100644
Binary files a/deluge/ui/web/icons/deluge.png and b/deluge/ui/web/icons/deluge.png differ
diff --git a/deluge/ui/web/icons/dht.png b/deluge/ui/web/icons/dht.png
index 5e60b5227..f51627b2a 100644
Binary files a/deluge/ui/web/icons/dht.png and b/deluge/ui/web/icons/dht.png differ
diff --git a/deluge/ui/web/icons/downloading.png b/deluge/ui/web/icons/downloading.png
index ca69760b8..57486aefa 100644
Binary files a/deluge/ui/web/icons/downloading.png and b/deluge/ui/web/icons/downloading.png differ
diff --git a/deluge/ui/web/icons/inactive.png b/deluge/ui/web/icons/inactive.png
index a9c4ddea0..3a94cdab8 100644
Binary files a/deluge/ui/web/icons/inactive.png and b/deluge/ui/web/icons/inactive.png differ
diff --git a/deluge/ui/web/icons/queued.png b/deluge/ui/web/icons/queued.png
index dd9b46b5c..c64b0a64d 100644
Binary files a/deluge/ui/web/icons/queued.png and b/deluge/ui/web/icons/queued.png differ
diff --git a/deluge/ui/web/icons/seeding.png b/deluge/ui/web/icons/seeding.png
index 97190800a..2f6d526ff 100644
Binary files a/deluge/ui/web/icons/seeding.png and b/deluge/ui/web/icons/seeding.png differ
diff --git a/deluge/ui/web/icons/traffic.png b/deluge/ui/web/icons/traffic.png
index d563d2dc8..9098c35fe 100644
Binary files a/deluge/ui/web/icons/traffic.png and b/deluge/ui/web/icons/traffic.png differ
diff --git a/deluge/ui/web/index.html b/deluge/ui/web/index.html
index 670b9d276..32e3217f7 100644
--- a/deluge/ui/web/index.html
+++ b/deluge/ui/web/index.html
@@ -5,9 +5,9 @@
-
-
-
+
+
+
% for stylesheet in stylesheets: