diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index 0d13a0f94..dad5b6b90 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -70,6 +70,11 @@ html, body {
 }
 
 
+/* Login */
+.x-deluge-login-window-icon {
+	background: url('/icons/16/login.png') no-repeat 2px;
+}
+
 /* Statusbar */
 #deluge-statusbar .x-not-connected {
 	background: url('/icons/16/error.png') no-repeat 2px;
diff --git a/deluge/ui/web/icons/16/LICENSE b/deluge/ui/web/icons/16/LICENSE
index 8d6d0478e..e24caa454 100644
--- a/deluge/ui/web/icons/16/LICENSE
+++ b/deluge/ui/web/icons/16/LICENSE
@@ -19,9 +19,11 @@ Licensed under the Creative Common Attribution-ShareAlike 3.0 License.
  - go-bottom.png
  - go-top.png
  - help.png
+ - login.png
  - logout.png
  - pause.png
  - preferences.png
  - remove.png
  - start.png
  - up.png
+ - warning.png
diff --git a/deluge/ui/web/icons/16/list-add.png b/deluge/ui/web/icons/16/list-add.png
deleted file mode 100644
index 7bb9b1be8..000000000
Binary files a/deluge/ui/web/icons/16/list-add.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/list-remove.png b/deluge/ui/web/icons/16/list-remove.png
deleted file mode 100644
index 06c1cf41f..000000000
Binary files a/deluge/ui/web/icons/16/list-remove.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/login.png b/deluge/ui/web/icons/16/login.png
new file mode 100644
index 000000000..7e47c799a
Binary files /dev/null and b/deluge/ui/web/icons/16/login.png differ
diff --git a/deluge/ui/web/icons/16/preferences-system.png b/deluge/ui/web/icons/16/preferences-system.png
deleted file mode 100644
index f2c7c0867..000000000
Binary files a/deluge/ui/web/icons/16/preferences-system.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/process-stop.png b/deluge/ui/web/icons/16/process-stop.png
deleted file mode 100644
index 5b4c488bd..000000000
Binary files a/deluge/ui/web/icons/16/process-stop.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/queue-down.png b/deluge/ui/web/icons/16/queue-down.png
deleted file mode 100644
index 03f201428..000000000
Binary files a/deluge/ui/web/icons/16/queue-down.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/queue-up.png b/deluge/ui/web/icons/16/queue-up.png
deleted file mode 100644
index cd7263359..000000000
Binary files a/deluge/ui/web/icons/16/queue-up.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/system-log-out.png b/deluge/ui/web/icons/16/system-log-out.png
deleted file mode 100644
index 201353e70..000000000
Binary files a/deluge/ui/web/icons/16/system-log-out.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/view-refresh.png b/deluge/ui/web/icons/16/view-refresh.png
deleted file mode 100644
index 86b6f82c1..000000000
Binary files a/deluge/ui/web/icons/16/view-refresh.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/warning.png b/deluge/ui/web/icons/16/warning.png
new file mode 100644
index 000000000..f7e45330b
Binary files /dev/null and b/deluge/ui/web/icons/16/warning.png differ
diff --git a/deluge/ui/web/js/deluge-login.js b/deluge/ui/web/js/deluge-login.js
index 2e239a675..97029b9f6 100644
--- a/deluge/ui/web/js/deluge-login.js
+++ b/deluge/ui/web/js/deluge-login.js
@@ -14,7 +14,8 @@ Deluge.Login = {
                         msg: _('You entered an incorrect password'),
                         buttons: Ext.MessageBox.OK,
                         modal: false,
-                        icon: Ext.MessageBox.WARNING
+                        icon: Ext.MessageBox.WARNING,
+                        iconCls: '.x-deluge-warning'
                     });
                 }
             }
@@ -65,6 +66,7 @@ Deluge.Login.Window = new Ext.Window({
     modal: true,
     plain: true,
     title: _('Login'),
+    iconCls: 'x-deluge-login-window-icon',
     items: Deluge.Login.Form,
     buttons: [{
         text: _('Login'),