diff --git a/deluge/ui/webui/webui_plugin/render.py b/deluge/ui/webui/webui_plugin/render.py
index c04ee42fc..dbcf5ca1b 100644
--- a/deluge/ui/webui/webui_plugin/render.py
+++ b/deluge/ui/webui/webui_plugin/render.py
@@ -117,7 +117,12 @@ def altrow(reset = False):
 
 def deluge_int(val):
     if val == -1 :
-        return _("Unlimited")
+        return "∞"
+    return val
+
+def ftime(val):
+    if val <= 0:
+        return _("∞")
     return val
 
 template.Template.globals.update({
@@ -135,7 +140,7 @@ template.Template.globals.update({
     'self_url': self_url,
     'fspeed': common.fspeed,
     'fsize': common.fsize,
-    'ftime':common.ftime,
+    'ftime':ftime,
     'render': render, #for easy resuse of templates
     'rev': 'rev.%s'  % (REVNO, ),
     'version': VERSION,
diff --git a/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css b/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
index 50f2cd2b0..b8135c2d8 100644
--- a/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
+++ b/deluge/ui/webui/webui_plugin/templates/advanced/static/advanced.css
@@ -190,6 +190,7 @@ body.inner {
 #stats_panel img{
 		position:relative;
 		top:3px;
+		margin-right:3px;
 }
 
 
diff --git a/deluge/ui/webui/webui_plugin/utils.py b/deluge/ui/webui/webui_plugin/utils.py
index 07d3f9d8b..2ebdb708f 100644
--- a/deluge/ui/webui/webui_plugin/utils.py
+++ b/deluge/ui/webui/webui_plugin/utils.py
@@ -136,12 +136,12 @@ def get_stats():
 
 
     if stats.max_upload < 0:
-        stats.max_upload = _("Unlimited")
+        stats.max_upload = _("∞")
     else:
         stats.max_upload = "%s KiB/s" % stats.max_upload
 
     if stats.max_download < 0:
-        stats.max_download = _("Unlimited")
+        stats.max_download = _("∞")
     else:
         stats.max_download = "%s KiB/s" % stats.max_download
 
diff --git a/deluge/ui/webui/webui_plugin/webserver_common.py b/deluge/ui/webui/webui_plugin/webserver_common.py
index ab332a119..f9b901601 100644
--- a/deluge/ui/webui/webui_plugin/webserver_common.py
+++ b/deluge/ui/webui/webui_plugin/webserver_common.py
@@ -82,18 +82,6 @@ STATE_MESSAGES = (_("Queued"),
     _("Seeding"),
     _("Allocating"))
 
-SPEED_VALUES = [
-        (-1, 'Unlimited'),
-        (5, '5.0 Kib/sec'),
-        (10, '10.0 Kib/sec'),
-        (15, '15.0 Kib/sec'),
-        (25, '25.0 Kib/sec'),
-        (30, '30.0 Kib/sec'),
-        (50, '50.0 Kib/sec'),
-        (80, '80.0 Kib/sec'),
-        (300, '300.0 Kib/sec'),
-        (500, '500.0 Kib/sec')
-    ]
 CONFIG_DEFAULTS = {
     "port":8112,
     "button_style":2,