diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIImages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIImages.java
index 377f8a5..f81b121 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIImages.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIImages.java
@@ -16,7 +16,6 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
@@ -60,10 +59,10 @@
 		declareRegistryImage(IAntUIConstants.IMG_MARK_OCCURRENCES, T_ETOOL + "mark_occurrences.png"); //$NON-NLS-1$
 
 		// Ant View Actions
-		declareRegistryImage(IAntUIConstants.IMG_ANT, OBJECT + "ant.png"); //$NON-NLS-1$
+		declareRegistryImage(IAntUIConstants.IMG_ANT, OBJECT + "ant.gif"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_REMOVE, LOCALTOOL + "remove_co.png"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_REMOVE_ALL, LOCALTOOL + "removeall_co.png"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ADD, LOCALTOOL + "add_co.png"); //$NON-NLS-1$
+		declareRegistryImage(IAntUIConstants.IMG_ADD, LOCALTOOL + "add_co.gif"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_RUN, LOCALTOOL + "run_tool.png"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_SEARCH, LOCALTOOL + "search.png"); //$NON-NLS-1$
 
@@ -76,7 +75,7 @@
 		declareRegistryImage(IAntUIConstants.IMG_REFRESH, LOCALTOOL + "refresh.png"); //$NON-NLS-1$
 
 		// Ant View Labels
-		declareRegistryImage(IAntUIConstants.IMG_ANT_PROJECT, OBJECT + "ant_buildfile.png"); //$NON-NLS-1$
+		declareRegistryImage(IAntUIConstants.IMG_ANT_PROJECT, OBJECT + "ant_buildfile.gif"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET, OBJECT + "targetpublic_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_INTERNAL, OBJECT + "targetinternal_obj.png"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_ANT_DEFAULT_TARGET, OBJECT + "defaulttarget_obj.png"); //$NON-NLS-1$
@@ -92,7 +91,7 @@
 
 		declareRegistryImage(IAntUIConstants.IMG_WIZARD_BANNER, WIZ + "ant_wiz.png"); //$NON-NLS-1$
 		declareRegistryImage(IAntUIConstants.IMG_EXPORT_WIZARD_BANNER, WIZ + "export_ant_wiz.png"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_TAB_ANT_TARGETS, LOCALTOOL + "ant_targets.png"); //$NON-NLS-1$
+		declareRegistryImage(IAntUIConstants.IMG_TAB_ANT_TARGETS, LOCALTOOL + "ant_targets.gif"); //$NON-NLS-1$
 
 		// Overlays
 		declareRegistryImage(IAntUIConstants.IMG_OVR_ERROR, OVR + "error_co.png"); //$NON-NLS-1$
diff --git a/ant/org.eclipse.ant.ui/plugin.xml b/ant/org.eclipse.ant.ui/plugin.xml
index 941d427..c9959db 100644
--- a/ant/org.eclipse.ant.ui/plugin.xml
+++ b/ant/org.eclipse.ant.ui/plugin.xml
@@ -16,7 +16,7 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%AntEditor.name"
-            icon="$nl$/icons/full/obj16/ant_buildfile.png"
+            icon="$nl$/icons/full/obj16/ant_buildfile.gif"
             class="org.eclipse.ant.internal.ui.editor.AntEditor"
             contributorClass="org.eclipse.ant.internal.ui.editor.AntEditorActionContributor"
             id="org.eclipse.ant.ui.internal.editor.AntEditor">
@@ -32,7 +32,7 @@
       </category>
       <view
             name="%View.antView"
-            icon="$nl$/icons/full/eview16/ant_view.png"
+            icon="$nl$/icons/full/eview16/ant_view.gif"
             category="org.eclipse.ant.ui.views"
             fastViewWidthRatio="0.40"
             class="org.eclipse.ant.internal.ui.views.AntView"
@@ -406,12 +406,12 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            icon="$nl$/icons/full/obj16/ant.png"
+            icon="$nl$/icons/full/obj16/ant.gif"
             configTypeID="org.eclipse.ant.AntLaunchConfigurationType"
             id="org.eclipse.ant.launchConfigurationTypeImage.ant">
       </launchConfigurationTypeImage>
       <launchConfigurationTypeImage
-            icon="$nl$/icons/full/obj16/ant.png"
+            icon="$nl$/icons/full/obj16/ant.gif"
             configTypeID="org.eclipse.ant.AntBuilderLaunchConfigurationType"
             id="org.eclipse.ant.launchConfigurationTypeImage.ant.builder">
       </launchConfigurationTypeImage>
@@ -457,7 +457,7 @@
             class="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut"
             description="%AntBuildShortcut.description"
             helpContextId="org.eclipse.ui.externaltools.launchShortcutHelpContext.antShortcut"
-            icon="$nl$/icons/full/obj16/ant.png"
+            icon="$nl$/icons/full/obj16/ant.gif"
             id="org.eclipse.ant.ui.antShortcut"
             label="%AntLaunchShortcut.label"
             modes="run, debug">
@@ -489,7 +489,7 @@
             class="org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcutWithDialog"
             description="%AntBuild...Shortcut.description"
             helpContextId="org.eclipse.ui.externaltools.launchShortcutHelpContext.antShortcutWithDialog"
-            icon="$nl$/icons/full/obj16/ant.png"
+            icon="$nl$/icons/full/obj16/ant.gif"
             id="org.eclipse.ant.ui.antShortcutWithDialog"
             label="%AntLaunchShortcutWithDialog.label"
             modes="run, debug">
@@ -556,7 +556,7 @@
       <resolver
             name="%ant.resolvers.src"
             type="src"
-            icon="$nl$/templates/resolver.png"
+            icon="$nl$/templates/resolver.gif"
             description="%ant.resolvers.src.description"
             contextTypeId="org.eclipse.ant.ui.templateContextType.XML"
             class="org.eclipse.ant.internal.ui.editor.templates.AntVariableResolver">
@@ -564,7 +564,7 @@
       <resolver
             name="%ant.resolvers.dst"
             type="dst"
-            icon="$nl$/templates/resolver.png"
+            icon="$nl$/templates/resolver.gif"
             description="%ant.resolvers.dst.description"
             contextTypeId="org.eclipse.ant.ui.templateContextType.XML"
             class="org.eclipse.ant.internal.ui.editor.templates.AntVariableResolver">
@@ -584,7 +584,7 @@
          point="org.eclipse.ui.newWizards">
     <wizard
             name="%antNewJavaProjectWizard.name"
-            icon="$nl$/icons/full/obj16/new_ant_project.png"
+            icon="$nl$/icons/full/obj16/new_ant_project.gif"
             class="org.eclipse.ant.internal.ui.datatransfer.AntNewJavaProjectWizard"
             preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective,org.eclipse.jdt.ui.JavaBrowsingPerspective,org.eclipse.jdt.ui.JavaHierarchyPerspective"
             project="true"
@@ -684,7 +684,7 @@
             id="org.eclipse.ant.ui.export" 
             name="%antExportWizard.name"
             class="org.eclipse.ant.internal.ui.datatransfer.AntBuildfileExportWizard" 
-            icon="$nl$/icons/full/elcl16/exportAnt_co.png"
+            icon="$nl$/icons/full/elcl16/exportAnt_co.gif"
             category="org.eclipse.ui.Basic">
          <description> 
             %antExportWizard.description