--- a/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Mar 31 19:43:34 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Wed Apr 01 19:50:41 2020 +0200 @@ -359,7 +359,7 @@ itm.setIcon(self.__statusWorkColumn, UI.PixmapCache.getIcon( os.path.join("VcsPlugins", "vcsGit", "icons", - "conflict.png"))) + "conflict.svg"))) itm.setData(0, self.ConflictRole, status in self.ConflictStates) def start(self, fn):