diff --git a/Changelog b/Changelog
index d9f87855e..41e2279ff 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,7 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
+    - FEATURE: Added actions to "Move to top/bottom" of priority queue
+
+* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
     - FEATURE: Remember previous save paths in torrent addition dialog
     - FEATURE: Max number of half-open connections can now be edited
diff --git a/src/Icons/oxygen/go-bottom.png b/src/Icons/oxygen/go-bottom.png
new file mode 100644
index 000000000..d5c65e248
Binary files /dev/null and b/src/Icons/oxygen/go-bottom.png differ
diff --git a/src/Icons/oxygen/go-down.png b/src/Icons/oxygen/go-down.png
new file mode 100644
index 000000000..63331a575
Binary files /dev/null and b/src/Icons/oxygen/go-down.png differ
diff --git a/src/Icons/oxygen/go-top.png b/src/Icons/oxygen/go-top.png
new file mode 100644
index 000000000..01ae90a32
Binary files /dev/null and b/src/Icons/oxygen/go-top.png differ
diff --git a/src/Icons/oxygen/go-up.png b/src/Icons/oxygen/go-up.png
new file mode 100644
index 000000000..4459024ea
Binary files /dev/null and b/src/Icons/oxygen/go-up.png differ
diff --git a/src/filesystemwatcher.h b/src/filesystemwatcher.h
index 9c9e8c61c..95bc198c7 100644
--- a/src/filesystemwatcher.h
+++ b/src/filesystemwatcher.h
@@ -202,8 +202,9 @@ signals:
 private:
   void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
     const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
-    foreach(const QString &file, files)
+    foreach(const QString &file, files) {
       torrents << dir.canonicalPath() + '/' + file;
+    }
   }
 
 };
diff --git a/src/icons.qrc b/src/icons.qrc
index e55c14097..cf46bfab5 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -1,176 +1,180 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/rss32.png</file>
-  <file>Icons/sphere2.png</file>
-  <file>Icons/downarrow.png</file>
   <file>Icons/url.png</file>
-  <file>Icons/3-state-checkbox.gif</file>
   <file>Icons/loading.png</file>
-  <file>Icons/slow.png</file>
-  <file>Icons/magnet.png</file>
-  <file>Icons/sphere.png</file>
-  <file>Icons/L.gif</file>
-  <file>Icons/slow_off.png</file>
-  <file>Icons/uparrow.png</file>
   <file>Icons/rss16.png</file>
-  <file>Icons/skin/bg-handle-horizontal.gif</file>
-  <file>Icons/skin/play.png</file>
-  <file>Icons/skin/qbittorrent22.png</file>
-  <file>Icons/skin/new.png</file>
+  <file>Icons/rss32.png</file>
+  <file>Icons/3-state-checkbox.gif</file>
+  <file>Icons/uparrow.png</file>
+  <file>Icons/sphere.png</file>
+  <file>Icons/downarrow.png</file>
+  <file>Icons/slow_off.png</file>
+  <file>Icons/sphere2.png</file>
+  <file>Icons/magnet.png</file>
+  <file>Icons/slow.png</file>
+  <file>Icons/L.gif</file>
+  <file>Icons/skin/seeding.png</file>
+  <file>Icons/skin/splash.png</file>
   <file>Icons/skin/preview.png</file>
+  <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/delete.png</file>
-  <file>Icons/skin/handle-icon-horizontal.gif</file>
-  <file>Icons/skin/handle-icon.gif</file>
-  <file>Icons/skin/knob.gif</file>
+  <file>Icons/skin/increase.png</file>
+  <file>Icons/skin/qbittorrent16.png</file>
+  <file>Icons/skin/connected.png</file>
   <file>Icons/skin/url.png</file>
+  <file>Icons/skin/qbittorrent22.png</file>
+  <file>Icons/skin/disconnected.png</file>
+  <file>Icons/skin/mascot.png</file>
+  <file>Icons/skin/info.png</file>
+  <file>Icons/skin/paused.png</file>
+  <file>Icons/skin/slider-area.gif</file>
+  <file>Icons/skin/pause22.png</file>
+  <file>Icons/skin/stalledDL.png</file>
+  <file>Icons/skin/play.png</file>
+  <file>Icons/skin/delete_all.png</file>
+  <file>Icons/skin/delete_perm.png</file>
+  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/error.png</file>
+  <file>Icons/skin/settings.png</file>
+  <file>Icons/skin/handle-icon-horizontal.gif</file>
+  <file>Icons/skin/pause.png</file>
+  <file>Icons/skin/qbittorrent32.png</file>
+  <file>Icons/skin/exit.png</file>
+  <file>Icons/skin/knob.gif</file>
+  <file>Icons/skin/open.png</file>
+  <file>Icons/skin/pause_all.png</file>
+  <file>Icons/skin/filterall.png</file>
+  <file>Icons/skin/uploading.png</file>
+  <file>Icons/skin/queued.png</file>
+  <file>Icons/skin/checking.png</file>
+  <file>Icons/skin/handle-icon.gif</file>
+  <file>Icons/skin/filterinactive.png</file>
+  <file>Icons/skin/decrease.png</file>
+  <file>Icons/skin/play22.png</file>
+  <file>Icons/skin/firewalled.png</file>
+  <file>Icons/skin/delete22.png</file>
+  <file>Icons/skin/new.png</file>
+  <file>Icons/skin/downloading.png</file>
+  <file>Icons/skin/play_all.png</file>
+  <file>Icons/skin/toolbox-divider.gif</file>
   <file>Icons/skin/stalledUP.png</file>
   <file>Icons/skin/filteractive.png</file>
-  <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/mascot.png</file>
-  <file>Icons/skin/seeding.png</file>
-  <file>Icons/skin/increase.png</file>
-  <file>Icons/skin/qbittorrent32.png</file>
-  <file>Icons/skin/paused.png</file>
-  <file>Icons/skin/toolbox-divider.gif</file>
-  <file>Icons/skin/stalledDL.png</file>
-  <file>Icons/skin/qb_question.png</file>
+  <file>Icons/skin/bg-handle-horizontal.gif</file>
   <file>Icons/skin/download.png</file>
-  <file>Icons/skin/open.png</file>
-  <file>Icons/skin/play22.png</file>
-  <file>Icons/skin/qbittorrent16.png</file>
-  <file>Icons/skin/slider-area.gif</file>
-  <file>Icons/skin/downloading.png</file>
-  <file>Icons/skin/filterinactive.png</file>
-  <file>Icons/skin/pause22.png</file>
-  <file>Icons/skin/pause_all.png</file>
-  <file>Icons/skin/error.png</file>
-  <file>Icons/skin/delete22.png</file>
-  <file>Icons/skin/checking.png</file>
-  <file>Icons/skin/play_all.png</file>
-  <file>Icons/skin/pause.png</file>
-  <file>Icons/skin/firewalled.png</file>
-  <file>Icons/skin/info.png</file>
-  <file>Icons/skin/tabs.gif</file>
-  <file>Icons/skin/delete_perm.png</file>
-  <file>Icons/skin/queued.png</file>
-  <file>Icons/skin/settings.png</file>
-  <file>Icons/skin/exit.png</file>
-  <file>Icons/skin/delete_all.png</file>
-  <file>Icons/skin/splash.png</file>
-  <file>Icons/skin/disconnected.png</file>
-  <file>Icons/skin/decrease.png</file>
-  <file>Icons/skin/uploading.png</file>
-  <file>Icons/skin/filterall.png</file>
-  <file>Icons/flags/czech.png</file>
-  <file>Icons/flags/serbia.png</file>
-  <file>Icons/flags/iceland.png</file>
-  <file>Icons/flags/china.png</file>
-  <file>Icons/flags/luxembourg.png</file>
-  <file>Icons/flags/newzealand.png</file>
-  <file>Icons/flags/austria.png</file>
-  <file>Icons/flags/indonesia.png</file>
-  <file>Icons/flags/united_arab_emirates.png</file>
-  <file>Icons/flags/norway.png</file>
-  <file>Icons/flags/india.png</file>
-  <file>Icons/flags/finland.png</file>
-  <file>Icons/flags/australia.png</file>
+  <file>Icons/flags/pakistan.png</file>
+  <file>Icons/flags/argentina.png</file>
   <file>Icons/flags/netherlands.png</file>
-  <file>Icons/flags/south_africa.png</file>
-  <file>Icons/flags/belarus.png</file>
-  <file>Icons/flags/georgia.png</file>
-  <file>Icons/flags/taiwan.png</file>
-  <file>Icons/flags/sweden.png</file>
-  <file>Icons/flags/spain_catalunya.png</file>
-  <file>Icons/flags/ireland.png</file>
-  <file>Icons/flags/singapore.png</file>
-  <file>Icons/flags/israel.png</file>
-  <file>Icons/flags/belgium.png</file>
-  <file>Icons/flags/usa.png</file>
-  <file>Icons/flags/costa_rica.png</file>
-  <file>Icons/flags/romania.png</file>
-  <file>Icons/flags/suisse.png</file>
+  <file>Icons/flags/australia.png</file>
+  <file>Icons/flags/finland.png</file>
   <file>Icons/flags/croatia.png</file>
-  <file>Icons/flags/mexico.png</file>
+  <file>Icons/flags/indonesia.png</file>
+  <file>Icons/flags/greece.png</file>
+  <file>Icons/flags/belarus.png</file>
+  <file>Icons/flags/morocco.png</file>
+  <file>Icons/flags/portugal.png</file>
+  <file>Icons/flags/egypt.png</file>
+  <file>Icons/flags/georgia.png</file>
+  <file>Icons/flags/costa_rica.png</file>
   <file>Icons/flags/denmark.png</file>
-  <file>Icons/flags/hungary.png</file>
-  <file>Icons/flags/slovenia.png</file>
-  <file>Icons/flags/ukraine.png</file>
+  <file>Icons/flags/bosnia.png</file>
+  <file>Icons/flags/newzealand.png</file>
+  <file>Icons/flags/serbia.png</file>
+  <file>Icons/flags/singapore.png</file>
+  <file>Icons/flags/italy.png</file>
+  <file>Icons/flags/brazil.png</file>
+  <file>Icons/flags/taiwan.png</file>
+  <file>Icons/flags/south_korea.png</file>
   <file>Icons/flags/turkey.png</file>
   <file>Icons/flags/algeria.png</file>
-  <file>Icons/flags/greece.png</file>
-  <file>Icons/flags/morocco.png</file>
-  <file>Icons/flags/argentina.png</file>
-  <file>Icons/flags/spain.png</file>
-  <file>Icons/flags/portugal.png</file>
-  <file>Icons/flags/russia.png</file>
-  <file>Icons/flags/united_kingdom.png</file>
-  <file>Icons/flags/thailand.png</file>
-  <file>Icons/flags/poland.png</file>
-  <file>Icons/flags/germany.png</file>
-  <file>Icons/flags/bulgaria.png</file>
-  <file>Icons/flags/canada.png</file>
-  <file>Icons/flags/brazil.png</file>
-  <file>Icons/flags/france.png</file>
-  <file>Icons/flags/slovakia.png</file>
-  <file>Icons/flags/pakistan.png</file>
-  <file>Icons/flags/egypt.png</file>
-  <file>Icons/flags/italy.png</file>
-  <file>Icons/flags/south_korea.png</file>
-  <file>Icons/flags/saoudi_arabia.png</file>
-  <file>Icons/flags/bosnia.png</file>
   <file>Icons/flags/japan.png</file>
-  <file>Icons/flags/malaysia.png</file>
+  <file>Icons/flags/luxembourg.png</file>
+  <file>Icons/flags/poland.png</file>
+  <file>Icons/flags/iceland.png</file>
+  <file>Icons/flags/spain.png</file>
+  <file>Icons/flags/saoudi_arabia.png</file>
+  <file>Icons/flags/norway.png</file>
+  <file>Icons/flags/russia.png</file>
+  <file>Icons/flags/slovakia.png</file>
   <file>Icons/flags/philippines.png</file>
-  <file>Icons/oxygen/view-refresh.png</file>
-  <file>Icons/oxygen/file.png</file>
-  <file>Icons/oxygen/folder-remote16.png</file>
-  <file>Icons/oxygen/mail-folder-inbox.png</file>
-  <file>Icons/oxygen/edit-find.png</file>
-  <file>Icons/oxygen/folder-new.png</file>
-  <file>Icons/oxygen/folder-remote.png</file>
-  <file>Icons/oxygen/edit-paste.png</file>
-  <file>Icons/oxygen/run-build.png</file>
-  <file>Icons/oxygen/proxy.png</file>
-  <file>Icons/oxygen/services.png</file>
-  <file>Icons/oxygen/user-group-delete.png</file>
-  <file>Icons/oxygen/user-group-new.png</file>
-  <file>Icons/oxygen/log.png</file>
-  <file>Icons/oxygen/unavailable.png</file>
-  <file>Icons/oxygen/button_ok.png</file>
-  <file>Icons/oxygen/button_cancel.png</file>
-  <file>Icons/oxygen/edit-clear.png</file>
-  <file>Icons/oxygen/filter.png</file>
-  <file>Icons/oxygen/encrypted.png</file>
-  <file>Icons/oxygen/edit_clear.png</file>
-  <file>Icons/oxygen/download.png</file>
-  <file>Icons/oxygen/cookies.png</file>
-  <file>Icons/oxygen/gear32.png</file>
-  <file>Icons/oxygen/gear.png</file>
-  <file>Icons/oxygen/remove.png</file>
-  <file>Icons/oxygen/dialog-warning.png</file>
+  <file>Icons/flags/thailand.png</file>
+  <file>Icons/flags/israel.png</file>
+  <file>Icons/flags/bulgaria.png</file>
+  <file>Icons/flags/czech.png</file>
+  <file>Icons/flags/usa.png</file>
+  <file>Icons/flags/malaysia.png</file>
+  <file>Icons/flags/belgium.png</file>
+  <file>Icons/flags/south_africa.png</file>
+  <file>Icons/flags/slovenia.png</file>
+  <file>Icons/flags/china.png</file>
+  <file>Icons/flags/germany.png</file>
+  <file>Icons/flags/ukraine.png</file>
+  <file>Icons/flags/india.png</file>
+  <file>Icons/flags/spain_catalunya.png</file>
+  <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/united_kingdom.png</file>
+  <file>Icons/flags/united_arab_emirates.png</file>
+  <file>Icons/flags/sweden.png</file>
+  <file>Icons/flags/canada.png</file>
+  <file>Icons/flags/mexico.png</file>
+  <file>Icons/flags/hungary.png</file>
+  <file>Icons/flags/france.png</file>
+  <file>Icons/flags/ireland.png</file>
+  <file>Icons/flags/austria.png</file>
+  <file>Icons/flags/suisse.png</file>
   <file>Icons/oxygen/peer.png</file>
-  <file>Icons/oxygen/browse.png</file>
-  <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/unavailable.png</file>
   <file>Icons/oxygen/subscribe.png</file>
-  <file>Icons/oxygen/edit-copy.png</file>
-  <file>Icons/oxygen/chronometer.png</file>
-  <file>Icons/oxygen/bt_settings.png</file>
-  <file>Icons/oxygen/document-new.png</file>
-  <file>Icons/oxygen/preferences-desktop.png</file>
-  <file>Icons/oxygen/tab-close.png</file>
-  <file>Icons/oxygen/webui.png</file>
   <file>Icons/oxygen/list-remove.png</file>
-  <file>Icons/oxygen/connection.png</file>
-  <file>Icons/oxygen/bug.png</file>
-  <file>Icons/oxygen/help-about.png</file>
-  <file>Icons/oxygen/list-add.png</file>
-  <file>Icons/oxygen/network-server.png</file>
+  <file>Icons/oxygen/dialog-warning.png</file>
+  <file>Icons/oxygen/mail-folder-inbox.png</file>
   <file>Icons/oxygen/folder.png</file>
-  <file>Icons/oxygen/urlseed.png</file>
+  <file>Icons/oxygen/edit-copy.png</file>
   <file>Icons/oxygen/folder-documents.png</file>
+  <file>Icons/oxygen/urlseed.png</file>
+  <file>Icons/oxygen/go-up.png</file>
   <file>Icons/oxygen/edit-cut.png</file>
+  <file>Icons/oxygen/gear32.png</file>
+  <file>Icons/oxygen/go-bottom.png</file>
+  <file>Icons/oxygen/user-group-delete.png</file>
   <file>Icons/oxygen/unsubscribe.png</file>
+  <file>Icons/oxygen/tab-close.png</file>
+  <file>Icons/oxygen/file.png</file>
+  <file>Icons/oxygen/services.png</file>
+  <file>Icons/oxygen/view-refresh.png</file>
   <file>Icons/oxygen/feed-subscribe.png</file>
+  <file>Icons/oxygen/remove.png</file>
+  <file>Icons/oxygen/chronometer.png</file>
+  <file>Icons/oxygen/filter.png</file>
+  <file>Icons/oxygen/run-build.png</file>
+  <file>Icons/oxygen/button_ok.png</file>
+  <file>Icons/oxygen/user-group-new.png</file>
+  <file>Icons/oxygen/cookies.png</file>
+  <file>Icons/oxygen/network-server.png</file>
+  <file>Icons/oxygen/unsubscribe16.png</file>
+  <file>Icons/oxygen/list-add.png</file>
+  <file>Icons/oxygen/edit-paste.png</file>
+  <file>Icons/oxygen/folder-remote.png</file>
+  <file>Icons/oxygen/help-about.png</file>
+  <file>Icons/oxygen/encrypted.png</file>
+  <file>Icons/oxygen/folder-remote16.png</file>
+  <file>Icons/oxygen/go-top.png</file>
+  <file>Icons/oxygen/edit_clear.png</file>
+  <file>Icons/oxygen/bug.png</file>
+  <file>Icons/oxygen/gear.png</file>
+  <file>Icons/oxygen/connection.png</file>
+  <file>Icons/oxygen/document-new.png</file>
+  <file>Icons/oxygen/browse.png</file>
+  <file>Icons/oxygen/proxy.png</file>
+  <file>Icons/oxygen/button_cancel.png</file>
+  <file>Icons/oxygen/preferences-desktop.png</file>
+  <file>Icons/oxygen/bt_settings.png</file>
+  <file>Icons/oxygen/go-down.png</file>
   <file>Icons/oxygen/subscribe16.png</file>
+  <file>Icons/oxygen/download.png</file>
+  <file>Icons/oxygen/log.png</file>
+  <file>Icons/oxygen/edit-find.png</file>
+  <file>Icons/oxygen/edit-clear.png</file>
+  <file>Icons/oxygen/webui.png</file>
+  <file>Icons/oxygen/folder-new.png</file>
 </qresource>
 </RCC>
\ No newline at end of file
diff --git a/src/lang.qrc b/src/lang.qrc
index 4ebfaf20a..26ad7d5c5 100644
--- a/src/lang.qrc
+++ b/src/lang.qrc
@@ -1,34 +1,34 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>lang/qbittorrent_es.qm</file>
-  <file>lang/qbittorrent_sk.qm</file>
-  <file>lang/qbittorrent_zh_TW.qm</file>
-  <file>lang/qbittorrent_pt.qm</file>
-  <file>lang/qbittorrent_sv.qm</file>
-  <file>lang/qbittorrent_pl.qm</file>
-  <file>lang/qbittorrent_it.qm</file>
-  <file>lang/qbittorrent_ar.qm</file>
-  <file>lang/qbittorrent_ko.qm</file>
-  <file>lang/qbittorrent_en.qm</file>
-  <file>lang/qbittorrent_ro.qm</file>
-  <file>lang/qbittorrent_bg.qm</file>
-  <file>lang/qbittorrent_ru.qm</file>
   <file>lang/qbittorrent_nl.qm</file>
-  <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_hu.qm</file>
+  <file>lang/qbittorrent_ru.qm</file>
+  <file>lang/qbittorrent_zh_TW.qm</file>
+  <file>lang/qbittorrent_tr.qm</file>
   <file>lang/qbittorrent_fi.qm</file>
-  <file>lang/qbittorrent_uk.qm</file>
-  <file>lang/qbittorrent_cs.qm</file>
-  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_sk.qm</file>
+  <file>lang/qbittorrent_ja.qm</file>
   <file>lang/qbittorrent_el.qm</file>
   <file>lang/qbittorrent_ca.qm</file>
-  <file>lang/qbittorrent_hr.qm</file>
-  <file>lang/qbittorrent_sr.qm</file>
-  <file>lang/qbittorrent_hu.qm</file>
-  <file>lang/qbittorrent_da.qm</file>
-  <file>lang/qbittorrent_de.qm</file>
-  <file>lang/qbittorrent_zh.qm</file>
-  <file>lang/qbittorrent_ja.qm</file>
-  <file>lang/qbittorrent_tr.qm</file>
+  <file>lang/qbittorrent_pt.qm</file>
+  <file>lang/qbittorrent_it.qm</file>
   <file>lang/qbittorrent_fr.qm</file>
+  <file>lang/qbittorrent_uk.qm</file>
+  <file>lang/qbittorrent_zh.qm</file>
+  <file>lang/qbittorrent_ko.qm</file>
+  <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_sv.qm</file>
+  <file>lang/qbittorrent_de.qm</file>
+  <file>lang/qbittorrent_sr.qm</file>
+  <file>lang/qbittorrent_pt_BR.qm</file>
+  <file>lang/qbittorrent_da.qm</file>
+  <file>lang/qbittorrent_cs.qm</file>
+  <file>lang/qbittorrent_pl.qm</file>
+  <file>lang/qbittorrent_bg.qm</file>
+  <file>lang/qbittorrent_ar.qm</file>
+  <file>lang/qbittorrent_es.qm</file>
+  <file>lang/qbittorrent_en.qm</file>
+  <file>lang/qbittorrent_hr.qm</file>
+  <file>lang/qbittorrent_ro.qm</file>
 </qresource>
 </RCC>
\ No newline at end of file
diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp
index e3cee0965..9f11a285b 100644
--- a/src/qtorrenthandle.cpp
+++ b/src/qtorrenthandle.cpp
@@ -585,7 +585,16 @@ void QTorrentHandle::queue_position_up() const {
   Q_ASSERT(h.is_valid());
   if(h.queue_position() > 0)
     h.queue_position_up();
+}
 
+void QTorrentHandle::queue_position_top() const {
+  Q_ASSERT(h.is_valid());
+  h.queue_position_top();
+}
+
+void QTorrentHandle::queue_position_bottom() const {
+  Q_ASSERT(h.is_valid());
+    h.queue_position_bottom();
 }
 
 void QTorrentHandle::force_reannounce() {
diff --git a/src/qtorrenthandle.h b/src/qtorrenthandle.h
index a5b6b5d28..fea8e7e1e 100644
--- a/src/qtorrenthandle.h
+++ b/src/qtorrenthandle.h
@@ -157,6 +157,8 @@ class QTorrentHandle {
     void set_tracker_login(QString username, QString password);
     void queue_position_down() const;
     void queue_position_up() const;
+    void queue_position_top() const;
+    void queue_position_bottom() const;
     void auto_managed(bool) const;
     void force_recheck() const;
     void move_storage(QString path) const;
diff --git a/src/search.qrc b/src/search.qrc
index 098ff92a6..f1dc1b678 100644
--- a/src/search.qrc
+++ b/src/search.qrc
@@ -1,23 +1,23 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
+  <file>search_engine/nova2.py</file>
   <file>search_engine/novaprinter.py</file>
+  <file>search_engine/socks.py</file>
   <file>search_engine/nova2dl.py</file>
   <file>search_engine/helpers.py</file>
-  <file>search_engine/socks.py</file>
-  <file>search_engine/nova2.py</file>
-  <file>search_engine/engines/isohunt.py</file>
-  <file>search_engine/engines/isohunt.png</file>
   <file>search_engine/engines/vertor.png</file>
-  <file>search_engine/engines/torrentdownloads.py</file>
-  <file>search_engine/engines/torrentdownloads.png</file>
-  <file>search_engine/engines/piratebay.py</file>
-  <file>search_engine/engines/torrentreactor.py</file>
-  <file>search_engine/engines/piratebay.png</file>
-  <file>search_engine/engines/btjunkie.png</file>
-  <file>search_engine/engines/btjunkie.py</file>
-  <file>search_engine/engines/vertor.py</file>
-  <file>search_engine/engines/torrentreactor.png</file>
   <file>search_engine/engines/mininova.png</file>
   <file>search_engine/engines/mininova.py</file>
+  <file>search_engine/engines/torrentdownloads.png</file>
+  <file>search_engine/engines/isohunt.png</file>
+  <file>search_engine/engines/torrentreactor.py</file>
+  <file>search_engine/engines/btjunkie.png</file>
+  <file>search_engine/engines/piratebay.py</file>
+  <file>search_engine/engines/torrentdownloads.py</file>
+  <file>search_engine/engines/torrentreactor.png</file>
+  <file>search_engine/engines/isohunt.py</file>
+  <file>search_engine/engines/btjunkie.py</file>
+  <file>search_engine/engines/piratebay.png</file>
+  <file>search_engine/engines/vertor.py</file>
 </qresource>
 </RCC>
\ No newline at end of file
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index bccecb18a..428f3f636 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -742,6 +742,30 @@ void TransferListWidget::decreasePrioSelectedTorrents() {
   refreshList();
 }
 
+// FIXME: Should work only if the tab is displayed
+void TransferListWidget::topPrioSelectedTorrents() {
+  const QStringList hashes = getSelectedTorrentsHashes();
+  foreach(const QString &hash, hashes) {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    if(h.is_valid() && !h.is_seed()) {
+      h.queue_position_top();
+    }
+  }
+  refreshList();
+}
+
+// FIXME: Should work only if the tab is displayed
+void TransferListWidget::bottomPrioSelectedTorrents() {
+  const QStringList hashes = getSelectedTorrentsHashes();
+  foreach(const QString &hash, hashes) {
+    QTorrentHandle h = BTSession->getTorrentHandle(hash);
+    if(h.is_valid() && !h.is_seed()) {
+      h.queue_position_bottom();
+    }
+  }
+  refreshList();
+}
+
 void TransferListWidget::buySelectedTorrents() const {
   const QStringList hashes = getSelectedTorrentsHashes();
   foreach(const QString &hash, hashes) {
@@ -1053,12 +1077,16 @@ void TransferListWidget::displayListMenu(const QPoint&) {
   connect(&actionOpen_destination_folder, SIGNAL(triggered()), this, SLOT(openSelectedTorrentsFolder()));
   //QAction actionBuy_it(QIcon(QString::fromUtf8(":/Icons/oxygen/wallet.png")), tr("Buy it"), 0);
   //connect(&actionBuy_it, SIGNAL(triggered()), this, SLOT(buySelectedTorrents()));
+  QAction actionIncreasePriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-up.png")), tr("Move up", "i.e. move up in the queue"), 0);
+  connect(&actionIncreasePriority, SIGNAL(triggered()), this, SLOT(increasePrioSelectedTorrents()));
+  QAction actionDecreasePriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-down.png")), tr("Move down", "i.e. Move down in the queue"), 0);
+  connect(&actionDecreasePriority, SIGNAL(triggered()), this, SLOT(decreasePrioSelectedTorrents()));
+  QAction actionTopPriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-top.png")), tr("Move to top", "i.e. Move to top of the queue"), 0);
+  connect(&actionTopPriority, SIGNAL(triggered()), this, SLOT(topPrioSelectedTorrents()));
+  QAction actionBottomPriority(QIcon(QString::fromUtf8(":/Icons/oxygen/go-bottom.png")), tr("Move to bottom", "i.e. Move to bottom of the queue"), 0);
+  connect(&actionBottomPriority, SIGNAL(triggered()), this, SLOT(bottomPrioSelectedTorrents()));
   QAction actionSetTorrentPath(QIcon(QString::fromUtf8(":/Icons/skin/folder.png")), tr("Set location..."), 0);
   connect(&actionSetTorrentPath, SIGNAL(triggered()), this, SLOT(setSelectedTorrentsLocation()));
-  QAction actionIncreasePriority(QIcon(QString::fromUtf8(":/Icons/skin/increase.png")), tr("Increase priority"), 0);
-  connect(&actionIncreasePriority, SIGNAL(triggered()), this, SLOT(increasePrioSelectedTorrents()));
-  QAction actionDecreasePriority(QIcon(QString::fromUtf8(":/Icons/skin/decrease.png")), tr("Decrease priority"), 0);
-  connect(&actionDecreasePriority, SIGNAL(triggered()), this, SLOT(decreasePrioSelectedTorrents()));
   QAction actionForce_recheck(QIcon(QString::fromUtf8(":/Icons/oxygen/gear.png")), tr("Force recheck"), 0);
   connect(&actionForce_recheck, SIGNAL(triggered()), this, SLOT(recheckSelectedTorrents()));
   QAction actionCopy_magnet_link(QIcon(QString::fromUtf8(":/Icons/magnet.png")), tr("Copy magnet link"), 0);
@@ -1199,8 +1227,11 @@ void TransferListWidget::displayListMenu(const QPoint&) {
   listMenu.addAction(&actionOpen_destination_folder);
   if(BTSession->isQueueingEnabled() && one_not_seed) {
     listMenu.addSeparator();
-    listMenu.addAction(&actionIncreasePriority);
-    listMenu.addAction(&actionDecreasePriority);
+    QMenu *prioMenu = listMenu.addMenu(tr("Priority"));
+    prioMenu->addAction(&actionTopPriority);
+    prioMenu->addAction(&actionIncreasePriority);
+    prioMenu->addAction(&actionDecreasePriority);
+    prioMenu->addAction(&actionBottomPriority);
   }
   listMenu.addSeparator();
   if(one_has_metadata)
diff --git a/src/transferlistwidget.h b/src/transferlistwidget.h
index 86a88370d..7cd9d4034 100644
--- a/src/transferlistwidget.h
+++ b/src/transferlistwidget.h
@@ -68,6 +68,8 @@ public slots:
   void deleteSelectedTorrents();
   void increasePrioSelectedTorrents();
   void decreasePrioSelectedTorrents();
+  void topPrioSelectedTorrents();
+  void bottomPrioSelectedTorrents();
   void buySelectedTorrents() const;
   void copySelectedMagnetURIs() const;
   void openSelectedTorrentsFolder() const;