Bug 514863: Use png files in org.eclipse.equinox.p2.ui

Change-Id: Ia891112782c251e903149d5e3db8d873f3b1b6d9
Signed-off-by: Matthias Becker <ma.becker@sap.com>

135 files changed, 131 insertions, 131 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision.png b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision.png
new file mode 100644
index 000000000..bbd0d4aa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision@2x.png
new file mode 100644
index 000000000..b54063326
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/provision@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview.png b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview.png
new file mode 100644
index 000000000..2565e61b2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview@2x.png
new file mode 100644
index 000000000..cda7dc9d0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/icons/view/pview@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
index aa8349e1d..40955655a 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/plugin.xml
@@ -25,22 +25,22 @@
                value="%aboutText"/>
          <property
                name="windowImages"
-               value="platform:/plugin/org.eclipse.equinox.p2.ui.admin/icons/provision.gif"/>
-               
+               value="platform:/plugin/org.eclipse.equinox.p2.ui.admin/icons/view/provision.png"/>
+
     </product>
     </extension>
-    
+
        <extension
          point="org.eclipse.ui.views">
       <view
             name="%Views.Progress"
-            icon="$nl$/icons/pview.gif"
+            icon="$nl$/icons/view/pview.png"
             category="org.eclipse.ui"
             class="org.eclipse.ui.internal.progress.ProgressView"
             id="org.eclipse.ui.views.ProgressView">
       </view>
     </extension>
-    
+
          <extension
          point="org.eclipse.ui.perspectives">
       <perspective
@@ -49,5 +49,5 @@
             id="org.eclipse.equinox.p2.ui.admin.rcp.ProvisioningRCPPerspective">
       </perspective>
    </extension>
-   
+
 </plugin>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.gif b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.gif
deleted file mode 100644
index 0470e1588..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.png
new file mode 100644
index 000000000..5a4b140ac
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj@2x.png
new file mode 100644
index 000000000..de198abfd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/artifact_repo_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.gif b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.gif
deleted file mode 100644
index 8706680c7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.png
new file mode 100644
index 000000000..684e82a8c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj@2x.png
new file mode 100644
index 000000000..d61d82624
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/iu_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.gif b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.gif
deleted file mode 100644
index b8568f4f8..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.png
new file mode 100644
index 000000000..2cb962a94
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj@2x.png
new file mode 100644
index 000000000..3227b4fb7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/metadata_repo_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.gif b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.gif
deleted file mode 100644
index c984fba70..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.png
new file mode 100644
index 000000000..bbd0d4aa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj@2x.png
new file mode 100644
index 000000000..b54063326
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/profile_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.gif b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.gif
deleted file mode 100644
index f192b8486..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.png
new file mode 100644
index 000000000..290341352
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu@2x.png
new file mode 100644
index 000000000..fda2009f2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/obj/uninstalled_iu@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision.png
new file mode 100644
index 000000000..bbd0d4aa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision@2x.png b/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision@2x.png
new file mode 100644
index 000000000..b54063326
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/icons/view/provision@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
index 6aa850827..9c44a47a9 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/plugin.xml
@@ -23,7 +23,7 @@
       </category>
       <view
             name="%MetadataRepositories.name"
-            icon="$nl$/icons/obj/metadata_repo_obj.gif"
+            icon="$nl$/icons/obj/metadata_repo_obj.png"
             category="org.eclipse.p2.ui.admin"
             class="org.eclipse.equinox.internal.p2.ui.admin.MetadataRepositoriesView"
             id="org.eclipse.p2.ui.admin.MetadataRepositoriesView">
@@ -33,7 +33,7 @@
          point="org.eclipse.ui.views">
      <view
             name="%ArtifactRepositories.name"
-            icon="$nl$/icons/obj/artifact_repo_obj.gif"
+            icon="$nl$/icons/obj/artifact_repo_obj.png"
             category="org.eclipse.p2.ui.admin"
             class="org.eclipse.equinox.internal.p2.ui.admin.ArtifactRepositoriesView"
             id="org.eclipse.p2.ui.admin.ArtifactRepositoriesView">
@@ -43,18 +43,18 @@
          point="org.eclipse.ui.views">
      <view
             name="%Profiles.name"
-            icon="$nl$/icons/obj/profile_obj.gif"
+            icon="$nl$/icons/obj/profile_obj.png"
             category="org.eclipse.p2.ui.admin"
             class="org.eclipse.equinox.internal.p2.ui.admin.ProfilesView"
             id="org.eclipse.p2.ui.admin.ProfilesView">
       </view>
    </extension>
-   
+
      <extension
          point="org.eclipse.ui.perspectives">
       <perspective
             name="%perspectiveName"
-            icon="$nl$/icons/provision.gif"
+            icon="$nl$/icons/view/provision.png"
             class="org.eclipse.equinox.internal.p2.ui.admin.ProvisioningPerspective"
             id="org.eclipse.equinox.p2.ui.admin.ProvisioningPerspective">
       </perspective>
@@ -95,7 +95,7 @@
              <adapt type="org.eclipse.equinox.p2.repository.IRepository"/>
            </enabledWhen>
       </page>
-      
+
       </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find.png
index 611189d66..7405e88e3 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find.png
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find@2x.png
new file mode 100644
index 000000000..417cd8ea3
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/etool16/find@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.gif b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.gif
deleted file mode 100644
index f192b8486..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.png
new file mode 100644
index 000000000..290341352
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj@2x.png
new file mode 100644
index 000000000..fda2009f2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_disabled_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.gif b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.gif
deleted file mode 100644
index 8706680c7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.png
new file mode 100644
index 000000000..684e82a8c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj@2x.png
new file mode 100644
index 000000000..d61d82624
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.gif b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.gif
deleted file mode 100644
index 16f4f7c4e..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.png
new file mode 100644
index 000000000..a85100479
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj@2x.png
new file mode 100644
index 000000000..f0c1fded4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/iu_update_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.gif b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.gif
deleted file mode 100644
index b484d9be1..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.png
new file mode 100644
index 000000000..7fe40bbfc
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info@2x.png
new file mode 100644
index 000000000..a10214e11
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/obj16/message_info@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning.png
new file mode 100644
index 000000000..7d7fc730f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning@2x.png
new file mode 100644
index 000000000..a5ced8595
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/ovr32/message_warning@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery.png
index cc4b2cfd7..b8b4c657e 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery.png
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery@2x.png b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery@2x.png
new file mode 100644
index 000000000..dc32d5f92
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/icons/wizban/banner-discovery@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/DiscoveryImages.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/DiscoveryImages.java
index fefafbc1b..0966b9363 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/DiscoveryImages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/DiscoveryImages.java
@@ -37,17 +37,17 @@ public class DiscoveryImages {
 	/**
 	 * image descriptor for a warning overlay suitable for use with 32x32 images.
 	 */
-	public static final ImageDescriptor OVERLAY_WARNING_32 = create(T_OVR_32, "message_warning.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor OVERLAY_WARNING_32 = create(T_OVR_32, "message_warning.png"); //$NON-NLS-1$
 
 	public static final ImageDescriptor BANNER_DISOVERY = create(T_WIZBAN, "banner-discovery.png"); //$NON-NLS-1$
 
-	public static final ImageDescriptor IU_AVAILABLE = create(T_OBJ_16, "iu_disabled_obj.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor IU_AVAILABLE = create(T_OBJ_16, "iu_disabled_obj.png"); //$NON-NLS-1$
 
-	public static final ImageDescriptor IU_INSTALLED = create(T_OBJ_16, "iu_obj.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor IU_INSTALLED = create(T_OBJ_16, "iu_obj.png"); //$NON-NLS-1$
 
-	public static final ImageDescriptor IU_UPDATABLE = create(T_OBJ_16, "iu_update_obj.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor IU_UPDATABLE = create(T_OBJ_16, "iu_update_obj.png"); //$NON-NLS-1$
 
-	public static final ImageDescriptor MESSAGE_INFO = create(T_OBJ_16, "message_info.gif"); //$NON-NLS-1$
+	public static final ImageDescriptor MESSAGE_INFO = create(T_OBJ_16, "message_info.png"); //$NON-NLS-1$
 
 	public static final ImageDescriptor FIND_CLEAR = create(T_TOOL, "find-clear.gif"); //$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif
deleted file mode 100644
index 7eee7c3a7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/install_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png
new file mode 100644
index 000000000..35f23e99a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png
new file mode 100644
index 000000000..c1ef3ebbe
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/icons/wizban/install_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
index 7b9ace0e2..d3b4800bf 100755
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/plugin.xml
@@ -10,7 +10,7 @@
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ExportWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.export"
             name="%export.name">
             <description>
@@ -27,17 +27,17 @@
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ImportWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.import"
             name="%import.name">
             <description>
             	%import.description
-            </description>            
+            </description>
       </wizard>
       <wizard
             category="org.eclipse.equinox.p2.category"
             class="org.eclipse.equinox.internal.p2.importexport.internal.wizard.ImportFromInstallationWizard"
-            icon="icons/install_wiz.gif"
+            icon="icons/wizban/install_wiz.png"
             id="org.eclipse.equinox.p2.replication.importfrominstallation"
             name="%importfrominstallation.name">
          <description>
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
index 86986aa78..23799a6e3 100755
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2011 WindRiver Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     WindRiver Corporation - initial API and implementation
  *******************************************************************************/
@@ -42,7 +42,7 @@ public class ExportWizard extends AbstractWizard implements IExportWizard {
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		setWindowTitle(Messages.ExportWizard_WizardTitle);
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
index 6b89c6488..b2e296b15 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportFromInstallationWizard.java
@@ -1,62 +1,62 @@
-/*******************************************************************************

- * Copyright (c) 2011 WindRiver Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     WindRiver Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.equinox.internal.p2.importexport.internal.wizard;

-

-import java.util.Collection;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.equinox.internal.p2.importexport.internal.*;

-import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;

-import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard;

-import org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot;

-import org.eclipse.equinox.p2.engine.ProvisioningContext;

-import org.eclipse.equinox.p2.metadata.IInstallableUnit;

-import org.eclipse.equinox.p2.operations.InstallOperation;

-import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;

-import org.eclipse.equinox.p2.ui.ProvisioningUI;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IImportWizard;

-import org.eclipse.ui.IWorkbench;

-

-public class ImportFromInstallationWizard extends InstallWizard implements IImportWizard {

-

-	public ImportFromInstallationWizard() {

-		this(ProvisioningUI.getDefaultUI(), null, null, null);

-	}

-

-	public ImportFromInstallationWizard(ProvisioningUI ui, InstallOperation operation, Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob preloadJob) {

-		super(ui, operation, initialSelections, preloadJob);

-		IDialogSettings workbenchSettings = ImportExportActivator.getDefault().getDialogSettings();

-		String sectionName = "ImportFromInstallationWizard"; //$NON-NLS-1$

-		IDialogSettings section = workbenchSettings.getSection(sectionName);

-		if (section == null) {

-			section = workbenchSettings.addNewSection(sectionName);

-		}

-		setDialogSettings(section);

-	}

-

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);

-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$

-		setNeedsProgressMonitor(true);

-	}

-

-	@Override

-	protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) {

-		return new ImportFromInstallationPage(ui, this);

-	}

-

-	@Override

-	protected ProvisioningContext getProvisioningContext() {

-		return ((ImportFromInstallationPage) mainPage).getProvisioningContext();

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011 WindRiver Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     WindRiver Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.internal.p2.importexport.internal.wizard;
+
+import java.util.Collection;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.internal.p2.importexport.internal.*;
+import org.eclipse.equinox.internal.p2.ui.dialogs.ISelectableIUsPage;
+import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard;
+import org.eclipse.equinox.internal.p2.ui.model.IUElementListRoot;
+import org.eclipse.equinox.p2.engine.ProvisioningContext;
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.operations.InstallOperation;
+import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob;
+import org.eclipse.equinox.p2.ui.ProvisioningUI;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+
+public class ImportFromInstallationWizard extends InstallWizard implements IImportWizard {
+
+	public ImportFromInstallationWizard() {
+		this(ProvisioningUI.getDefaultUI(), null, null, null);
+	}
+
+	public ImportFromInstallationWizard(ProvisioningUI ui, InstallOperation operation, Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob preloadJob) {
+		super(ui, operation, initialSelections, preloadJob);
+		IDialogSettings workbenchSettings = ImportExportActivator.getDefault().getDialogSettings();
+		String sectionName = "ImportFromInstallationWizard"; //$NON-NLS-1$
+		IDialogSettings section = workbenchSettings.getSection(sectionName);
+		if (section == null) {
+			section = workbenchSettings.addNewSection(sectionName);
+		}
+		setDialogSettings(section);
+	}
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
+		setNeedsProgressMonitor(true);
+	}
+
+	@Override
+	protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) {
+		return new ImportFromInstallationPage(ui, this);
+	}
+
+	@Override
+	protected ProvisioningContext getProvisioningContext() {
+		return ((ImportFromInstallationPage) mainPage).getProvisioningContext();
+	}
+}
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
index f2ed24744..7eb1555e0 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ImportWizard.java
@@ -57,7 +57,7 @@ public class ImportWizard extends InstallWizard implements IImportWizard {
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		setWindowTitle(Messages.ImportWizard_WINDOWTITLE);
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(Constants.Bundle_ID).getEntry("icons/wizban/install_wiz.png"))); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.gif b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.gif
deleted file mode 100644
index 1aca259db..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.png
new file mode 100644
index 000000000..478e2304e
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close@2x.png
new file mode 100644
index 000000000..cf8f6c1be
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.gif b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.gif
deleted file mode 100644
index d5360165c..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.png
new file mode 100644
index 000000000..4cc2a86b0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot@2x.png
new file mode 100644
index 000000000..49670ae28
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/close_hot@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.gif b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.gif
deleted file mode 100644
index aa84ebeaa..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.png
new file mode 100644
index 000000000..191d1bd1c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update@2x.png
new file mode 100644
index 000000000..544cd5fca
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.gif b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.gif
deleted file mode 100644
index c0cfaca34..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.png
new file mode 100644
index 000000000..dc8091563
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems@2x.png
new file mode 100644
index 000000000..bbaaae58c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/icons/tool/update_problems@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
index f42534de8..b50b44291 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatePlugin.java
@@ -41,10 +41,10 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
 	public final static String ICON_PATH = "$nl$/icons/"; //$NON-NLS-1$
 
 	// tool icons
-	public final static String IMG_TOOL_UPDATE = "tool/update.gif"; //$NON-NLS-1$
-	public final static String IMG_TOOL_UPDATE_PROBLEMS = "tool/update_problems.gif"; //$NON-NLS-1$
-	public final static String IMG_TOOL_CLOSE = "tool/close.gif"; //$NON-NLS-1$
-	public final static String IMG_TOOL_CLOSE_HOT = "tool/close_hot.gif"; //$NON-NLS-1$
+	public final static String IMG_TOOL_UPDATE = "tool/update.png"; //$NON-NLS-1$
+	public final static String IMG_TOOL_UPDATE_PROBLEMS = "tool/update_problems.png"; //$NON-NLS-1$
+	public final static String IMG_TOOL_CLOSE = "tool/close.png"; //$NON-NLS-1$
+	public final static String IMG_TOOL_CLOSE_HOT = "tool/close_hot.png"; //$NON-NLS-1$
 
 	private static AutomaticUpdatePlugin plugin;
 	private static BundleContext context;
@@ -63,7 +63,7 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
 
 	/**
 	 * Returns the singleton plugin instance
-	 * 
+	 *
 	 * @return the instance
 	 */
 	public static AutomaticUpdatePlugin getDefault() {
@@ -76,7 +76,7 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
 	 * )
@@ -131,7 +131,7 @@ public class AutomaticUpdatePlugin extends AbstractUIPlugin {
 
 	/*
 	 * Overridden to use a profile scoped preference store. (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()
 	 */
 	public IPreferenceStore getPreferenceStore() {
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java
index a49ac5429..ca75cf442 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java
@@ -9,7 +9,7 @@
  *     WindRiver Corporation - initial API and implementation
  *     Ericsson AB - Ongoing development
  *     Ericsson AB (Pascal Rapicault)
- *     Ericsson AB (Hamdan Msheik) 
+ *     Ericsson AB (Hamdan Msheik)
  *     Red Hat Inc. - Bug 460967
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.sdk.scheduler.migration;
@@ -69,7 +69,7 @@ public class MigrationWizard extends InstallWizard implements IImportWizard {
 
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		setWindowTitle(firstTime ? ProvUIMessages.MigrationWizard_WINDOWTITLE_FIRSTRUN : ProvUIMessages.MigrationWizard_WINDOWTITLE);
-		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(ProvUIActivator.PLUGIN_ID).getEntry("icons/install_wiz.gif"))); //$NON-NLS-1$
+		setDefaultPageImageDescriptor(ImageDescriptor.createFromURL(Platform.getBundle(ProvUIActivator.PLUGIN_ID).getEntry("icons/install_wiz.png"))); //$NON-NLS-1$
 		setNeedsProgressMonitor(true);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.gif b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.gif
deleted file mode 100644
index 8706680c7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.png
new file mode 100644
index 000000000..684e82a8c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj@2x.png
new file mode 100644
index 000000000..d61d82624
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.gif b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.gif
deleted file mode 100644
index 16f4f7c4e..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.png
new file mode 100644
index 000000000..a85100479
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj@2x.png
new file mode 100644
index 000000000..f0c1fded4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/iu_update_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.gif b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.gif
deleted file mode 100644
index c984fba70..000000000
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.png
new file mode 100644
index 000000000..bbd0d4aa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj@2x.png
new file mode 100644
index 000000000..b54063326
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/icons/obj/profile_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
index 3e42b0fa8..249d78378 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-   	<extension 
+   	<extension
    		id="preferences" point="org.eclipse.core.runtime.preferences" name="%preferences">
 		<initializer class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceInitializer"/>
 	</extension>
@@ -13,7 +13,7 @@
             id="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage">
             <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/>
       </page>
-      
+
        <page
             name="%sitesPrefPage"
             category="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"
@@ -21,7 +21,7 @@
             id="org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage">
             <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/>
       </page>
- 
+
    </extension>
 
       <extension
@@ -30,8 +30,8 @@
             label="%preferenceKeywords.general"
             id="org.eclipse.equinox.p2.ui.sdk.updates.general"/>
       </extension>
-      
-      
+
+
    <extension
          point="org.eclipse.ui.commands">
       <command
@@ -67,9 +67,9 @@
                   commandId="org.eclipse.equinox.p2.ui.sdk.update"
             	  mnemonic="%Update.command.mnemonic"
                   id="org.eclipse.equinox.p2.ui.sdk.update"
-                  icon="icons/obj/iu_update_obj.gif">
+                  icon="icons/obj/iu_update_obj.png">
             </command>
-                        
+
       </menuContribution>
       <menuContribution
             locationURI="menu:help?after=org.eclipse.equinox.p2.ui.sdk.update">
@@ -77,13 +77,13 @@
                   commandId="org.eclipse.equinox.p2.ui.sdk.install"
             	  mnemonic="%Install.command.mnemonic"
                   id="org.eclipse.equinox.p2.ui.sdk.install"
-                  icon="icons/obj/iu_obj.gif">
+                  icon="icons/obj/iu_obj.png">
             </command>
-                        
+
       </menuContribution>
    </extension>
 
-      	<extension 
+      	<extension
    		id="preferences" point="org.eclipse.core.runtime.preferences" name="%preferences">
 		<initializer class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.PreferenceInitializer"/>
 	</extension>
@@ -99,7 +99,7 @@
             class="org.eclipse.equinox.internal.p2.ui.sdk.RevertProfilePageExtensionFactory"
             id="11.org.eclipse.equinox.internal.p2.ui.sdk.RevertProfilePage">
           </page>
-          
+
       </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/added_overlay.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/added_overlay.gif
deleted file mode 100755
index c65d16a19..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/added_overlay.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.gif
deleted file mode 100644
index 0470e1588..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.png
new file mode 100644
index 000000000..5a4b140ac
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj@2x.png
new file mode 100644
index 000000000..de198abfd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/artifact_repo_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.gif
deleted file mode 100644
index b487d071d..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.png
new file mode 100644
index 000000000..6de0fbd43
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj@2x.png
new file mode 100644
index 000000000..dc7c144b5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/category_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.gif
deleted file mode 100644
index 252d7ebcb..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.png
new file mode 100644
index 000000000..a878c3cba
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add@2x.png
new file mode 100644
index 000000000..96b710ca5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_add@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.gif
deleted file mode 100644
index f192b8486..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.png
new file mode 100644
index 000000000..290341352
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj@2x.png
new file mode 100644
index 000000000..fda2009f2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.gif
deleted file mode 100644
index 196b83d60..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.png
new file mode 100644
index 000000000..dacdf0a5e
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj@2x.png
new file mode 100644
index 000000000..565ee8d28
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_disabled_patch_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.png
index 533fee843..77746b1b0 100644
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.png
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded@2x.png
new file mode 100644
index 000000000..d567529d7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_downgraded@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.gif
deleted file mode 100644
index ee2dac4a9..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.png
new file mode 100644
index 000000000..5294a4f44
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info@2x.png
new file mode 100644
index 000000000..3d28b21f3
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_info@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.gif
deleted file mode 100644
index dfbf68f46..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.png
new file mode 100644
index 000000000..74304e6cb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd@2x.png
new file mode 100644
index 000000000..55043ae2b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_notadd@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.gif
deleted file mode 100644
index 8706680c7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.png
new file mode 100644
index 000000000..684e82a8c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj@2x.png
new file mode 100644
index 000000000..d61d82624
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.gif
deleted file mode 100755
index 57fc499b8..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.png
new file mode 100644
index 000000000..c3bd04e73
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj@2x.png
new file mode 100644
index 000000000..16178fc84
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.gif
deleted file mode 100644
index b6922ac11..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.png
new file mode 100644
index 000000000..bcfae2003
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove@2x.png
new file mode 100644
index 000000000..02a36f151
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_remove@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif
deleted file mode 100644
index 16f4f7c4e..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.png
new file mode 100644
index 000000000..a85100479
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj@2x.png
new file mode 100644
index 000000000..f0c1fded4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_update_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.png
index 4354c6fa0..55d08a032 100644
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.png
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded@2x.png
new file mode 100644
index 000000000..e82f5d530
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/iu_upgraded@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.gif
deleted file mode 100644
index b8568f4f8..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.png
new file mode 100644
index 000000000..2cb962a94
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj@2x.png
new file mode 100644
index 000000000..3227b4fb7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/metadata_repo_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.gif
deleted file mode 100644
index c984fba70..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.png
new file mode 100644
index 000000000..bbd0d4aa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj@2x.png
new file mode 100644
index 000000000..b54063326
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/obj/profile_obj@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/obj/removed_overlay.gif b/bundles/org.eclipse.equinox.p2.ui/icons/obj/removed_overlay.gif
deleted file mode 100755
index 8aaadfb9b..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/obj/removed_overlay.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay.png b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay.png
new file mode 100644
index 000000000..e6eeb7eb5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay@2x.png
new file mode 100644
index 000000000..7b319c2ea
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/added_overlay@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay.png b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay.png
new file mode 100644
index 000000000..5fd9c7067
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay@2x.png
new file mode 100644
index 000000000..e12306690
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/ovr/removed_overlay@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.gif b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.gif
deleted file mode 100644
index 7eee7c3a7..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.png
new file mode 100644
index 000000000..35f23e99a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz@2x.png
new file mode 100644
index 000000000..c1ef3ebbe
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/install_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.gif b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.gif
deleted file mode 100644
index 6a19fbfed..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.png
new file mode 100644
index 000000000..9c7e5aec5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz@2x.png
new file mode 100644
index 000000000..d24eee3d9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/revert_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.gif b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.gif
deleted file mode 100644
index 1223378d1..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.png
new file mode 100644
index 000000000..1df1c7dc7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz@2x.png
new file mode 100644
index 000000000..933427ca3
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/uninstall_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.gif b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.gif
deleted file mode 100644
index 3b364875f..000000000
--- a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.png
new file mode 100644
index 000000000..818ee5c99
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz@2x.png b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz@2x.png
new file mode 100644
index 000000000..e6c06b7b2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.ui/icons/wizban/update_wiz@2x.png
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
index dd3114dc3..39a647408 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
@@ -4,7 +4,7 @@
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  *  Contributors:
  *     IBM Corporation - initial API and implementation
  *     Red Hat, Inc. - support for remediation page
@@ -25,7 +25,7 @@ import org.eclipse.swt.graphics.Image;
  * </p>
  * <p>
  * This class is not intended to be subclassed or instantiated by clients
- * 
+ *
  * @since 3.4
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -35,36 +35,36 @@ public class ProvUIImages {
 	// bundle-relative icon path
 	public final static String ICON_PATH = "$nl$/icons/"; //$NON-NLS-1$
 	//objects
-	public final static String IMG_ARTIFACT_REPOSITORY = "obj/artifact_repo_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_METADATA_REPOSITORY = "obj/metadata_repo_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_IU = "obj/iu_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_DISABLED_IU = "obj/iu_disabled_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_ADDED = "obj/iu_add.gif"; //$NON-NLS-1$
-	public final static String IMG_REMOVED = "obj/iu_remove.gif"; //$NON-NLS-1$
-	public final static String IMG_CHANGED = "obj/iu_update_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_NOTADDED = "obj/iu_notadd.gif"; //$NON-NLS-1$
+	public final static String IMG_ARTIFACT_REPOSITORY = "obj/artifact_repo_obj.png"; //$NON-NLS-1$
+	public final static String IMG_METADATA_REPOSITORY = "obj/metadata_repo_obj.png"; //$NON-NLS-1$
+	public final static String IMG_IU = "obj/iu_obj.png"; //$NON-NLS-1$
+	public final static String IMG_DISABLED_IU = "obj/iu_disabled_obj.png"; //$NON-NLS-1$
+	public final static String IMG_ADDED = "obj/iu_add.png"; //$NON-NLS-1$
+	public final static String IMG_REMOVED = "obj/iu_remove.png"; //$NON-NLS-1$
+	public final static String IMG_CHANGED = "obj/iu_update_obj.png"; //$NON-NLS-1$
+	public final static String IMG_NOTADDED = "obj/iu_notadd.png"; //$NON-NLS-1$
 
-	public final static String IMG_UPDATED_IU = "obj/iu_update_obj.gif"; //$NON-NLS-1$
+	public final static String IMG_UPDATED_IU = "obj/iu_update_obj.png"; //$NON-NLS-1$
 	public final static String IMG_UPGRADED_IU = "obj/iu_upgraded.png"; //$NON-NLS-1$
 	public final static String IMG_DOWNGRADED_IU = "obj/iu_downgraded.png"; //$NON-NLS-1$
-	public final static String IMG_ADDED_OVERLAY = "obj/added_overlay.gif"; //$NON-NLS-1$
-	public final static String IMG_REMOVED_OVERLAY = "obj/removed_overlay.gif"; //$NON-NLS-1$
-	public final static String IMG_PATCH_IU = "obj/iu_patch_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_DISABLED_PATCH_IU = "obj/iu_disabled_patch_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_PROFILE = "obj/profile_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_CATEGORY = "obj/category_obj.gif"; //$NON-NLS-1$
-	public final static String IMG_INFO = "obj/iu_info.gif"; //$NON-NLS-1$
+	public final static String IMG_ADDED_OVERLAY = "ovr/added_overlay.png"; //$NON-NLS-1$
+	public final static String IMG_REMOVED_OVERLAY = "ovr/removed_overlay.png"; //$NON-NLS-1$
+	public final static String IMG_PATCH_IU = "obj/iu_patch_obj.png"; //$NON-NLS-1$
+	public final static String IMG_DISABLED_PATCH_IU = "obj/iu_disabled_patch_obj.png"; //$NON-NLS-1$
+	public final static String IMG_PROFILE = "obj/profile_obj.png"; //$NON-NLS-1$
+	public final static String IMG_CATEGORY = "obj/category_obj.png"; //$NON-NLS-1$
+	public final static String IMG_INFO = "obj/iu_info.png"; //$NON-NLS-1$
 
 	// wizard graphics
-	public final static String WIZARD_BANNER_INSTALL = "wizban/install_wiz.gif"; //$NON-NLS-1$
-	public final static String WIZARD_BANNER_UNINSTALL = "wizban/uninstall_wiz.gif"; //$NON-NLS-1$
-	public final static String WIZARD_BANNER_UPDATE = "wizban/update_wiz.gif"; //$NON-NLS-1$
-	public final static String WIZARD_BANNER_REVERT = "wizban/revert_wiz.gif"; //$NON-NLS-1$
+	public final static String WIZARD_BANNER_INSTALL = "wizban/install_wiz.png"; //$NON-NLS-1$
+	public final static String WIZARD_BANNER_UNINSTALL = "wizban/uninstall_wiz.png"; //$NON-NLS-1$
+	public final static String WIZARD_BANNER_UPDATE = "wizban/update_wiz.png"; //$NON-NLS-1$
+	public final static String WIZARD_BANNER_REVERT = "wizban/revert_wiz.png"; //$NON-NLS-1$
 
 	/**
 	 * Returns the image descriptor for the given image ID. Returns
 	 * <code>null</code> if there is no such image.
-	 * 
+	 *
 	 * @param id
 	 *            the identifier for the image to retrieve
 	 * @return the image descriptor associated with the given ID
@@ -76,7 +76,7 @@ public class ProvUIImages {
 	/**
 	 * Returns the image for the given image ID. Returns <code>null</code> if
 	 * there is no such image.
-	 * 
+	 *
 	 * @param id
 	 *            the identifier for the image to retrieve
 	 * @return the image associated with the given ID. This image is managed in