Bug 501803: Use png files for compare editor instead of gif filesY20160929-1000

Replace GIF icons with normal and high resolution PNG icons in:
  - org.eclipse.compare
  - org.eclipse.compare.win32
  - org.eclipse.team.ui

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

225 files changed, 159 insertions, 101 deletions

diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif
deleted file mode 100644
index b22c4d1f2..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png
new file mode 100644
index 000000000..b03f14e18
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png
new file mode 100644
index 000000000..a69d1d911
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchup_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif
deleted file mode 100644
index 92ad07000..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png
new file mode 100644
index 000000000..cce26d421
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png
new file mode 100644
index 000000000..103ed9959
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/catchuprelease_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif
deleted file mode 100644
index 9c244761d..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png
new file mode 100644
index 000000000..51d21cb99
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png
new file mode 100644
index 000000000..3856a5578
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkin_action@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif
deleted file mode 100644
index 64d44db79..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png
new file mode 100644
index 000000000..7765d92e8
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png
new file mode 100644
index 000000000..c1265fb05
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/checkout_action@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif
deleted file mode 100644
index 6775edfab..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png
new file mode 100644
index 000000000..5848f399b
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/clear_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif
deleted file mode 100644
index 7dc0de513..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png
new file mode 100644
index 000000000..957f39420
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/collapseall.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif
deleted file mode 100644
index eaf1ca331..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/conflict_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif
deleted file mode 100644
index f6142713a..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png
new file mode 100644
index 000000000..e54535c9f
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_change.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif
deleted file mode 100644
index f6142713a..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png
new file mode 100644
index 000000000..e54535c9f
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/filter_history.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif
deleted file mode 100644
index 19d1680f6..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png
new file mode 100644
index 000000000..061b593ca
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/flatLayout.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif
deleted file mode 100644
index 564469b06..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png
new file mode 100644
index 000000000..64822eaa0
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/hierarchicalLayout.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif
deleted file mode 100644
index 2d2758991..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png
new file mode 100644
index 000000000..ac4b72174
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png
new file mode 100644
index 000000000..01b594967
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/history_nav@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif
deleted file mode 100644
index 04767acc5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png
new file mode 100644
index 000000000..51692e81c
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorefiles.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif
deleted file mode 100644
index 73f06e711..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png
new file mode 100644
index 000000000..769b3f1bc
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png
new file mode 100644
index 000000000..ad16bc384
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/ignorews_edit@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif
deleted file mode 100644
index 21606219f..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png
new file mode 100644
index 000000000..8283a3467
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png
new file mode 100644
index 000000000..0b2e58a1e
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/incom_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif
deleted file mode 100644
index 6e8d4be05..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png
new file mode 100644
index 000000000..9378df281
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png
new file mode 100644
index 000000000..c87178613
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/newstream_wiz@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif
deleted file mode 100644
index bd0be79ed..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png
new file mode 100644
index 000000000..1a71a7923
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/next_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif
deleted file mode 100644
index 91d18c776..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png
new file mode 100644
index 000000000..3872beaf2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png
new file mode 100644
index 000000000..e0d816d76
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/outgo_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif
deleted file mode 100644
index 559e46298..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png
new file mode 100644
index 000000000..bbafa4952
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png
index 1133544b0..bc0c8d90d 100644
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_rem@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif
deleted file mode 100644
index ecd1be568..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png
new file mode 100644
index 000000000..77786efad
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/participant_remall.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif
deleted file mode 100644
index 61615d57d..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png
new file mode 100644
index 000000000..1eb68766f
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/pin.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif
deleted file mode 100644
index 13be66065..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png
new file mode 100644
index 000000000..7eaaff979
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/prev_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif
deleted file mode 100644
index 1f551897c..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png
new file mode 100644
index 000000000..6adce3ac9
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif
deleted file mode 100644
index 64d0a65af..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png
new file mode 100644
index 000000000..70a0a4694
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png
new file mode 100644
index 000000000..bfc32b221
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/refresh_remote@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif
deleted file mode 100644
index 6dbae8a4c..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png
new file mode 100644
index 000000000..aa804d2fc
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png
new file mode 100644
index 000000000..c232361a1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/release_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif
deleted file mode 100644
index bb19dea97..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png
new file mode 100644
index 000000000..a67bf4b80
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/rem_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif
deleted file mode 100644
index f5c165936..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png
new file mode 100644
index 000000000..70c722e05
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png
new file mode 100644
index 000000000..a5da6ee9d
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/site_element@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif
deleted file mode 100644
index 4f6e43a52..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png
new file mode 100644
index 000000000..ecc2c1dd1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synced.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif
deleted file mode 100644
index 14a075e1e..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png
new file mode 100644
index 000000000..94ed99fb1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png
new file mode 100644
index 000000000..f0d5b3c54
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/synch_participants@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif
deleted file mode 100644
index 7da48249e..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png
new file mode 100644
index 000000000..cbbf40e83
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png
new file mode 100644
index 000000000..0c86044b9
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/dlcl16/syncpane_co@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif
deleted file mode 100644
index ccfdd8cd2..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png
new file mode 100644
index 000000000..b03f14e18
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png
new file mode 100644
index 000000000..a69d1d911
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchup_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif
deleted file mode 100644
index 4e8cfdcf3..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png
new file mode 100644
index 000000000..cce26d421
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png
new file mode 100644
index 000000000..103ed9959
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/catchuprelease_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif
deleted file mode 100644
index 876f3eb16..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png
new file mode 100644
index 000000000..51d21cb99
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png
new file mode 100644
index 000000000..3856a5578
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkin_action@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif
deleted file mode 100644
index 5055a5d7c..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png
new file mode 100644
index 000000000..7765d92e8
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png
new file mode 100644
index 000000000..c1265fb05
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/checkout_action@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif
deleted file mode 100644
index af30a42f8..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png
new file mode 100644
index 000000000..9f0b9af26
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/clear_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a904..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png
new file mode 100644
index 000000000..92cc57892
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/collapseall.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif
deleted file mode 100644
index c5862f263..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png
new file mode 100644
index 000000000..d15bf5429
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png
new file mode 100644
index 000000000..17e7286e6
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/conflict_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif
deleted file mode 100644
index 6fe6f0e10..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png
new file mode 100644
index 000000000..50b14d8e5
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_change.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif
deleted file mode 100644
index 6fe6f0e10..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png
new file mode 100644
index 000000000..50b14d8e5
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/filter_history.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif
deleted file mode 100644
index bdef87928..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png
new file mode 100644
index 000000000..13f83a237
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/flatLayout.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif
deleted file mode 100644
index a6099a13f..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png
new file mode 100644
index 000000000..665aa5cee
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/hierarchicalLayout.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif
deleted file mode 100644
index b3a769d9a..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png
new file mode 100644
index 000000000..ac4b72174
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png
new file mode 100644
index 000000000..01b594967
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/history_nav@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif
deleted file mode 100644
index 04767acc5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png
new file mode 100644
index 000000000..7092465a8
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorefiles.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif
deleted file mode 100644
index 7f280f5dc..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png
new file mode 100644
index 000000000..769b3f1bc
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png
new file mode 100644
index 000000000..ad16bc384
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/ignorews_edit@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif
deleted file mode 100644
index e99ebfcb5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png
new file mode 100644
index 000000000..8283a3467
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png
new file mode 100644
index 000000000..0b2e58a1e
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/incom_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif
deleted file mode 100644
index 045e32c58..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png
new file mode 100644
index 000000000..9378df281
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png
new file mode 100644
index 000000000..c87178613
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/newstream_wiz@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif
deleted file mode 100644
index 072b18445..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png
new file mode 100644
index 000000000..9fcc646d9
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/next_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif
deleted file mode 100644
index f5b1a16af..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png
new file mode 100644
index 000000000..3872beaf2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png
new file mode 100644
index 000000000..e0d816d76
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/outgo_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif
deleted file mode 100644
index 2cd9c5444..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png
new file mode 100644
index 000000000..020ea5f5b
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_rem.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif
deleted file mode 100644
index 28a3785aa..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png
new file mode 100644
index 000000000..cf17733a1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/participant_remall.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif
deleted file mode 100644
index ec50b70fa..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png
new file mode 100644
index 000000000..aec9a52c7
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/pin.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif
deleted file mode 100644
index 07164754e..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png
new file mode 100644
index 000000000..f2e6a039c
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/prev_nav.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif
deleted file mode 100644
index 3ca04d06f..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png
new file mode 100644
index 000000000..ff32a35ea
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif
deleted file mode 100644
index fb4fa878a..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png
new file mode 100644
index 000000000..70a0a4694
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png
new file mode 100644
index 000000000..bfc32b221
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/refresh_remote@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif
deleted file mode 100644
index cef8c2f8f..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png
new file mode 100644
index 000000000..aa804d2fc
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png
new file mode 100644
index 000000000..c232361a1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/release_rls@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif
deleted file mode 100644
index 64b438488..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png
new file mode 100644
index 000000000..a0259ccf3
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/rem_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif
deleted file mode 100644
index 13ce11b14..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png
new file mode 100644
index 000000000..70c722e05
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png
new file mode 100644
index 000000000..a5da6ee9d
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/site_element@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif
deleted file mode 100644
index 870934b69..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png
new file mode 100644
index 000000000..1b61dc78a
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synced.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif
deleted file mode 100644
index a0b7b914e..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png
new file mode 100644
index 000000000..94ed99fb1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png
new file mode 100644
index 000000000..f0d5b3c54
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/synch_participants@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif
deleted file mode 100644
index 2644c2ad6..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png
new file mode 100644
index 000000000..cbbf40e83
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png
new file mode 100644
index 000000000..0c86044b9
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/elcl16/syncpane_co@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png
new file mode 100644
index 000000000..07fb14ee9
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png
new file mode 100644
index 000000000..89c631a38
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/compare_view@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png
new file mode 100644
index 000000000..a3339a07c
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png
new file mode 100644
index 000000000..138d8090e
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/history_view@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png
new file mode 100644
index 000000000..ddf8f76d2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png
new file mode 100644
index 000000000..be77ccb5c
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/eview16/synch_synch@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif
deleted file mode 100644
index f98800321..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png
new file mode 100644
index 000000000..d8573569d
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png
new file mode 100644
index 000000000..991ac9708
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/changeset_obj@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif
deleted file mode 100644
index 45b1ea559..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png
new file mode 100644
index 000000000..5c80414f2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png
new file mode 100644
index 000000000..87c7e3aac
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/compressed_folder_obj@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif b/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif
deleted file mode 100644
index 96aae05cb..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/dates.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates.png b/bundles/org.eclipse.team.ui/icons/full/obj/dates.png
new file mode 100644
index 000000000..ddcc80683
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/dates.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png
new file mode 100644
index 000000000..1021a6350
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/dates@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif
deleted file mode 100644
index 5ba6aee56..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png
new file mode 100644
index 000000000..99f034ead
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png
new file mode 100644
index 000000000..5edd1e663
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/export_projectset@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif
deleted file mode 100644
index 353b6f38c..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png
new file mode 100644
index 000000000..6f6bcb48f
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png
new file mode 100644
index 000000000..8ae395f8e
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/hunk_obj@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif
deleted file mode 100644
index 04767acc5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png
new file mode 100644
index 000000000..ba0f0952a
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png
new file mode 100644
index 000000000..80d3f7924
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/ignoreprefs@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif
deleted file mode 100644
index a61fdd316..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png
new file mode 100644
index 000000000..e468cc6ca
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png
new file mode 100644
index 000000000..924148af4
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/import_projectset@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif
deleted file mode 100644
index 4822bf86c..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png
new file mode 100644
index 000000000..3cb05d94d
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png
new file mode 100644
index 000000000..0958018a3
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/local_entry_tbl@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif
deleted file mode 100644
index 33be7d827..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png
new file mode 100644
index 000000000..78c97c3d5
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/resource_model.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif
deleted file mode 100644
index e9cb24495..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png
new file mode 100644
index 000000000..da3a6efd1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/share_project.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png
new file mode 100644
index 000000000..06a36fb5b
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/share_project@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif
deleted file mode 100644
index ca14cfca4..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png
new file mode 100644
index 000000000..0ec245ca5
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png
new file mode 100644
index 000000000..967acdb0c
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/obj/workspace_obj@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif
deleted file mode 100644
index 0053b5698..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png
new file mode 100644
index 000000000..8fc197aa0
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png
new file mode 100644
index 000000000..414d0a450
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/checkedout_ov@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif
deleted file mode 100644
index fce456a49..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png
new file mode 100644
index 000000000..228071da8
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png
new file mode 100644
index 000000000..dbe4efa29
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/confchg_ov@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif
deleted file mode 100644
index dc0b8c016..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png
new file mode 100644
index 000000000..e8aebdb4b
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png
new file mode 100644
index 000000000..6510ea406
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/dirty_ov@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif
deleted file mode 100644
index 119dcccd5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png
new file mode 100644
index 000000000..276f454f4
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png
new file mode 100644
index 000000000..927f13be2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/error_co@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif
deleted file mode 100644
index 2f3b201a6..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png
new file mode 100644
index 000000000..0832872f6
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png
new file mode 100644
index 000000000..746ec4c65
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/pinned_ovr@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif
deleted file mode 100644
index eb71a3c74..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png
new file mode 100644
index 000000000..e0edaced7
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png
new file mode 100644
index 000000000..e04d1e468
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/version_controlled@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif
deleted file mode 100644
index 7fe247650..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png
new file mode 100644
index 000000000..d21891da2
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png
new file mode 100644
index 000000000..4f0903044
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/waiting_ovr@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif
deleted file mode 100644
index ee2dac4a9..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png
new file mode 100644
index 000000000..863348ef1
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png
new file mode 100644
index 000000000..104587dd3
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/ovr/warning_co@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png
index 5a3407a20..60fb6f47a 100644
--- a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png
new file mode 100644
index 000000000..7c0cd7005
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/export_projectset_wizban@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png
index 50476bea3..35ba3fe1e 100644
--- a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png
new file mode 100644
index 000000000..108d98208
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/import_projectset_wizban@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif
deleted file mode 100644
index 2efb6ffb5..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png
new file mode 100644
index 000000000..06701beb3
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png
new file mode 100644
index 000000000..1147eafcb
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/keylock@2x.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif b/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif
deleted file mode 100644
index d122742ab..000000000
--- a/bundles/org.eclipse.team.ui/icons/full/wizban/lockkey.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png
index 5b2c7af8d..b2d6c0dba 100644
--- a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban.png
diff --git a/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png
new file mode 100644
index 000000000..a62e05c9b
--- /dev/null
+++ b/bundles/org.eclipse.team.ui/icons/full/wizban/share_wizban@2x.png
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 6ccfea999..eab035794 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -6,7 +6,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
  -->
@@ -39,7 +39,7 @@
           id="org.eclipse.team.ui.team.projectSet"
           label="%PreferenceKeywords.ProjectSet">
     </keyword>
-   </extension>   
+   </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
@@ -142,7 +142,7 @@
            </adapt>
            </not>
          </enablement>
-      </objectContribution>        
+      </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.psf"
@@ -288,7 +288,7 @@
       </category>
       <view
             name="%SyncView.name"
-            icon="$nl$/icons/full/eview16/synch_synch.gif"
+            icon="$nl$/icons/full/eview16/synch_synch.png"
             fastViewWidthRatio="0.25"
             category="org.eclipse.team.ui"
             allowMultiple="true"
@@ -299,12 +299,12 @@
             allowMultiple="true"
             category="org.eclipse.team.ui"
             class="org.eclipse.team.internal.ui.history.GenericHistoryView"
-            icon="icons/full/eview16/history_view.gif"
+            icon="icons/full/eview16/history_view.png"
             id="org.eclipse.team.ui.GenericHistoryView"
             name="%HistoryView"/>
     <!--  <view
             name="%CompareView.name"
-            icon="$nl$/icons/full/eview16/compare_view.gif"
+            icon="$nl$/icons/full/eview16/compare_view.png"
             fastViewWidthRatio="0.25"
             category="org.eclipse.team.ui"
             class="org.eclipse.team.internal.ui.synchronize.CompareView"
@@ -316,11 +316,11 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             name="%Synchronizing.perspective"
-            icon="$nl$/icons/full/eview16/synch_synch.gif"
+            icon="$nl$/icons/full/eview16/synch_synch.png"
             class="org.eclipse.team.internal.ui.synchronize.TeamSynchronizingPerspective"
             id="org.eclipse.team.ui.TeamSynchronizingPerspective">
          <description>
-            %Synchronizing.perspective.description 
+            %Synchronizing.perspective.description
          </description>
       </perspective>
    </extension>
@@ -343,10 +343,10 @@
             name="%Team"
             id="org.eclipse.team.ui.importWizards">
       </category>
-         
+
       <wizard
             name="%ProjectSetImportWizard.name"
-            icon="$nl$/icons/full/obj/import_projectset.gif"
+            icon="$nl$/icons/full/obj/import_projectset.png"
             class="org.eclipse.team.internal.ui.wizards.ProjectSetImportWizard"
             category="org.eclipse.team.ui.importWizards"
             id="org.eclipse.team.ui.ProjectSetImportWizard">
@@ -370,7 +370,7 @@
       </category>
       <wizard
             name="%ProjectSetExportWizard.name"
-            icon="$nl$/icons/full/obj/export_projectset.gif"
+            icon="$nl$/icons/full/obj/export_projectset.png"
             class="org.eclipse.team.internal.ui.wizards.ProjectSetExportWizard"
             category="org.eclipse.team.ui.exportWizards"
             id="org.eclipse.team.ui.ProjectSetExportWizard">
@@ -434,7 +434,7 @@
         	categoryId="org.eclipse.ui.category.perspectives"
         	id="org.eclipse.team.ui.TeamSynchronizingPerspective"/>
    </extension>
-   
+
    <extension
          point="org.eclipse.ui.bindings">
       <key
@@ -498,7 +498,7 @@
                label="%Command.syncAll.name"
                tooltip="%Command.syncAll.name"
                class="org.eclipse.team.internal.ui.synchronize.actions.GlobalRefreshAction"
-               icon="$nl$/icons/full/elcl16/synch_participants.gif"
+               icon="$nl$/icons/full/elcl16/synch_participants.png"
                style="pulldown"
                id="org.eclipse.team.ui.synchronizeAll">
          </action>
@@ -519,16 +519,16 @@
                tooltip="%ApplyPatch.tooltip"/>
       </actionSet>
    </extension>
-   
+
  <!-- file modification validator -->
-   
+
    <extension
          point="org.eclipse.team.core.defaultFileModificationValidator">
       <validator class="org.eclipse.team.internal.ui.DefaultUIFileModificationValidator"/>
    </extension>
-   
+
     <!-- adapter factory -->
-    
+
    <extension
          point="org.eclipse.core.runtime.adapters">
       <factory
@@ -565,7 +565,7 @@
             name="%ResourcesContentExtension"
             priority="lowest">
          <enablement>
-           <or>         
+           <or>
             <instanceof value="org.eclipse.core.internal.resources.mapping.ResourceModelProvider"/>
             <instanceof value="org.eclipse.core.resources.IResource"/>
             <instanceof value="org.eclipse.team.core.mapping.ISynchronizationScope"/>
@@ -591,9 +591,9 @@
              viewerId="org.eclipse.team.ui.navigatorViewer">
            <popupMenu
                 allowsPlatformContributions="false"
-                id="org.eclipse.team.ui.navigatorViewer#PopupMenu">  
-             <insertionPoint name="file"/>  
-             <insertionPoint name="edit"/>          
+                id="org.eclipse.team.ui.navigatorViewer#PopupMenu">
+             <insertionPoint name="file"/>
+             <insertionPoint name="edit"/>
              <insertionPoint name="synchronize"/>
              <insertionPoint
                    name="navigate"
@@ -603,26 +603,26 @@
                    separator="true"/>
              <insertionPoint
                    name="other"
-                   separator="true"/> 
+                   separator="true"/>
              <insertionPoint
                    name="sort"
                    separator="true"/>
              <insertionPoint
                    name="additions"
-                   separator="true"/>              
+                   separator="true"/>
              <insertionPoint
                    name="properties"
                    separator="true"/>
           </popupMenu>
        </viewer>
    </extension>
-   
+
    <!-- *************** Synchronize View Participant **************** -->
    <extension
          point="org.eclipse.team.ui.synchronizeParticipants">
       <participant
             class="org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant"
-            icon="$nl$/icons/full/eview16/synch_synch.gif"
+            icon="$nl$/icons/full/eview16/synch_synch.png"
             id="org.eclipse.team.ui.synchronization_context_synchronize_participant"
             name="%ModelSyncParticipant"
             persistent="false">
@@ -634,7 +634,7 @@
          point="org.eclipse.team.ui.teamContentProviders">
       <teamContentProvider
             contentExtensionId="org.eclipse.team.ui.resourceContent"
-            icon="$nl$/icons/full/obj/workspace_obj.gif"
+            icon="$nl$/icons/full/obj/workspace_obj.png"
             modelProviderId="org.eclipse.core.resources.modelProvider"
             preferencePage="org.eclipse.team.internal.ui.preferences.ResourceModelPreferencePage"
             supportsFlatLayout="true"/>
@@ -648,14 +648,14 @@
                id="interactive"
                value="true"/>
       </triggerPoint>
-    </extension> 
-    
+    </extension>
+
    <!-- ******* Export/Import ignored resources ******** -->
    <extension
          point="org.eclipse.ui.preferenceTransfer">
       <transfer
             id="org.eclipse.team.transfer.ignores"
-            icon="$nl$/icons/full/obj/ignoreprefs.gif"
+            icon="$nl$/icons/full/obj/ignoreprefs.png"
             name="%ignoresTransferName">
          <mapping
                scope="instance">
@@ -668,14 +668,14 @@
          </mapping>
       </transfer>
    </extension>
-   
+
    <!-- ******* Apply Patch in Sync View ******** -->
    <extension
          point="org.eclipse.team.ui.synchronizeWizards">
       <wizard
             class="org.eclipse.team.internal.ui.synchronize.patch.ApplyPatchSynchronizationWizard"
             description="%PatchSyncWizard_description"
-            icon="icons/full/obj/hunk_obj.gif"
+            icon="icons/full/obj/hunk_obj.png"
             id="org.eclipse.team.ui.applyPatchWizard"
             name="%PatchSyncWizard">
       </wizard>
@@ -684,7 +684,7 @@
          point="org.eclipse.team.ui.synchronizeParticipants">
       <participant
             class="org.eclipse.team.internal.ui.synchronize.patch.ApplyPatchModelSynchronizeParticipant"
-            icon="icons/full/obj/hunk_obj.gif"
+            icon="icons/full/obj/hunk_obj.png"
             id="org.eclipse.team.ui.applyPatchModelParticipant"
             name="%PatchSyncParticipant"
             persistent="false">
@@ -702,7 +702,7 @@
             point="org.eclipse.ui.navigator.navigatorContent">
          <navigatorContent
                contentProvider="org.eclipse.team.internal.ui.synchronize.patch.PatchSyncContentProvider"
-               icon="icons/full/obj/hunk_obj.gif"
+               icon="icons/full/obj/hunk_obj.png"
                id="org.eclipse.team.ui.patchSyncNavigatorContent"
                labelProvider="org.eclipse.team.internal.ui.synchronize.patch.PatchSyncLabelProvider"
                name="%PatchNavigatorContent"
@@ -785,7 +785,7 @@
             point="org.eclipse.team.ui.teamContentProviders">
          <teamContentProvider
                contentExtensionId="org.eclipse.team.ui.patchSyncNavigatorContent"
-               icon="icons/full/obj/hunk_obj.gif"
+               icon="icons/full/obj/hunk_obj.png"
                modelProviderId="org.eclipse.team.ui.patchModelProvider">
          </teamContentProvider>
       </extension>
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index a5464bb12..91d0ebf9c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -48,6 +48,57 @@ import org.osgi.framework.*;
  */
 public class TeamUIPlugin extends AbstractUIPlugin {
 
+	/*====================================================================
+	 * Constants defining overlays file names
+	 *====================================================================*/
+
+	private final String IMG_DIRTY_OVR_FILE = "ovr/dirty_ov.png"; //$NON-NLS-1$
+	private final String IMG_CHECKEDIN_OVR_FILE = "ovr/version_controlled.png"; //$NON-NLS-1$
+	private final String IMG_CHECKEDOUT_OVR_FILE = "ovr/checkedout_ov.png"; //$NON-NLS-1$
+	private final String IMG_CONFLICT_OVR_FILE = "ovr/confchg_ov.png"; //$NON-NLS-1$
+	private final String IMG_ERROR_OVR_FILE = "ovr/error_co.png"; //$NON-NLS-1$
+	private final String IMG_WARNING_OVR_FILE = "ovr/warning_co.png"; //$NON-NLS-1$
+	private final String IMG_HOURGLASS_OVR_FILE = "ovr/waiting_ovr.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_INCOMING_FILE = "elcl16/incom_synch.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_OUTGOING_FILE = "elcl16/outgo_synch.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_CONFLICTING_FILE = "elcl16/conflict_synch.png"; //$NON-NLS-1$
+	private final String IMG_REFRESH_FILE = "elcl16/refresh.png"; //$NON-NLS-1$
+	private final String IMG_REFRESH_REMOTE_FILE = "elcl16/refresh_remote.png"; //$NON-NLS-1$
+	private final String IMG_LINK_WITH_FILE = "elcl16/synced.png"; //$NON-NLS-1$
+	private final String IMG_IGNORE_WHITESPACE_FILE = "elcl16/ignorews_edit.png"; //$NON-NLS-1$
+	private final String IMG_COLLAPSE_ALL_FILE = "elcl16/collapseall.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_CATCHUP_FILE = "elcl16/catchup_rls.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_RELEASE_FILE = "elcl16/release_rls.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_FREE_FILE = "elcl16/catchuprelease_rls.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_INCOMING_DISABLED_FILE = "dlcl16/incom_synch.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_OUTGOING_DISABLED_FILE = "dlcl16/outgo_synch.png"; //$NON-NLS-1$
+	private final String IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE = "dlcl16/conflict_synch.png"; //$NON-NLS-1$
+	private final String IMG_REFRESH_DISABLED_FILE = "dlcl16/refresh.png"; //$NON-NLS-1$
+	private final String IMG_REFRESH_REMOTE_DISABLED_FILE = "dlcl16/refresh_remote.png"; //$NON-NLS-1$
+	private final String IMG_LINK_WITH_DISABLED_FILE = "dlcl16/synced.png"; //$NON-NLS-1$
+	private final String IMG_IGNORE_WHITESPACE_DISABLED_FILE = "dlcl16/ignorews_edit.png"; //$NON-NLS-1$
+	private final String IMG_COLLAPSE_ALL_DISABLED_FILE = "dlcl16/collapseall.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_CATCHUP_DISABLED_FILE = "dlcl16/catchup_rls.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_RELEASE_DISABLED_FILE = "dlcl16/release_rls.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_MODE_FREE_DISABLED_FILE = "dlcl16/catchuprelease_rls.png"; //$NON-NLS-1$
+	private final String IMG_WIZBAN_SHARE_FILE = "wizban/share_wizban.png"; //$NON-NLS-1$
+	private final String IMG_PROJECTSET_IMPORT_BANNER_FILE = "wizban/import_projectset_wizban.png"; //$NON-NLS-1$
+	private final String IMG_PROJECTSET_EXPORT_BANNER_FILE = "wizban/export_projectset_wizban.png"; //$NON-NLS-1$
+	private final String IMG_KEY_LOCK_FILE = "wizban/keylock.png"; //$NON-NLS-1$
+	private final String IMG_PINNED_FILE = "elcl16/pin.png";  //$NON-NLS-1$
+	private final String IMG_PREVIOUS_FILE = "elcl16/prev_nav.png"; //$NON-NLS-1$
+	private final String IMG_SITE_ELEMENT_FILE = "elcl16/site_element.png"; //$NON-NLS-1$
+	private final String IMG_CHANGE_FILTER_FILE = "elcl16/change_filter.png"; //$NON-NLS-1$
+	private final String IMG_COMPRESSED_FOLDER_FILE = "obj/compressed_folder_obj.png"; //$NON-NLS-1$
+	private final String IMG_HIERARCHICAL_FILE = "elcl16/hierarchicalLayout.png"; //$NON-NLS-1$
+	private final String IMG_FLAT_FILE = "elcl16/flatLayout.png"; //$NON-NLS-1$
+	private final String IMG_SYNC_VIEW_FILE = "eview16/synch_synch.png"; //$NON-NLS-1$
+	private final String IMG_CHANGE_SET_FILE = "obj/changeset_obj.png"; //$NON-NLS-1$
+	private final String IMG_COMPARE_VIEW_FILE = "eview16/compare_view.png"; //$NON-NLS-1$
+	private final String IMG_DATES_CATEGORY_FILE = "obj/dates.png"; //$NON-NLS-1$
+	private final String IMG_LOCALREVISION_TABLE_FILE = "obj/local_entry_tbl.png"; //$NON-NLS-1$
+
+
 	private static TeamUIPlugin instance;
 
 	// image paths
@@ -310,12 +361,12 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 	 * @param id  the identifier for the image
 	 * @param baseURL  the base URL for the image
 	 */
-	private static void createImageDescriptor(TeamUIPlugin plugin, String id) {
+	private static void createImageDescriptor(TeamUIPlugin plugin, String id, String fileName) {
 		// Delegate to the plugin instance to avoid concurrent class loading problems
-		plugin.privateCreateImageDescriptor(id);
+		plugin.privateCreateImageDescriptor(id, fileName);
 	}
-	private void privateCreateImageDescriptor(String id) {
-        ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(id));
+	private void privateCreateImageDescriptor(String id, String fileName) {
+        ImageDescriptor desc = ImageDescriptor.createFromURL(getImageUrl(fileName));
         imageDescriptors.put(id, desc);
 	}
 
@@ -332,7 +383,7 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 	}
 	private ImageDescriptor privateGetImageDescriptor(String id) {
 		if(! imageDescriptors.containsKey(id)) {
-			createImageDescriptor(getPlugin(), id);
+			createImageDescriptor(getPlugin(), id, id);
 		}
 		return imageDescriptors.get(id);
 	}
@@ -356,59 +407,67 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 	 */
 	private void initializeImages(TeamUIPlugin plugin) {
 		// Overlays
-		createImageDescriptor(plugin, ISharedImages.IMG_DIRTY_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_CONFLICT_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDIN_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDOUT_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR);
-		createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR);
+		createImageDescriptor(plugin, ISharedImages.IMG_DIRTY_OVR, IMG_DIRTY_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_CONFLICT_OVR, IMG_CONFLICT_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDIN_OVR, IMG_CHECKEDIN_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_CHECKEDOUT_OVR, IMG_CHECKEDOUT_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_ERROR_OVR, IMG_ERROR_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_WARNING_OVR, IMG_WARNING_OVR_FILE);
+		createImageDescriptor(plugin, ISharedImages.IMG_HOURGLASS_OVR, IMG_HOURGLASS_OVR_FILE);
 
 		// Target Management Icons
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE);
 
 		// Sync View Icons
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_ENABLED);
-
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED);
-
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE);
-
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED);
-
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_ENABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_ENABLED);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_ENABLED);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING, IMG_DLG_SYNC_INCOMING_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING, IMG_DLG_SYNC_OUTGOING_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING, IMG_DLG_SYNC_CONFLICTING_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH, IMG_REFRESH_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE, IMG_REFRESH_REMOTE_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH, IMG_LINK_WITH_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_FILTER, IMG_CHANGE_FILTER_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE, IMG_IGNORE_WHITESPACE_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL, IMG_COLLAPSE_ALL_FILE);
+
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_INCOMING_DISABLED, IMG_DLG_SYNC_INCOMING_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_OUTGOING_DISABLED, IMG_DLG_SYNC_OUTGOING_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DLG_SYNC_CONFLICTING_DISABLED, IMG_DLG_SYNC_CONFLICTING_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_DISABLED, IMG_REFRESH_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_REFRESH_REMOTE_DISABLED, IMG_REFRESH_REMOTE_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_LINK_WITH_DISABLED, IMG_LINK_WITH_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_IGNORE_WHITESPACE_DISABLED, IMG_IGNORE_WHITESPACE_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_COLLAPSE_ALL_DISABLED, IMG_COLLAPSE_ALL_DISABLED_FILE);
+
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP, IMG_SYNC_MODE_CATCHUP_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE, IMG_SYNC_MODE_RELEASE_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE, IMG_SYNC_MODE_FREE_FILE);
+
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_CATCHUP_DISABLED, IMG_SYNC_MODE_CATCHUP_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_RELEASE_DISABLED, IMG_SYNC_MODE_RELEASE_DISABLED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_MODE_FREE_DISABLED, IMG_SYNC_MODE_FREE_DISABLED_FILE);
+
+		createImageDescriptor(plugin, ITeamUIImages.IMG_KEY_LOCK, IMG_KEY_LOCK_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_PINNED, IMG_PINNED_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_PREVIOUS, IMG_PREVIOUS_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SITE_ELEMENT, IMG_SITE_ELEMENT_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE, IMG_WIZBAN_SHARE_FILE);
 
 		// Wizard banners
-		createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_WIZBAN_SHARE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER, IMG_PROJECTSET_IMPORT_BANNER_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER, IMG_PROJECTSET_EXPORT_BANNER_FILE);
 
 		// Live Sync View icons
-		createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_COMPRESSED_FOLDER, IMG_COMPRESSED_FOLDER_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_SYNC_VIEW, IMG_SYNC_VIEW_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_CHANGE_SET, IMG_CHANGE_SET_FILE);
+
+		createImageDescriptor(plugin, ITeamUIImages.IMG_HIERARCHICAL, IMG_HIERARCHICAL_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_FLAT, IMG_FLAT_FILE);
 
 		// Local History Page
-		createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW);
-		createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_DATES_CATEGORY, IMG_DATES_CATEGORY_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_COMPARE_VIEW, IMG_COMPARE_VIEW_FILE);
+		createImageDescriptor(plugin, ITeamUIImages.IMG_LOCALREVISION_TABLE, IMG_LOCALREVISION_TABLE_FILE);
 	}
 
     private URL getImageUrl(String relative) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties
index 5b8aaad3a..72e8d0730 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/actions.properties
@@ -15,7 +15,7 @@
 action.collapseAll.label=Collapse All
 action.collapseAll.tooltip=Collapse All
 action.collapseAll.description=Collapse All
-action.collapseAll.image=collapseall.gif
+action.collapseAll.image=collapseall.png
 
 action.configureSchedulel.label=&Schedule...
 action.configureSchedulel.tooltip=Schedule a Background Synchronization
@@ -27,57 +27,57 @@ action.refreshWithRemote.description=Synchronize
 action.directionFilterIncoming.label=&Incoming
 action.directionFilterIncoming.tooltip=Incoming Mode
 action.directionFilterIncoming.description=Incoming Mode (shows incoming changes and conflicts)
-action.directionFilterIncoming.image=catchup_rls.gif
+action.directionFilterIncoming.image=catchup_rls.png
 
 action.directionFilterOutgoing.label=&Outgoing
 action.directionFilterOutgoing.tooltip=Outgoing Mode
 action.directionFilterOutgoing.description=Outgoing Mode (shows outgoing changes and conflicts)
-action.directionFilterOutgoing.image=release_rls.gif
+action.directionFilterOutgoing.image=release_rls.png
 
 action.directionFilterConflicts.label=&Conflicts
 action.directionFilterConflicts.tooltip=Conflicts Mode
 action.directionFilterConflicts.description=Conflicts Mode (shows conflicts)
-action.directionFilterConflicts.image=conflict_synch.gif
+action.directionFilterConflicts.image=conflict_synch.png
 
 action.directionFilterBoth.label=&Both
 action.directionFilterBoth.tooltip=Incoming/Outgoing Mode
 action.directionFilterBoth.description=Incoming/Outgoing Mode (shows outgoing changes, incoming changes, and conflicts)
-action.directionFilterBoth.image=catchuprelease_rls.gif
+action.directionFilterBoth.image=catchuprelease_rls.png
 
 action.refreshSubscriber.label=Synchronizations
 action.refreshSubscriber.tooltip=Synchronizations
 action.refreshSubscriber.description=Synchronizations
-action.refreshSubscriber.image=synch_participants.gif
+action.refreshSubscriber.image=synch_participants.png
 
 action.comparisonCriteria.label=Comparison Criteria
 action.comparisonCriteria.tooltip=Select the comparison method
 action.comparisonCriteria.description=Select the comparison method
-action.comparisonCriteria.image=showsync_rn.gif
+action.comparisonCriteria.image=showsync_rn.png
 
 action.navigateNext.label=Ne&xt Difference
 action.navigateNext.tooltip=Next Difference
 action.navigateNext.description=Show Next Difference
-action.navigateNext.image=next_nav.gif
+action.navigateNext.image=next_nav.png
 
 action.navigatePrevious.label=Pre&vious Difference
 action.navigatePrevious.tooltip=Previous Difference
 action.navigatePrevious.description=Show Previous Difference
-action.navigatePrevious.image=prev_nav.gif
+action.navigatePrevious.image=prev_nav.png
 
 action.removePage.label=&Remove Current Synchronization
 action.removePage.tooltip=Remove Current Synchronization
 action.removePage.description=Remove Current Synchronization
-action.removePage.image=participant_rem.gif
+action.removePage.image=participant_rem.png
 
 action.removeAllPage.label=Remove &Un-Pinned Synchronizations
 action.removeAllPage.tooltip=Remove Un-Pinned Synchronizations
 action.removeAllPage.description=Remove Un-Pinned Synchronizations
-action.removeAllPage.image=participant_remall.gif
+action.removeAllPage.image=participant_remall.png
 
 action.pinParticipant.label=Pi&n Current Synchronization
 action.pinParticipant.tooltip=Pin Current Synchronization
 action.pinParticipant.description=Pin Current Synchronization
-action.pinParticipant.image=pin.gif
+action.pinParticipant.image=pin.png
 
 action.expandAll.label=E&xpand All
 action.open.label=&Open
@@ -98,12 +98,12 @@ action.restoreRemovedFromView.label=Restore Removed &Items
 action.mergeAll.label=Merge
 action.mergeAll.tooltip=Merge All Non-Conflicting Changes
 action.mergeAll.description=Merge All Non-Conflicting Changes
-action.mergeAll.image=checkout_action.gif
+action.mergeAll.image=checkout_action.png
 
 action.replaceAll.label=Replace All
 action.replaceAll.tooltip=Replace the local elements with the corresponding remote changes
 action.replaceAll.description=Replace All
-action.replaceAll.image=checkout_action.gif
+action.replaceAll.image=checkout_action.png
 
 action.reversePatch.label=Re&verse Patch
 action.reversePatch.tooltip=Rollbacks the changes introduced by the patch
@@ -130,8 +130,8 @@ action.replace.label=&Replace
 action.pickModels.label=Select Model
 action.pickModels.tooltip=Select the model to be displayed
 action.pickModels.description=Select the model to be displayed
-action.pickModels.image=hierarchicalLayout.gif
+action.pickModels.image=hierarchicalLayout.png
 
 action.previousHistory.label=Show Previous Histories
 action.previousHistory.tooltip=Show Previous Histories
-action.previousHistory.image=history_nav.gif
+action.previousHistory.image=history_nav.png
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
index d9c23a8dc..3463f86b3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
@@ -73,8 +73,8 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
 
 	private static final class ParticipantOverlay extends CompositeImageDescriptor {
 
-		private ImageData pinnedData = TeamUIPlugin.getImageDescriptor("ovr/pinned_ovr.gif").getImageData(); //$NON-NLS-1$
-		private ImageData scheduledData = TeamUIPlugin.getImageDescriptor("ovr/waiting_ovr.gif").getImageData(); //$NON-NLS-1$
+		private ImageData pinnedData = TeamUIPlugin.getImageDescriptor("ovr/pinned_ovr.png").getImageData(); //$NON-NLS-1$
+		private ImageData scheduledData = TeamUIPlugin.getImageDescriptor("ovr/waiting_ovr.png").getImageData(); //$NON-NLS-1$
 		private ImageData imageData;
 		private ISynchronizeParticipant participant;
 
@@ -113,4 +113,3 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
 		}
 	}
 }
-