diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index 1d8517992c..d13f8bbc36 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -264,7 +264,7 @@ class CommandAddonManager:
             addonicon = QtGui.QIcon(":/icons/Group.svg")
         if addon_repo[2] == 1:
             item = QtGui.QListWidgetItem(addonicon,str(addon_repo[0]) + str(" ("+translate("AddonsInstaller","Installed")+")"))
-            item.setBackground(QtGui.QBrush(QtGui.QColor(0,182,41)))
+            item.setForeground(QtGui.QBrush(QtGui.QColor(0,182,41)))
             self.dialog.listWorkbenches.addItem(item)
         else:
             self.dialog.listWorkbenches.addItem(QtGui.QListWidgetItem(addonicon,str(addon_repo[0])))
@@ -363,12 +363,15 @@ class CommandAddonManager:
             else:
                 from PySide import QtGui
                 self.macros.append(macro)
+                addonicon = QtGui.QIcon(":/icons/" + macro.name.replace(" ","_") + "_macro_icon.svg")
+                if addonicon.isNull():
+                    addonicon = QtGui.QIcon(":/icons/applications-python.svg")
                 if macro.is_installed():
-                    item = QtGui.QListWidgetItem(QtGui.QIcon(":/icons/applications-python.svg"), macro.name + str(' (Installed)'))
-                    item.setBackground(QtGui.QBrush(QtGui.QColor(0,182,41)))
+                    item = QtGui.QListWidgetItem(addonicon, macro.name + str(' (Installed)'))
+                    item.setForeground(QtGui.QBrush(QtGui.QColor(0,182,41)))
                     self.dialog.listMacros.addItem(item)
                 else:
-                    self.dialog.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/applications-python.svg"),macro.name))
+                    self.dialog.listMacros.addItem(QtGui.QListWidgetItem(addonicon,macro.name))
 
     def install(self,repos=None):
 
@@ -554,7 +557,7 @@ class CommandAddonManager:
             w = self.dialog.listWorkbenches.item(i)
             if w.text().startswith(str(repo)):
                 w.setText(str(repo) + str(" ("+translate("AddonsInstaller","Update available")+")"))
-                w.setBackground(QtGui.QBrush(QtGui.QColor(182,90,0)))
+                w.setForeground(QtGui.QBrush(QtGui.QColor(182,90,0)))
                 if not repo in self.doUpdate:
                     self.doUpdate.append(repo)
 
diff --git a/src/Mod/AddonManager/addonmanager_workers.py b/src/Mod/AddonManager/addonmanager_workers.py
index 2927980816..7c540b658f 100644
--- a/src/Mod/AddonManager/addonmanager_workers.py
+++ b/src/Mod/AddonManager/addonmanager_workers.py
@@ -383,7 +383,7 @@ class ShowWorker(QtCore.QThread):
 
         self.info_label.emit( message )
         self.progressbar_show.emit(False)
-        l = self.loadImages( message, url )
+        l = self.loadImages( message, self.repos[self.idx][1] )
         if l:
             self.info_label.emit( l )
         self.stop = True
@@ -403,6 +403,7 @@ class ShowWorker(QtCore.QThread):
             if not os.path.exists(store):
                 os.makedirs(store)
             for path in imagepaths:
+                origpath = path
                 if "?" in path:
                     # remove everything after the ?
                     path = path.split("?")[0]
@@ -431,8 +432,7 @@ class ShowWorker(QtCore.QThread):
                                 pix = QtGui.QPixmap()
                                 pix = pix.fromImage(img.scaled(300,300,QtCore.Qt.KeepAspectRatio,QtCore.Qt.FastTransformation))
                                 pix.save(storename, "jpeg",100)
-                        
-                    message = message.replace(path,"file:///"+storename.replace("\\","/"))
+                    message = message.replace(origpath,"file:///"+storename.replace("\\","/"))
             return message
         return None