diff --git a/Changelog b/Changelog
index 22942f092..f6efb4cc2 100644
--- a/Changelog
+++ b/Changelog
@@ -36,6 +36,7 @@
     - WEB UI: Remodeled Web UI to match new qBittorrent UI (Properties and preferences available)
     - WEB UI: Added internationalization support
     - WEB UI: Reduced computation in Javascript (do this one server side instead)
+    - WEB UI: Fixed Transfer list flickering
     - COSMETIC: Merged download / upload lists
     - COSMETIC: Torrents can be filtered based on their status
     - COSMETIC: Torrent properties are now displayed in main window
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 7a3c9636c..1c4fce84f 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -91,33 +91,9 @@ window.addEvent('domready', function(){
   initializeWindows();
   var r=0;
   var waiting=false;
+  
   var stateToImg = function(state){
-    switch (state)
-    {
-      case 'pausedUP':
-	return '<img src="images/skin/pausedUP.png"/>';
-      case 'pausedDL':
-        return '<img src="images/skin/pausedDL.png"/>';
-      case 'seeding':
-	return '<img src="images/skin/uploading.png"/>';
-      case 'stalledUP':
-          return '<img src="images/skin/stalledUP.png"/>';
-      case 'checkingUP':
-	return '<img src="images/skin/checkingUP.png"/>';
-      case 'checkingDL':
-          return '<img src="images/skin/checkingDL.png"/>';
-      case 'downloading':
-          return '<img src="images/skin/downloading.png"/>';
-      case 'stalledDL':
-          return '<img src="images/skin/stalledDL.png"/>';
-      case 'queuedUP':
-	return '<img src="images/skin/queuedUP.png"/>';
-      case 'queuedDL':
-          return '<img src="images/skin/queuedDL.png"/>';
-      default:
-	  return '';
-    }
-    return '';
+    return 'images/skin/'+state+'.png';
   };
 	var ajaxfn = function(){
 		var queueing_enabled = false;
diff --git a/src/webui/scripts/dynamicTable.js b/src/webui/scripts/dynamicTable.js
index 8d3c6b49d..aad45454f 100644
--- a/src/webui/scripts/dynamicTable.js
+++ b/src/webui/scripts/dynamicTable.js
@@ -139,7 +139,11 @@ var dynamicTable = new Class	({
 			if(i==this.progressIndex) {
 				td.adopt(new ProgressBar(row[i].toFloat(), {width:80}));
 			} else {
-				td.set('html', row[i]);
+				if(i==0) {
+					td.adopt(new Element('img', {'src':row[i]}));
+				} else {
+					td.set('html', row[i]);
+				}
 			}
 			td.injectInside(tr);
 		};
@@ -257,10 +261,15 @@ var dynamicTable = new Class	({
 		var tds = tr.getElements('td');
 		for(var i=0; i<row.length; i++) {
 			if(i==this.progressIndex) {
-				tds[i].set('html', '');
-				tds[i].adopt(new ProgressBar(row[i].toFloat(), {width:80}));
+				new ProgressBar(row[i].toFloat(), {width:80}).replaces(tds[i].getChildren()[0]);
+				/*tds[i].set('html', '');
+				tds[i].adopt(new ProgressBar(row[i].toFloat(), {width:80}));*/
 			} else {
-				tds[i].set('html', row[i]);
+				if(i==0) {
+					tds[i].getChildren('img')[0].set('src', row[i]);
+				} else {
+					tds[i].set('html', row[i]);
+				}
 			}
 		};
 		return true;