diff --git a/static/js/home.indiancinema.js b/static/js/home.indiancinema.js
index 741daadb..e0156a37 100644
--- a/static/js/home.indiancinema.js
+++ b/static/js/home.indiancinema.js
@@ -589,7 +589,7 @@ pandora.ui.home = function() {
 
             function getImageURL(item) {
                 return '/' + item.type + '/' + item.user
-                    + ':' + item.name + '/icon256.jpg?' + item.modified;
+                    + ':' + encodeURI(item.name) + '/icon256.jpg?' + item.modified;
             }
 
             function getTooltip(item) {
diff --git a/static/js/home.padma.js b/static/js/home.padma.js
index b35d9756..fe44da69 100644
--- a/static/js/home.padma.js
+++ b/static/js/home.padma.js
@@ -561,7 +561,7 @@ pandora.ui.home = function() {
 
             function getImageURL(item) {
                 return '/' + item.type + '/' + item.user
-                    + ':' + item.name + '/icon256.jpg?' + item.modified;
+                    + ':' + encodeURI(item.name) + '/icon256.jpg?' + item.modified;
             }
 
             function getTooltip(item) {
diff --git a/static/js/info.js b/static/js/info.js
index 2b1e82d9..df86f632 100644
--- a/static/js/info.js
+++ b/static/js/info.js
@@ -183,7 +183,7 @@ pandora.ui.listInfo = function() {
         $icon = Ox.Element('<img>')
             .attr({
                 src: list
-                    ? '/' + folderItem.toLowerCase() + '/' + list + '/icon256.jpg?' + Ox.uid()
+                    ? '/' + folderItem.toLowerCase() + '/' + encodeURI(list) + '/icon256.jpg?' + Ox.uid()
                     : '/static/png/icon.png'
             })
             .css(getIconCSS())
diff --git a/static/js/listDialog.js b/static/js/listDialog.js
index b4760535..aee2100f 100644
--- a/static/js/listDialog.js
+++ b/static/js/listDialog.js
@@ -168,7 +168,7 @@ pandora.ui.listGeneralPanel = function(listData) {
                     tooltip: Ox._('Doubleclick to edit icon')
                 })
                 .attr({
-                    src: '/' + folderItem.toLowerCase() + '/' + listData.id + '/icon256.jpg?' + Ox.uid()
+                    src: '/' + folderItem.toLowerCase() + '/' + encodeURI(listData.id) + '/icon256.jpg?' + Ox.uid()
                 })
                 .css({
                     position: 'absolute',
@@ -358,7 +358,7 @@ pandora.ui.listIconPanel = function(listData) {
         $iconPanel = Ox.Element(),
 
         $icon = $('<img>')
-            .attr({src: '/' + folderItem.toLowerCase() + '/' + listData.id + '/icon256.jpg?' + Ox.uid()})
+            .attr({src: '/' + folderItem.toLowerCase() + '/' + encodeURI(listData.id) + '/icon256.jpg?' + Ox.uid()})
             .css({position: 'absolute', borderRadius: '64px', margin: '16px'})
             .appendTo($iconPanel),