diff --git a/deluge/ui/webui/scripts/copy_icons.py b/deluge/ui/webui/scripts/copy_icons.py
index 1ac16f02b..ead69c7ff 100644
--- a/deluge/ui/webui/scripts/copy_icons.py
+++ b/deluge/ui/webui/scripts/copy_icons.py
@@ -22,18 +22,24 @@
 
 """
 copy  icons from kde icon set.
-Edit ICON_SET and TARGET before running this file.
+Edit ICON_SET and TARGET_DIR before running this file.
 #perl -pi -w -e 's/tango/16/g;' *.html
 """
 import os
 from os import path
 from shutil import copyfile
 
-ICON_SET  = "/home/martijn/prj/oxygen/oxygen/16x16"
-TARGET_DIR = "/home/martijn/src/deluge/deluge/ui/webui/static/images/16"
+ICON_SET  = "/home/martijn/prj/oxygen/oxygen"
+TARGET_DIR = "/home/martijn/src/deluge/deluge/ui/webui"
 
+def copy_icons(source_dir , target_dir , mapping):
+    for target, source in mapping.iteritems():
+        source = path.join(source_dir, source) +  ".png"
+        target = path.join(target_dir, target) +  ".png"
+        print "%s -> %s" % (source, target)
+        copyfile(source, target)
 
-mapping = {
+map_static16 = {
     "down":"actions/1downarrow",
     "up":"actions/1downarrow",
     "connections":"apps/preferences_system_network_sharing",
@@ -61,9 +67,30 @@ mapping = {
     "select-all":"actions/edit_select_all"
 }
 
-for target, source in mapping.iteritems():
-    source = path.join(ICON_SET, source) +  ".png"
-    target = path.join(TARGET_DIR, target) +  ".png"
-    print "%s->%s" % (source, target)
-    copyfile(source, target)
+map_ajax16 = {
+    "gtk-edit":"actions/object_edit",
+    "gtk-yes":"actions/flag_green",
+    "network-idle":"apps/preferences_system_network_sharing",
+    "view-refresh":"actions/view_refresh",
+    "view-sort-ascending":"actions/view_sort_ascending",
+    "view-sort-descending":"actions/view_sort_descending"
+}
+
+map_ajax32 = {
+    "add":"actions/add",
+    "connections":"apps/preferences_system_network_sharing",
+    "down":"actions/1downarrow",
+    "up":"actions/1uparrow",
+    "new":"actions/document_new",
+    "options":"apps/preferences_system",
+    "pause":"actions/media_playback_pause",
+    "remove":"actions/fileclose",
+    "resume":"actions/media_playback_start"
+}
+
+
+copy_icons( path.join(ICON_SET, "16x16"), path.join(TARGET_DIR, "static/images/16"), map_static16)
+copy_icons( path.join(ICON_SET, "16x16"), path.join(TARGET_DIR, "templates/ajax/static/icons/16"), map_ajax16)
+copy_icons( path.join(ICON_SET, "32x32"), path.join(TARGET_DIR, "templates/ajax/static/icons/32"), map_ajax32)
+
 
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png
index 5200e14f5..0947dbfb4 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png and b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-edit.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png
index f04fc1612..addab095f 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png and b/deluge/ui/webui/templates/ajax/static/icons/16/gtk-yes.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png b/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png
index 0efee57e5..2911e0cdc 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png and b/deluge/ui/webui/templates/ajax/static/icons/16/network-idle.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png
index 3fd71d6e5..86b6f82c1 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png and b/deluge/ui/webui/templates/ajax/static/icons/16/view-refresh.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png
index beba44948..c199438d8 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png and b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-ascending.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png
index ea4abc4d6..7ae855acd 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png and b/deluge/ui/webui/templates/ajax/static/icons/16/view-sort-descending.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/add.png b/deluge/ui/webui/templates/ajax/static/icons/32/add.png
index 2acdd8f51..2be63d7db 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/add.png and b/deluge/ui/webui/templates/ajax/static/icons/32/add.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/connections.png b/deluge/ui/webui/templates/ajax/static/icons/32/connections.png
index 4137b3c3b..2855e74f8 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/connections.png and b/deluge/ui/webui/templates/ajax/static/icons/32/connections.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/down.png b/deluge/ui/webui/templates/ajax/static/icons/32/down.png
index dce3f15ef..7c9274f30 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/down.png and b/deluge/ui/webui/templates/ajax/static/icons/32/down.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/new.png b/deluge/ui/webui/templates/ajax/static/icons/32/new.png
index e6d64bb90..3d0f5cc1d 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/new.png and b/deluge/ui/webui/templates/ajax/static/icons/32/new.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/options.png b/deluge/ui/webui/templates/ajax/static/icons/32/options.png
index 3ec71a357..2afbd23cc 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/options.png and b/deluge/ui/webui/templates/ajax/static/icons/32/options.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/pause.png b/deluge/ui/webui/templates/ajax/static/icons/32/pause.png
index 1e9f4d535..5c7d128ee 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/pause.png and b/deluge/ui/webui/templates/ajax/static/icons/32/pause.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/remove.png b/deluge/ui/webui/templates/ajax/static/icons/32/remove.png
index c5524f728..81b5e45ff 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/remove.png and b/deluge/ui/webui/templates/ajax/static/icons/32/remove.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/resume.png b/deluge/ui/webui/templates/ajax/static/icons/32/resume.png
index 66f32d89b..71906857c 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/resume.png and b/deluge/ui/webui/templates/ajax/static/icons/32/resume.png differ
diff --git a/deluge/ui/webui/templates/ajax/static/icons/32/up.png b/deluge/ui/webui/templates/ajax/static/icons/32/up.png
index afb307b18..2da61b945 100644
Binary files a/deluge/ui/webui/templates/ajax/static/icons/32/up.png and b/deluge/ui/webui/templates/ajax/static/icons/32/up.png differ