diff --git a/deluge/ui/webui/register_menu.py b/deluge/ui/webui/register_menu.py
index 6f7ff929c..b6c1c9c2b 100644
--- a/deluge/ui/webui/register_menu.py
+++ b/deluge/ui/webui/register_menu.py
@@ -55,7 +55,7 @@ menu.register_toolbar_item("start",_("Start"), "start.png" ,TB.torrent_list, "PO
 menu.register_toolbar_item("queue_up",_("Queue Up"), "queue-up.png" ,TB.torrent_list, "POST","/torrent/queue/up/", True)
 menu.register_toolbar_item("queue_down",_("Queue Down"), "queue-down.png" ,TB.torrent_list, "POST","/torrent/queue/down/", True)
 menu.register_toolbar_item("queue_top",_("Queue Top"), "go-top.png" ,TB.torrent_list, "POST","/torrent/queue/top/", True)
-menu.register_toolbar_item("queue_bottom",_("Queue Down"), "go-bottom.png" ,TB.torrent_list, "POST","/torrent/queue/bottom/", True)
+menu.register_toolbar_item("queue_bottom",_("Queue Bottom"), "go-bottom.png" ,TB.torrent_list, "POST","/torrent/queue/bottom/", True)
 menu.register_toolbar_item("details",_("Details"), "details.png" ,TB.torrent, "GET","/torrent/info/", True)
 menu.register_toolbar_item("move",_("Move"), "move.png" ,TB.torrent_list,"POST","/torrent/move/", True)
 menu.register_toolbar_item("reannounce",_("Reannounce"), "view-refresh.png" ,TB.torrent_list, "POST","/torrent/reannounce/", False)
diff --git a/deluge/ui/webui/static/images/tango/edit-clear.png b/deluge/ui/webui/static/images/tango/edit-clear.png
new file mode 100644
index 000000000..e6c8e8b9f
Binary files /dev/null and b/deluge/ui/webui/static/images/tango/edit-clear.png differ
diff --git a/deluge/ui/webui/templates/white/part_organize.html b/deluge/ui/webui/templates/white/part_organize.html
index 22a96334a..fae574431 100644
--- a/deluge/ui/webui/templates/white/part_organize.html
+++ b/deluge/ui/webui/templates/white/part_organize.html
@@ -39,13 +39,14 @@ $for tracker, num in filters.tracker:
 
 
 <div class="title">$_('Keyword')</div>
-$if get('keyword'):
-    <div style="background-color:#F00">
-<input type="text" name="keyword" value="$get('keyword')" style="width:100px"
+<input type="text" name="keyword" id="keyword" value="$get('keyword')" style="width:100px;padding:0px"
 title="$_('Filter on a keyword')"
 />
 $if get('keyword'):
-    </div>
+    <button onclick="document.getElementById('keyword').value=''" style="padding:0px;position:relative;top:2px">
+    <img src="$base/static/images/tango/edit-clear.png" alt="$_('Clear')">
+    </button>
+
 
 </div>
 </form>