diff --git a/deluge/ui/web/icons/16/LICENSE b/deluge/ui/web/icons/16/LICENSE
index 8a3a1222d..0ee20ac07 100644
--- a/deluge/ui/web/icons/16/LICENSE
+++ b/deluge/ui/web/icons/16/LICENSE
@@ -1,32 +1,3 @@
-icons in this folder are copied from the kde oxygen set
-
-http://www.oxygen-icons.org/?page_id=4
-
-LICENCE:
-Oxygen icon theme is dual licensed.
-You may copy it under the Creative Common Attribution-ShareAlike 3.0 License
-or the GNU Library General Public License.
-
-ICONS FROM FUGUE ICON SET:
-http://www.pinvoke.com
-Licensed under the Creative Common Attribution-ShareAlike 3.0 License.
-
- - add.png
- - add_file.png
- - add_magnet.png
- - add_url.png
- - connection_manager.png
- - create.png
- - down.png
- - error.png
- - go-bottom.png
- - go-top.png
- - help.png
- - login.png
- - logout.png
- - pause.png
- - preferences.png
- - remove.png
- - start.png
- - up.png
- - warning.png
+Icons in this folder are copied from the fruge icon set, taken from
+http://www.pinvoke.com, licensed under the Creative Common
+Attribution-ShareAlike 3.0 License.
diff --git a/deluge/ui/web/icons/16/bottom.png b/deluge/ui/web/icons/16/bottom.png
new file mode 100644
index 000000000..39d566acc
Binary files /dev/null and b/deluge/ui/web/icons/16/bottom.png differ
diff --git a/deluge/ui/web/icons/16/connections.png b/deluge/ui/web/icons/16/connections.png
new file mode 100644
index 000000000..8856340b9
Binary files /dev/null and b/deluge/ui/web/icons/16/connections.png differ
diff --git a/deluge/ui/web/icons/16/details.png b/deluge/ui/web/icons/16/details.png
deleted file mode 100644
index 0947dbfb4..000000000
Binary files a/deluge/ui/web/icons/16/details.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/drive-harddisk.png b/deluge/ui/web/icons/16/drive-harddisk.png
deleted file mode 100644
index bae21a835..000000000
Binary files a/deluge/ui/web/icons/16/drive-harddisk.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/edit-clear.png b/deluge/ui/web/icons/16/edit-clear.png
deleted file mode 100644
index 547dd41d3..000000000
Binary files a/deluge/ui/web/icons/16/edit-clear.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/edit_trackers.png b/deluge/ui/web/icons/16/edit_trackers.png
new file mode 100644
index 000000000..be49dbc24
Binary files /dev/null and b/deluge/ui/web/icons/16/edit_trackers.png differ
diff --git a/deluge/ui/web/icons/16/gtk-edit.png b/deluge/ui/web/icons/16/gtk-edit.png
deleted file mode 100644
index 0947dbfb4..000000000
Binary files a/deluge/ui/web/icons/16/gtk-edit.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/gtk-yes.png b/deluge/ui/web/icons/16/gtk-yes.png
deleted file mode 100644
index addab095f..000000000
Binary files a/deluge/ui/web/icons/16/gtk-yes.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/label.png b/deluge/ui/web/icons/16/label.png
deleted file mode 100644
index 0768148f1..000000000
Binary files a/deluge/ui/web/icons/16/label.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/move.png b/deluge/ui/web/icons/16/move.png
index cac82e0fe..febeb4d4d 100644
Binary files a/deluge/ui/web/icons/16/move.png and b/deluge/ui/web/icons/16/move.png differ
diff --git a/deluge/ui/web/icons/16/network-idle.png b/deluge/ui/web/icons/16/network-idle.png
deleted file mode 100644
index 2911e0cdc..000000000
Binary files a/deluge/ui/web/icons/16/network-idle.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/preferences.png b/deluge/ui/web/icons/16/preferences.png
index f560fca1c..243fdfa74 100644
Binary files a/deluge/ui/web/icons/16/preferences.png and b/deluge/ui/web/icons/16/preferences.png differ
diff --git a/deluge/ui/web/icons/16/go-bottom.png b/deluge/ui/web/icons/16/queue.png
similarity index 100%
rename from deluge/ui/web/icons/16/go-bottom.png
rename to deluge/ui/web/icons/16/queue.png
diff --git a/deluge/ui/web/icons/16/readme.txt b/deluge/ui/web/icons/16/readme.txt
index 0de2e9005..66049b810 100644
--- a/deluge/ui/web/icons/16/readme.txt
+++ b/deluge/ui/web/icons/16/readme.txt
@@ -1,5 +1,2 @@
-images from the kde-oxygen set.
-See webui/scripts/copy_icons.py for mapping.
-See LICENSE for a list of icons not taken from oxygen.
-
-
+images from the fruge icon set.
+See LICENSE for a list of icons not taken from fruge.
diff --git a/deluge/ui/web/icons/16/select-all.png b/deluge/ui/web/icons/16/select-all.png
deleted file mode 100644
index 24ce63b0e..000000000
Binary files a/deluge/ui/web/icons/16/select-all.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/top.png b/deluge/ui/web/icons/16/top.png
new file mode 100644
index 000000000..0c7f53789
Binary files /dev/null and b/deluge/ui/web/icons/16/top.png differ
diff --git a/deluge/ui/web/icons/16/go-top.png b/deluge/ui/web/icons/16/upload_slots.png
similarity index 100%
rename from deluge/ui/web/icons/16/go-top.png
rename to deluge/ui/web/icons/16/upload_slots.png
diff --git a/deluge/ui/web/icons/16/user-trash.png b/deluge/ui/web/icons/16/user-trash.png
deleted file mode 100644
index 5cd5e421f..000000000
Binary files a/deluge/ui/web/icons/16/user-trash.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/view-sort-ascending.png b/deluge/ui/web/icons/16/view-sort-ascending.png
deleted file mode 100644
index c199438d8..000000000
Binary files a/deluge/ui/web/icons/16/view-sort-ascending.png and /dev/null differ
diff --git a/deluge/ui/web/icons/16/view-sort-descending.png b/deluge/ui/web/icons/16/view-sort-descending.png
deleted file mode 100644
index 7ae855acd..000000000
Binary files a/deluge/ui/web/icons/16/view-sort-descending.png and /dev/null differ
diff --git a/deluge/ui/web/js/deluge-menus.js b/deluge/ui/web/js/deluge-menus.js
index be0223829..48480fa52 100644
--- a/deluge/ui/web/js/deluge-menus.js
+++ b/deluge/ui/web/js/deluge-menus.js
@@ -21,7 +21,141 @@ Copyright:
 		Boston, MA  02110-1301, USA.
 */
 
-Deluge.Menus = {}
+Deluge.Menus = {
+	onTorrentAction: function(e) {
+		
+	}
+}
+
+Deluge.Menus.Torrent = new Ext.menu.Menu({
+	id: 'torrentMenu',
+	items: [{
+		id: 'pause',
+		text: _('Pause'),
+		handler: Deluge.Menus.onTorrentAction,
+		scope: Deluge.Menus,
+		icon: '/icons/16/pause.png'
+	}, {
+		id: 'resume',
+		text: _('Resume'),
+		icon: '/icons/16/start.png'
+	}, '-', {
+		id: 'options',
+		text: _('Options'),
+		icon: '/icons/16/preferences.png',
+		menu: new Ext.menu.Menu({
+			items: [{
+				text: _('D/L Speed Limit'),
+				iconCls: 'x-deluge-downloading',
+				menu: new Ext.menu.Menu({
+					items: [{
+						text: _('5 KiB/s'),
+					}, {
+						text: _('10 KiB/s'),
+					}, {
+						text: _('30 KiB/s'),
+					}, {
+						text: _('80 KiB/s'),
+					}, {
+						text: _('300 KiB/s'),
+					},{
+						text: _('Unlimited')
+					}]
+				})
+			}, {
+				text: _('U/L Speed Limit'),
+				iconCls: 'x-deluge-seeding',
+				menu: new Ext.menu.Menu({
+					items: [{
+						text: _('5 KiB/s'),
+					}, {
+						text: _('10 KiB/s'),
+					}, {
+						text: _('30 KiB/s'),
+					}, {
+						text: _('80 KiB/s'),
+					}, {
+						text: _('300 KiB/s'),
+					},{
+						text: _('Unlimited')
+					}]
+				})
+			}, {
+				text: _('Connection Limit'),
+				icon: '/icons/16/connections.png',
+				menu: new Ext.menu.Menu({
+					items: [{
+						text: _('50'),
+					}, {
+						text: _('100'),
+					}, {
+						text: _('200'),
+					}, {
+						text: _('300'),
+					}, {
+						text: _('500'),
+					},{
+						text: _('Unlimited')
+					}]
+				})
+			}, {
+				text: _('Upload Slot Limit'),
+				icon: '/icons/16/upload_slots.png',
+				menu: new Ext.menu.Menu({
+					items: [{
+						text: _('0'),
+					}, {
+						text: _('1'),
+					}, {
+						text: _('2'),
+					}, {
+						text: _('3'),
+					}, {
+						text: _('5'),
+					},{
+						text: _('Unlimited')
+					}]
+				})
+			}, {
+				text: _('Auto Managed'),
+				checked: false
+			}]
+		})
+	}, '-', {
+		text: _('Queue'),
+		icon: '/icons/16/queue.png',
+		menu: new Ext.menu.Menu({
+			items: [{
+				text: _('Top'),
+				icon: '/icons/16/top.png'
+			},{
+				text: _('Up'),
+				icon: '/icons/16/up.png'
+			},{
+				text: _('Down'),
+				icon: '/icons/16/down.png'
+			},{
+				text: _('Bottom'),
+				icon: '/icons/16/bottom.png'
+			}]
+		})
+	}, '-', {
+		text: _('Update Tracker'),
+		icon: '/icons/16/update.png'
+	}, {
+		text: _('Edit Trackers'),
+		icon: '/icons/16/edit_trackers.png'
+	}, '-', {
+		text: _('Remove Torrent'),
+		icon: '/icons/16/remove.png'
+	}, '-', {
+		text: _('Force Recheck'),
+		icon: '/icons/16/recheck.png'
+	}, {
+		text: _('Move Storage'),
+		icon: '/icons/16/move.png'
+	}]
+});
 
 Deluge.Menus.Connections = new Ext.menu.Menu({
 	id: 'connectionsMenu',