diff --git a/.gitattributes b/.gitattributes
index b9b65cfcf..b4a9dd2a4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,8 +6,6 @@ docs/source/ export-ignore
 /tests/ export-ignore
 deluge/scripts/ export-ignore
 setup.cfg export-ignore
-check_glade.sh export-ignore
-createicons.sh export-ignore
 create_potfiles_in.py export-ignore
 gettextize.sh export-ignore
 deluge/i18n/deluge.pot export-ignore
diff --git a/createicons.sh b/createicons.sh
deleted file mode 100755
index 9303e5adb..000000000
--- a/createicons.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-for size in 16 22 24 32 36 48 64 72 96 128 192 256; do mkdir -p deluge/ui/data/\
-icons/hicolor/${size}x${size}/apps; rsvg-convert -w ${size} -h ${size} \
--o deluge/ui/data/icons/hicolor/${size}x${size}/apps/deluge.png deluge/ui/data/pixmaps\
-/deluge.svg; mkdir -p deluge/ui/data/icons/scalable/apps/; cp deluge/ui/data/pixmaps/\
-deluge.svg deluge/ui/data/icons/scalable/apps/deluge.svg; done
diff --git a/check_glade.sh b/deluge/scripts/check_glade
similarity index 88%
rename from check_glade.sh
rename to deluge/scripts/check_glade
index f3d081c5b..ed3ecc8e4 100755
--- a/check_glade.sh
+++ b/deluge/scripts/check_glade
@@ -1,7 +1,8 @@
-#!/bin/sh
-
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$DIR/../"
 # Fixes glade files which may have set gtk stock labels set to translatable
-for x in `find . -name '*.glade' |grep -v '.git\|build'` ; do \
+for x in `find . -name '*.glade' -o -name '*.ui' |grep -v '.git\|build'` ; do \
     for y in gtk-add gtk-apply gtk-bold gtk-cancel gtk-cdrom gtk-clear \
         gtk-close gtk-color-picker gtk-connect gtk-convert gtk-copy gtk-cut \
         gtk-delete gtk-dialog-error gtk-dialog-info gtk-dialog-question \
diff --git a/deluge/scripts/createicons b/deluge/scripts/createicons
new file mode 100755
index 000000000..a643db205
--- /dev/null
+++ b/deluge/scripts/createicons
@@ -0,0 +1,9 @@
+#!/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 85e21fafd..9c5f2d8e8 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 e39cd0c7e..9fb667e69 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 ead465c7d..3621202ea 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 de0fdea7b..cd17db7a8 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 faad5cc25..d4324ae5c 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 8819b5436..08273197e 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 2d272f2ea..2933b8a18 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 56c9c98a8..734de001e 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 37fcf8e45..8dc740b58 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/64x64/apps/deluge.png b/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png
index ca004d0ca..7498e8aa1 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 22e2a0185..3ad867312 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 6b182a48d..959b77720 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/scalable/apps/deluge.svg b/deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg
similarity index 100%
rename from deluge/ui/data/icons/scalable/apps/deluge.svg
rename to deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg
diff --git a/setup.py b/setup.py
index d2cc59dd4..52ed2ecdb 100755
--- a/setup.py
+++ b/setup.py
@@ -286,7 +286,7 @@ cmdclass = {
 
 # Data files to be installed to the system
 _data_files = [
-    ('share/icons/hicolor/scalable/apps', ['deluge/ui/data/icons/scalable/apps/deluge.svg']),
+    ('share/icons/hicolor/scalable/apps', ['deluge/ui/data/icons/hicolor/scalable/apps/deluge.svg']),
     ('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']),
     ('share/icons/hicolor/16x16/apps', ['deluge/ui/data/icons/hicolor/16x16/apps/deluge.png']),
     ('share/icons/hicolor/192x192/apps', ['deluge/ui/data/icons/hicolor/192x192/apps/deluge.png']),