diff --git a/src/Icons/skin/checkingDL.png b/src/Icons/skin/checking.png
similarity index 100%
rename from src/Icons/skin/checkingDL.png
rename to src/Icons/skin/checking.png
diff --git a/src/Icons/skin/checkingUP.png b/src/Icons/skin/checkingUP.png
deleted file mode 100644
index 0f40b4486..000000000
Binary files a/src/Icons/skin/checkingUP.png and /dev/null differ
diff --git a/src/Icons/skin/paused.png b/src/Icons/skin/paused.png
index 8a0e947b8..e746bfd23 100644
Binary files a/src/Icons/skin/paused.png and b/src/Icons/skin/paused.png differ
diff --git a/src/Icons/skin/pausedDL.png b/src/Icons/skin/pausedDL.png
deleted file mode 100644
index e746bfd23..000000000
Binary files a/src/Icons/skin/pausedDL.png and /dev/null differ
diff --git a/src/Icons/skin/pausedUP.png b/src/Icons/skin/pausedUP.png
deleted file mode 100644
index 902064722..000000000
Binary files a/src/Icons/skin/pausedUP.png and /dev/null differ
diff --git a/src/Icons/skin/queuedDL.png b/src/Icons/skin/queued.png
similarity index 100%
rename from src/Icons/skin/queuedDL.png
rename to src/Icons/skin/queued.png
diff --git a/src/Icons/skin/queuedUP.png b/src/Icons/skin/queuedUP.png
deleted file mode 100644
index 8786a6268..000000000
Binary files a/src/Icons/skin/queuedUP.png and /dev/null differ
diff --git a/src/icons.qrc b/src/icons.qrc
index e2078b77a..94365f57c 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -12,13 +12,10 @@
   <file>Icons/slow_off.png</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/rss16.png</file>
-  <file>Icons/skin/checkingUP.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/queuedDL.png</file>
   <file>Icons/skin/new.png</file>
-  <file>Icons/skin/queuedUP.png</file>
   <file>Icons/skin/preview.png</file>
   <file>Icons/skin/stalled.png</file>
   <file>Icons/skin/delete.png</file>
@@ -30,9 +27,7 @@
   <file>Icons/skin/delete_perm22.png</file>
   <file>Icons/skin/filteractive.png</file>
   <file>Icons/skin/connected.png</file>
-  <file>Icons/skin/pausedDL.png</file>
   <file>Icons/skin/mascot.png</file>
-  <file>Icons/skin/pausedUP.png</file>
   <file>Icons/skin/seeding.png</file>
   <file>Icons/skin/increase.png</file>
   <file>Icons/skin/qbittorrent32.png</file>
@@ -51,6 +46,7 @@
   <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>
@@ -58,7 +54,7 @@
   <file>Icons/skin/info.png</file>
   <file>Icons/skin/tabs.gif</file>
   <file>Icons/skin/delete_perm.png</file>
-  <file>Icons/skin/checkingDL.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>
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index adcd9e6cc..dc66da870 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -185,12 +185,11 @@ void TransferListWidget::addTorrent(QTorrentHandle& h) {
     if(h.is_paused()) {
       if(h.is_seed()) {
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_UP);
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/pausedUP.png"))), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)0));
       } else {
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_DL);
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/pausedDL.png"))), Qt::DecorationRole);
       }
+      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/paused.png"))), Qt::DecorationRole);
       setRowColor(row, QString::fromUtf8("red"));
     }else{
       if(h.is_seed()) {
@@ -253,7 +252,7 @@ void TransferListWidget::pauseTorrent(int row, bool refresh_list) {
       listModel->setData(listModel->index(row, TR_NAME), h.error(), Qt::ToolTipRole);
       listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/error.png")), Qt::DecorationRole);
     } else {
-      listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/pausedUP.png")), Qt::DecorationRole);
+      listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
     }
   } else {
     listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_DL);
@@ -261,7 +260,7 @@ void TransferListWidget::pauseTorrent(int row, bool refresh_list) {
       listModel->setData(listModel->index(row, TR_NAME), h.error(), Qt::ToolTipRole);
       listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/error.png")), Qt::DecorationRole);
     } else {
-      listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/pausedDL.png")), Qt::DecorationRole);
+      listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/paused.png")), Qt::DecorationRole);
     }
     listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
   }
@@ -356,21 +355,19 @@ int TransferListWidget::updateTorrent(int row) {
           listModel->setData(listModel->index(row, TR_PROGRESS), QVariant((double)h.progress()));
           if(h.is_seed()) {
             s = STATE_CHECKING_UP;
-            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingUP.png"))), Qt::DecorationRole);
           } else {
             s = STATE_CHECKING_DL;
-            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingDL.png"))), Qt::DecorationRole);
           }
+          listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checking.png"))), Qt::DecorationRole);
           listModel->setData(listModel->index(row, TR_STATUS), s);
         }else {
           listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
           if(h.is_seed()) {
-            s = STATE_QUEUED_UP;            
-            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queuedUP.png"))), Qt::DecorationRole);
+            s = STATE_QUEUED_UP;
           } else {
             s =STATE_QUEUED_DL;
-            listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queuedDL.png"))), Qt::DecorationRole);
           }
+          listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queued.png"))), Qt::DecorationRole);
           listModel->setData(listModel->index(row, TR_STATUS), s);
         }
         // Reset speeds and seeds/leech
@@ -399,13 +396,10 @@ int TransferListWidget::updateTorrent(int row) {
     case torrent_status::checking_resume_data:
       if(h.is_seed()) {
         s = STATE_CHECKING_UP;
-
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingUP.png"))), Qt::DecorationRole);
       } else {
         s = STATE_CHECKING_DL;
-
-        listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checkingDL.png"))), Qt::DecorationRole);
       }
+      listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/checking.png"))), Qt::DecorationRole);
       listModel->setData(listModel->index(row, TR_PROGRESS), QVariant((double)h.progress()));
       if(!isColumnHidden(TR_ETA))
         listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
@@ -460,7 +454,7 @@ void TransferListWidget::setFinished(QTorrentHandle &h) {
   try {
     if(row >= 0) {
       if(h.is_paused()) {
-        listModel->setData(listModel->index(row, TR_NAME), QIcon(":/Icons/skin/pausedUP.png"), Qt::DecorationRole);
+        listModel->setData(listModel->index(row, TR_NAME), QIcon(":/Icons/skin/paused.png"), Qt::DecorationRole);
         listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_UP);
         setRowColor(row, "red");
       }else{
@@ -493,7 +487,7 @@ void TransferListWidget::refreshList(bool force) {
   if(!force && main_window->getCurrentTabIndex() != TAB_TRANSFER) return;
   unsigned int nb_downloading = 0, nb_seeding=0, nb_active=0, nb_inactive = 0;
   if(BTSession->getSession()->get_torrents().size() != (uint)listModel->rowCount()) {
-    // Oups, we have torrents that are not displayed, fix that
+    // Oups, we have torrents that are not displayed, fix this
     std::vector<torrent_handle> torrents = BTSession->getSession()->get_torrents();
     std::vector<torrent_handle>::iterator itr;
     for(itr = torrents.begin(); itr != torrents.end(); itr++) {
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index cc9f81762..be0fe48f6 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -190,6 +190,17 @@ window.addEvent('load', function(){
   var waitingTrInfo = false;
   
   var stateToImg = function(state){
+    if(state == "pausedUP" || state == "pausedDL") {
+	state = "paused";
+    } else {
+      if(state == "queuedUP" || state == "queuedDL") {
+        state = "queued";
+      } else {
+        if(state == "checkingUP" || state == "checkingDL") {
+          state = "checking";
+        }
+      }
+    }
     return 'images/skin/'+state+'.png';
   };
   var loadTransferInfo = function() {