Use prefix for Safari-specific icons

platform/safari/Info.plist

@@ -37,7 +37,7 @@
                 <key>Identifier</key>
                 <string>toolbarItem</string>
                 <key>Image</key>
-                <string>img/browsericons/icon16.png</string>
+                <string>img/browsericons/safari-icon16.png</string>
                 <key>Label</key>
                 <string>{name}</string>
                 <key>Palette Label</key>

platform/safari/vapi-background.js

@@ -517,7 +517,7 @@
             state = vAPI.tabIconState[tabId] = new TabIconState();
         }
         icon.badge = state.badge;
-        icon.image = vAPI.getURL("img/browsericons/icon16" + state.img + ".png");
+        icon.image = vAPI.getURL("img/browsericons/safari-icon16" + state.img + ".png");
     };
     vAPI.setIcon = function(tabId, iconStatus, badge) {
         var state = vAPI.tabIconState[tabId];