diff --git a/com.wudsn.ide.base/icons/hardware-apple2-16x16.gif b/com.wudsn.ide.base/icons/hardware-apple2-16x16.gif
deleted file mode 100644
index 9755078c..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-apple2-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-apple2-16x16.png b/com.wudsn.ide.base/icons/hardware-apple2-16x16.png
new file mode 100644
index 00000000..bf185c82
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-apple2-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari2600-16x16.gif b/com.wudsn.ide.base/icons/hardware-atari2600-16x16.gif
deleted file mode 100644
index ab28795f..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-atari2600-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari2600-16x16.png b/com.wudsn.ide.base/icons/hardware-atari2600-16x16.png
new file mode 100644
index 00000000..2bf770f2
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-atari2600-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari7800-16x16.gif b/com.wudsn.ide.base/icons/hardware-atari7800-16x16.gif
deleted file mode 100644
index 2079858c..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-atari7800-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari7800-16x16.png b/com.wudsn.ide.base/icons/hardware-atari7800-16x16.png
new file mode 100644
index 00000000..ce4d3681
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-atari7800-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.gif b/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.gif
deleted file mode 100644
index c93689bf..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.png b/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.png
new file mode 100644
index 00000000..54252cae
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-atari8bit-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.gif b/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.gif
deleted file mode 100644
index 1845df70..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.png b/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.png
new file mode 100644
index 00000000..f053d5d2
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-atari8bit-32x32.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-c64-16x16.gif b/com.wudsn.ide.base/icons/hardware-c64-16x16.gif
deleted file mode 100644
index c58eaa56..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-c64-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-c64-16x16.png b/com.wudsn.ide.base/icons/hardware-c64-16x16.png
new file mode 100644
index 00000000..5562e044
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-c64-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-generic-16x16.gif b/com.wudsn.ide.base/icons/hardware-generic-16x16.gif
deleted file mode 100644
index b58a71de..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-generic-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-generic-16x16.png b/com.wudsn.ide.base/icons/hardware-generic-16x16.png
new file mode 100644
index 00000000..a9c0f4d2
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-generic-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-nes-16x16.gif b/com.wudsn.ide.base/icons/hardware-nes-16x16.gif
deleted file mode 100644
index 3269e0a1..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-nes-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-nes-16x16.png b/com.wudsn.ide.base/icons/hardware-nes-16x16.png
new file mode 100644
index 00000000..09dec7a2
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-nes-16x16.png differ
diff --git a/com.wudsn.ide.base/icons/hardware-test-16x16.gif b/com.wudsn.ide.base/icons/hardware-test-16x16.gif
deleted file mode 100644
index a5bb5a8c..00000000
Binary files a/com.wudsn.ide.base/icons/hardware-test-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.base/icons/hardware-test-16x16.png b/com.wudsn.ide.base/icons/hardware-test-16x16.png
new file mode 100644
index 00000000..b652e01b
Binary files /dev/null and b/com.wudsn.ide.base/icons/hardware-test-16x16.png differ
diff --git a/com.wudsn.ide.base/src/com/wudsn/ide/base/hardware/HardwareUtility.java b/com.wudsn.ide.base/src/com/wudsn/ide/base/hardware/HardwareUtility.java
index 2d25f33b..9aeeebfc 100644
--- a/com.wudsn.ide.base/src/com/wudsn/ide/base/hardware/HardwareUtility.java
+++ b/com.wudsn.ide.base/src/com/wudsn/ide/base/hardware/HardwareUtility.java
@@ -91,28 +91,28 @@ public final class HardwareUtility {
 		String path;
 		switch (hardware) {
 		case GENERIC:
-			path = "hardware-generic-16x16.gif";
+			path = "hardware-generic-16x16.png";
 			break;
 		case APPLE2:
-			path = "hardware-apple2-16x16.gif";
+			path = "hardware-apple2-16x16.png";
 			break;
 		case ATARI2600:
-			path = "hardware-atari2600-16x16.gif";
+			path = "hardware-atari2600-16x16.png";
 			break;
 		case ATARI7800:
-			path = "hardware-atari7800-16x16.gif";
+			path = "hardware-atari7800-16x16.png";
 			break;
 		case ATARI8BIT:
-			path = "hardware-atari8bit-16x16.gif";
+			path = "hardware-atari8bit-16x16.png";
 			break;
 		case C64:
-			path = "hardware-c64-16x16.gif";
+			path = "hardware-c64-16x16.png";
 			break;
 		case NES:
-			path = "hardware-nes-16x16.gif";
+			path = "hardware-nes-16x16.png";
 			break;
 		case TEST:
-			path = "hardware-test-16x16.gif";
+			path = "hardware-test-16x16.png";
 			break;
 		default:
 			throw new IllegalArgumentException("Unknown hardware " + hardware + ".");
diff --git a/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.gif b/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.gif
deleted file mode 100644
index a6978e34..00000000
Binary files a/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.gif and /dev/null differ
diff --git a/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.png b/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.png
new file mode 100644
index 00000000..75e7002c
Binary files /dev/null and b/com.wudsn.ide.dsk/icons/editor-apple2-disk-image.png differ
diff --git a/com.wudsn.ide.dsk/plugin.xml b/com.wudsn.ide.dsk/plugin.xml
index 399dd410..c721947a 100644
--- a/com.wudsn.ide.dsk/plugin.xml
+++ b/com.wudsn.ide.dsk/plugin.xml
@@ -15,7 +15,7 @@
    <editor
           class="com.wudsn.ide.dsk.apple2.Apple2DiskImageEditor"
           default="false"
-          icon="icons/editor-apple2-disk-image.gif"
+          icon="icons/editor-apple2-disk-image.png"
           id="com.wudsn.ide.dsk.apple2.Apple2DiskImageEditor"
           name="%com.wudsn.ide.dsk.apple2.Apple2DiskImageEditor.name">
        <contentTypeBinding
diff --git a/com.wudsn.ide.gfx/icons/file-type-charset.gif b/com.wudsn.ide.gfx/icons/file-type-charset.gif
deleted file mode 100644
index 54fd583b..00000000
Binary files a/com.wudsn.ide.gfx/icons/file-type-charset.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/file-type-picture.gif b/com.wudsn.ide.gfx/icons/file-type-picture.gif
deleted file mode 100644
index a8955c86..00000000
Binary files a/com.wudsn.ide.gfx/icons/file-type-picture.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/graphics-editor-16x16.gif b/com.wudsn.ide.gfx/icons/graphics-editor-16x16.gif
deleted file mode 100644
index f7b9d198..00000000
Binary files a/com.wudsn.ide.gfx/icons/graphics-editor-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/graphics-editor-16x16.png b/com.wudsn.ide.gfx/icons/graphics-editor-16x16.png
new file mode 100644
index 00000000..c6e928ef
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/graphics-editor-16x16.png differ
diff --git a/com.wudsn.ide.gfx/icons/occ_write.gif b/com.wudsn.ide.gfx/icons/occ_write.gif
deleted file mode 100644
index 18576d47..00000000
Binary files a/com.wudsn.ide.gfx/icons/occ_write.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/refresh.gif b/com.wudsn.ide.gfx/icons/refresh.gif
deleted file mode 100644
index 3ca04d06..00000000
Binary files a/com.wudsn.ide.gfx/icons/refresh.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/refresh.png b/com.wudsn.ide.gfx/icons/refresh.png
new file mode 100644
index 00000000..25889c0e
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/refresh.png differ
diff --git a/com.wudsn.ide.gfx/icons/save_edit.gif b/com.wudsn.ide.gfx/icons/save_edit.gif
deleted file mode 100644
index 499dd0ca..00000000
Binary files a/com.wudsn.ide.gfx/icons/save_edit.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/save_edit.png b/com.wudsn.ide.gfx/icons/save_edit.png
new file mode 100644
index 00000000..b87aeea4
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/save_edit.png differ
diff --git a/com.wudsn.ide.gfx/icons/saveall_edit.gif b/com.wudsn.ide.gfx/icons/saveall_edit.gif
deleted file mode 100644
index ef0eab5b..00000000
Binary files a/com.wudsn.ide.gfx/icons/saveall_edit.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/saveall_edit.png b/com.wudsn.ide.gfx/icons/saveall_edit.png
new file mode 100644
index 00000000..ce2c1385
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/saveall_edit.png differ
diff --git a/com.wudsn.ide.gfx/icons/search_ref_obj.gif b/com.wudsn.ide.gfx/icons/search_ref_obj.gif
deleted file mode 100644
index f8f0ce5a..00000000
Binary files a/com.wudsn.ide.gfx/icons/search_ref_obj.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/searchm_obj.gif b/com.wudsn.ide.gfx/icons/searchm_obj.gif
deleted file mode 100644
index 7b1efa54..00000000
Binary files a/com.wudsn.ide.gfx/icons/searchm_obj.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/searchm_obj.png b/com.wudsn.ide.gfx/icons/searchm_obj.png
new file mode 100644
index 00000000..2f28748b
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/searchm_obj.png differ
diff --git a/com.wudsn.ide.gfx/icons/smartmode_co.gif b/com.wudsn.ide.gfx/icons/smartmode_co.gif
deleted file mode 100644
index 542dddca..00000000
Binary files a/com.wudsn.ide.gfx/icons/smartmode_co.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/zoom-disabled.gif b/com.wudsn.ide.gfx/icons/zoom-disabled.gif
deleted file mode 100644
index d460ddda..00000000
Binary files a/com.wudsn.ide.gfx/icons/zoom-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/zoom-disabled.png b/com.wudsn.ide.gfx/icons/zoom-disabled.png
new file mode 100644
index 00000000..f60247de
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/zoom-disabled.png differ
diff --git a/com.wudsn.ide.gfx/icons/zoom.gif b/com.wudsn.ide.gfx/icons/zoom.gif
deleted file mode 100644
index d8d7fad3..00000000
Binary files a/com.wudsn.ide.gfx/icons/zoom.gif and /dev/null differ
diff --git a/com.wudsn.ide.gfx/icons/zoom.png b/com.wudsn.ide.gfx/icons/zoom.png
new file mode 100644
index 00000000..ba6634de
Binary files /dev/null and b/com.wudsn.ide.gfx/icons/zoom.png differ
diff --git a/com.wudsn.ide.gfx/plugin.xml b/com.wudsn.ide.gfx/plugin.xml
index 81ba3818..6b15d2e9 100644
--- a/com.wudsn.ide.gfx/plugin.xml
+++ b/com.wudsn.ide.gfx/plugin.xml
@@ -95,7 +95,7 @@
             contributorClass="org.eclipse.ui.part.EditorActionBarContributor"
             default="true"
             extensions="bmp, ico, gif, jpg, png, cnv"
-            icon="icons/graphics-editor-16x16.gif"
+            icon="icons/graphics-editor.png"
             id="com.wudsn.ide.gfx.editor.GraphicsConversionEditor"
             name="%com.wudsn.ide.gfx.editor.GraphicsConversionEditor.name">
          <contentTypeBinding
@@ -116,7 +116,7 @@
             allowMultiple="false"
             category="com.wudsn.ide.gfx.editor.GraphicsCategory"
             class="com.wudsn.ide.gfx.editor.ImageView"
-            icon="icons/graphics-editor-16x16.gif"
+            icon="icons/graphics-editor-16x16.png"
             id="com.wudsn.ide.gfx.editor.ImageView"
             name="%com.wudsn.ide.gfx.editor.ImageView.name"
             restorable="true">
@@ -125,7 +125,7 @@
             allowMultiple="false"
             category="com.wudsn.ide.gfx.editor.GraphicsCategory"
             class="com.wudsn.ide.gfx.editor.ImagePaletteView"
-            icon="icons/graphics-editor-16x16.gif"
+            icon="icons/graphics-editor-16x16.png"
             id="com.wudsn.ide.gfx.editor.ImagePaletteView"
             name="%com.wudsn.ide.gfx.editor.ImagePaletteView.name"
             restorable="true">
diff --git a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/Icons.java b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/Icons.java
index 85a34989..6c2a148d 100644
--- a/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/Icons.java
+++ b/com.wudsn.ide.gfx/src/com/wudsn/ide/gfx/editor/Icons.java
@@ -34,10 +34,10 @@ final class Icons {
 
 	static {
 		AbstractIDEPlugin plugin = GraphicsPlugin.getInstance();
-		FIND_DEFAULT_CONVERTER = plugin.getImage("searchm_obj.gif");
-		CREATE_CONVERSION = plugin.getImage("graphics-editor-16x16.gif");
-		REFRESH = plugin.getImage("refresh.gif");
-		SAVE_IMAGE = plugin.getImage("save_edit.gif");
-		SAVE_FILES = plugin.getImage("save_edit.gif");
+		FIND_DEFAULT_CONVERTER = plugin.getImage("searchm_obj.png");
+		CREATE_CONVERSION = plugin.getImage("graphics-editor-16x16.png");
+		REFRESH = plugin.getImage("refresh.png");
+		SAVE_IMAGE = plugin.getImage("save_edit.png");
+		SAVE_FILES = plugin.getImage("saveall_edit.png");
 	}
 }
diff --git a/com.wudsn.ide.hex/icons/copy-disabled.gif b/com.wudsn.ide.hex/icons/copy-disabled.gif
deleted file mode 100644
index 98626a81..00000000
Binary files a/com.wudsn.ide.hex/icons/copy-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/copy-disabled.png b/com.wudsn.ide.hex/icons/copy-disabled.png
new file mode 100644
index 00000000..0b6fe5d9
Binary files /dev/null and b/com.wudsn.ide.hex/icons/copy-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/copy-enabled.gif b/com.wudsn.ide.hex/icons/copy-enabled.gif
deleted file mode 100644
index 71d7c95a..00000000
Binary files a/com.wudsn.ide.hex/icons/copy-enabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/copy-enabled.png b/com.wudsn.ide.hex/icons/copy-enabled.png
new file mode 100644
index 00000000..61fbc063
Binary files /dev/null and b/com.wudsn.ide.hex/icons/copy-enabled.png differ
diff --git a/com.wudsn.ide.hex/icons/cut-disabled.gif b/com.wudsn.ide.hex/icons/cut-disabled.gif
deleted file mode 100644
index bd431447..00000000
Binary files a/com.wudsn.ide.hex/icons/cut-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/cut-disabled.png b/com.wudsn.ide.hex/icons/cut-disabled.png
new file mode 100644
index 00000000..40a155de
Binary files /dev/null and b/com.wudsn.ide.hex/icons/cut-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/cut-enabled.gif b/com.wudsn.ide.hex/icons/cut-enabled.gif
deleted file mode 100644
index d044e597..00000000
Binary files a/com.wudsn.ide.hex/icons/cut-enabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/cut-enabled.png b/com.wudsn.ide.hex/icons/cut-enabled.png
new file mode 100644
index 00000000..dfa26c0c
Binary files /dev/null and b/com.wudsn.ide.hex/icons/cut-enabled.png differ
diff --git a/com.wudsn.ide.hex/icons/delete-disabled.gif b/com.wudsn.ide.hex/icons/delete-disabled.gif
deleted file mode 100644
index 9e142981..00000000
Binary files a/com.wudsn.ide.hex/icons/delete-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/delete-disabled.png b/com.wudsn.ide.hex/icons/delete-disabled.png
new file mode 100644
index 00000000..fee4127a
Binary files /dev/null and b/com.wudsn.ide.hex/icons/delete-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/hex-editor-16x16.gif b/com.wudsn.ide.hex/icons/hex-editor-16x16.gif
deleted file mode 100644
index a8c58eba..00000000
Binary files a/com.wudsn.ide.hex/icons/hex-editor-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/hex-editor-16x16.png b/com.wudsn.ide.hex/icons/hex-editor-16x16.png
new file mode 100644
index 00000000..f92a7cb9
Binary files /dev/null and b/com.wudsn.ide.hex/icons/hex-editor-16x16.png differ
diff --git a/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.gif b/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.gif
deleted file mode 100644
index 29887165..00000000
Binary files a/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.png b/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.png
new file mode 100644
index 00000000..3ddcf3f8
Binary files /dev/null and b/com.wudsn.ide.hex/icons/hex-editor-segment-16x16.png differ
diff --git a/com.wudsn.ide.hex/icons/import-disabled.gif b/com.wudsn.ide.hex/icons/import-disabled.gif
deleted file mode 100644
index cd447418..00000000
Binary files a/com.wudsn.ide.hex/icons/import-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/import-disabled.png b/com.wudsn.ide.hex/icons/import-disabled.png
new file mode 100644
index 00000000..6f87b14e
Binary files /dev/null and b/com.wudsn.ide.hex/icons/import-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/import-enabled.gif b/com.wudsn.ide.hex/icons/import-enabled.gif
deleted file mode 100644
index d38085ad..00000000
Binary files a/com.wudsn.ide.hex/icons/import-enabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/import-enabled.png b/com.wudsn.ide.hex/icons/import-enabled.png
new file mode 100644
index 00000000..669aefb8
Binary files /dev/null and b/com.wudsn.ide.hex/icons/import-enabled.png differ
diff --git a/com.wudsn.ide.hex/icons/paste-disabled.gif b/com.wudsn.ide.hex/icons/paste-disabled.gif
deleted file mode 100644
index 1c7668db..00000000
Binary files a/com.wudsn.ide.hex/icons/paste-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/paste-disabled.png b/com.wudsn.ide.hex/icons/paste-disabled.png
new file mode 100644
index 00000000..9b25eedf
Binary files /dev/null and b/com.wudsn.ide.hex/icons/paste-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/paste-enabled.gif b/com.wudsn.ide.hex/icons/paste-enabled.gif
deleted file mode 100644
index 39dd4d9d..00000000
Binary files a/com.wudsn.ide.hex/icons/paste-enabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/paste-enabled.png b/com.wudsn.ide.hex/icons/paste-enabled.png
new file mode 100644
index 00000000..7b00c1ab
Binary files /dev/null and b/com.wudsn.ide.hex/icons/paste-enabled.png differ
diff --git a/com.wudsn.ide.hex/icons/save-as-disabled.gif b/com.wudsn.ide.hex/icons/save-as-disabled.gif
deleted file mode 100644
index df83a548..00000000
Binary files a/com.wudsn.ide.hex/icons/save-as-disabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/save-as-disabled.png b/com.wudsn.ide.hex/icons/save-as-disabled.png
new file mode 100644
index 00000000..af2d4011
Binary files /dev/null and b/com.wudsn.ide.hex/icons/save-as-disabled.png differ
diff --git a/com.wudsn.ide.hex/icons/save-as-enabled.gif b/com.wudsn.ide.hex/icons/save-as-enabled.gif
deleted file mode 100644
index 466bfb11..00000000
Binary files a/com.wudsn.ide.hex/icons/save-as-enabled.gif and /dev/null differ
diff --git a/com.wudsn.ide.hex/icons/save-as-enabled.png b/com.wudsn.ide.hex/icons/save-as-enabled.png
new file mode 100644
index 00000000..720a8085
Binary files /dev/null and b/com.wudsn.ide.hex/icons/save-as-enabled.png differ
diff --git a/com.wudsn.ide.hex/plugin.xml b/com.wudsn.ide.hex/plugin.xml
index 45c368de..78185913 100644
--- a/com.wudsn.ide.hex/plugin.xml
+++ b/com.wudsn.ide.hex/plugin.xml
@@ -161,8 +161,8 @@
             locationURI="popup:#HexEditorContext">
          <command
                commandId="com.wudsn.ide.hex.HexEditorCopyToClipboardCommand"
-               disabledIcon="icons/copy-disabled.gif"
-               icon="icons/copy-enabled.gif"
+               disabledIcon="icons/copy-disabled.png"
+               icon="icons/copy-enabled.png"
                id="com.wudsn.ide.hex.HexEditorCopyToClipboardCommand"
                style="push">
          </command>
@@ -191,15 +191,15 @@
          </menu>
          <command
                commandId="com.wudsn.ide.hex.HexEditorPasteFromClipboardCommand"
-               icon="icons/paste-enabled.gif"
+               icon="icons/paste-enabled.png"
                id="%com.wudsn.ide.hex.HexEditorPasteFromClipboardCommand.name"
                label="%com.wudsn.ide.hex.HexEditorPasteFromClipboardCommand.name"
                style="push">
          </command>
          <command
                commandId="com.wudsn.ide.hex.HexEditorSaveSelectionAsCommand"
-               disabledIcon="icons/save-as-disabled.gif"
-               icon="icons/save-as-enabled.gif"
+               disabledIcon="icons/save-as-disabled.png"
+               icon="icons/save-as-enabled.png"
                label="%com.wudsn.ide.hex.HexEditorSaveSelectionAsCommand.name"
                style="push">
          </command>
@@ -212,7 +212,7 @@
       <editor
             class="com.wudsn.ide.hex.HexEditor"
             default="true"
-            icon="icons/hex-editor-16x16.gif"
+            icon="icons/hex-editor-16x16.png"
             id="com.wudsn.ide.hex.HexEditor"
             name="%com.wudsn.ide.hex.HexEditor.name">
       </editor>
diff --git a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorContentOutlineLabelProvider.java b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorContentOutlineLabelProvider.java
index da55a554..b2f6c831 100644
--- a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorContentOutlineLabelProvider.java
+++ b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorContentOutlineLabelProvider.java
@@ -65,7 +65,7 @@ final class HexEditorContentOutlineLabelProvider extends DelegatingStyledCellLab
 		super(new HexEditorStyledLabelProvider());
 		HexPlugin plugin;
 		plugin = HexPlugin.getInstance();
-		segmentImage = plugin.getImage("hex-editor-segment-16x16.gif");
+		segmentImage = plugin.getImage("hex-editor-segment-16x16.png");
 	}
 
 	@Override
diff --git a/com.wudsn.ide.lng/icons/brkp_obj.gif b/com.wudsn.ide.lng/icons/brkp_obj.gif
deleted file mode 100644
index 3884a32c..00000000
Binary files a/com.wudsn.ide.lng/icons/brkp_obj.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/brkp_obj.png b/com.wudsn.ide.lng/icons/brkp_obj.png
new file mode 100644
index 00000000..35d64b64
Binary files /dev/null and b/com.wudsn.ide.lng/icons/brkp_obj.png differ
diff --git a/com.wudsn.ide.lng/icons/brkpd_obj.gif b/com.wudsn.ide.lng/icons/brkpd_obj.gif
deleted file mode 100644
index afedcf90..00000000
Binary files a/com.wudsn.ide.lng/icons/brkpd_obj.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/brkpd_obj.png b/com.wudsn.ide.lng/icons/brkpd_obj.png
new file mode 100644
index 00000000..bb48c0ba
Binary files /dev/null and b/com.wudsn.ide.lng/icons/brkpd_obj.png differ
diff --git a/com.wudsn.ide.lng/icons/hardware-generic-16x16.gif b/com.wudsn.ide.lng/icons/hardware-generic-16x16.gif
deleted file mode 100644
index 5c1b8283..00000000
Binary files a/com.wudsn.ide.lng/icons/hardware-generic-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/hardware-generic-16x16.png b/com.wudsn.ide.lng/icons/hardware-generic-16x16.png
new file mode 100644
index 00000000..ac018a09
Binary files /dev/null and b/com.wudsn.ide.lng/icons/hardware-generic-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/help-16x16.gif b/com.wudsn.ide.lng/icons/help-16x16.gif
deleted file mode 100644
index 168e6ff1..00000000
Binary files a/com.wudsn.ide.lng/icons/help-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/help-16x16.png b/com.wudsn.ide.lng/icons/help-16x16.png
new file mode 100644
index 00000000..9ea93354
Binary files /dev/null and b/com.wudsn.ide.lng/icons/help-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/help-topic-pdf-small.gif b/com.wudsn.ide.lng/icons/help-topic-pdf-small.gif
deleted file mode 100644
index 9591e124..00000000
Binary files a/com.wudsn.ide.lng/icons/help-topic-pdf-small.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/help-topic-pdf-small.png b/com.wudsn.ide.lng/icons/help-topic-pdf-small.png
new file mode 100644
index 00000000..16b11f75
Binary files /dev/null and b/com.wudsn.ide.lng/icons/help-topic-pdf-small.png differ
diff --git a/com.wudsn.ide.lng/icons/help-topic-small.gif b/com.wudsn.ide.lng/icons/help-topic-small.gif
deleted file mode 100644
index 1cfe6f3a..00000000
Binary files a/com.wudsn.ide.lng/icons/help-topic-small.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/help-topic-small.png b/com.wudsn.ide.lng/icons/help-topic-small.png
new file mode 100644
index 00000000..c6da0da4
Binary files /dev/null and b/com.wudsn.ide.lng/icons/help-topic-small.png differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.gif b/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.gif
deleted file mode 100644
index ed111bff..00000000
Binary files a/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.png b/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.png
new file mode 100644
index 00000000..608df04f
Binary files /dev/null and b/com.wudsn.ide.lng/icons/instruction-type-directive-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.gif b/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.gif
deleted file mode 100644
index 390fc46f..00000000
Binary files a/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.png b/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.png
new file mode 100644
index 00000000..e2ccf9e3
Binary files /dev/null and b/com.wudsn.ide.lng/icons/instruction-type-illegal-opcode-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.gif b/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.gif
deleted file mode 100644
index adede38a..00000000
Binary files a/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.png b/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.png
new file mode 100644
index 00000000..bfac31cb
Binary files /dev/null and b/com.wudsn.ide.lng/icons/instruction-type-legal-opcode-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.gif b/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.gif
deleted file mode 100644
index fcfca5e8..00000000
Binary files a/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.png b/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.png
new file mode 100644
index 00000000..6bd23625
Binary files /dev/null and b/com.wudsn.ide.lng/icons/instruction-type-pseudo-opcode-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-binary-include-16x16.gif b/com.wudsn.ide.lng/icons/outline-binary-include-16x16.gif
deleted file mode 100644
index fbd54abb..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-binary-include-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-binary-include-16x16.png b/com.wudsn.ide.lng/icons/outline-binary-include-16x16.png
new file mode 100644
index 00000000..361c20a5
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-binary-include-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-binary-output-16x16.gif b/com.wudsn.ide.lng/icons/outline-binary-output-16x16.gif
deleted file mode 100644
index e73a403c..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-binary-output-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-binary-output-16x16.png b/com.wudsn.ide.lng/icons/outline-binary-output-16x16.png
new file mode 100644
index 00000000..13f3df49
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-binary-output-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.gif b/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.gif
deleted file mode 100644
index 32e9f100..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.png b/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.png
new file mode 100644
index 00000000..107c84d9
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-constant-definition-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-default-16x16.gif b/com.wudsn.ide.lng/icons/outline-default-16x16.gif
deleted file mode 100644
index 31d523c1..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-default-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-default-16x16.png b/com.wudsn.ide.lng/icons/outline-default-16x16.png
new file mode 100644
index 00000000..d9cb185f
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-default-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-definition-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-definition-section-16x16.gif
deleted file mode 100644
index 31d523c1..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-definition-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-definition-section-16x16.png b/com.wudsn.ide.lng/icons/outline-definition-section-16x16.png
new file mode 100644
index 00000000..d9cb185f
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-definition-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-diamond-16x16.gif b/com.wudsn.ide.lng/icons/outline-diamond-16x16.gif
deleted file mode 100644
index 95900b71..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-diamond-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-diamond-16x16.png b/com.wudsn.ide.lng/icons/outline-diamond-16x16.png
new file mode 100644
index 00000000..808dcae7
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-diamond-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-diamond.png b/com.wudsn.ide.lng/icons/outline-diamond.png
new file mode 100644
index 00000000..2fddaeb9
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-diamond.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.gif
deleted file mode 100644
index 0cfdf25a..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.png b/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.png
new file mode 100644
index 00000000..b10b9f65
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-enum-definition-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.gif b/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.gif
deleted file mode 100644
index aa827979..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.png b/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.png
new file mode 100644
index 00000000..0f737692
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-equate-definition-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.gif
deleted file mode 100644
index 49ccefda..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.png b/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.png
new file mode 100644
index 00000000..29d744f8
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-implementation-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-label-definition-16x16.gif b/com.wudsn.ide.lng/icons/outline-label-definition-16x16.gif
deleted file mode 100644
index 9c76dee7..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-label-definition-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-label-definition-16x16.png b/com.wudsn.ide.lng/icons/outline-label-definition-16x16.png
new file mode 100644
index 00000000..051a1064
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-label-definition-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-local-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-local-section-16x16.gif
deleted file mode 100644
index 39117b60..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-local-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-local-section-16x16.png b/com.wudsn.ide.lng/icons/outline-local-section-16x16.png
new file mode 100644
index 00000000..36eec7bb
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-local-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.gif
deleted file mode 100644
index 6a6a44b4..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.png b/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.png
new file mode 100644
index 00000000..5ba55d78
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-macro-definition-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-pages-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-pages-section-16x16.gif
deleted file mode 100644
index 698e77ea..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-pages-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-pages-section-16x16.png b/com.wudsn.ide.lng/icons/outline-pages-section-16x16.png
new file mode 100644
index 00000000..f7577818
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-pages-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.gif
deleted file mode 100644
index 8219f4e8..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.png b/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.png
new file mode 100644
index 00000000..c0d249fc
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-procedure-definition-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.gif
deleted file mode 100644
index 03ff3b82..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.png b/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.png
new file mode 100644
index 00000000..5d5a12c6
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-repeat-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-sort.gif b/com.wudsn.ide.lng/icons/outline-sort.gif
deleted file mode 100644
index d458ca3e..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-sort.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-sort.png b/com.wudsn.ide.lng/icons/outline-sort.png
new file mode 100644
index 00000000..0849f3ec
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-sort.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-source-include-16x16.gif b/com.wudsn.ide.lng/icons/outline-source-include-16x16.gif
deleted file mode 100644
index e1c7cf48..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-source-include-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-source-include-16x16.png b/com.wudsn.ide.lng/icons/outline-source-include-16x16.png
new file mode 100644
index 00000000..9867f465
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-source-include-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.gif b/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.gif
deleted file mode 100644
index 0ef4c9db..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.png b/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.png
new file mode 100644
index 00000000..75609d4f
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-structure-definition-section-16x16.png differ
diff --git a/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.gif b/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.gif
deleted file mode 100644
index c775174d..00000000
Binary files a/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.png b/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.png
new file mode 100644
index 00000000..aec8780b
Binary files /dev/null and b/com.wudsn.ide.lng/icons/outline-variable-16x16 - Copy.png differ
diff --git a/com.wudsn.ide.lng/icons/sample.gif b/com.wudsn.ide.lng/icons/sample.gif
deleted file mode 100644
index 34fb3c9d..00000000
Binary files a/com.wudsn.ide.lng/icons/sample.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/sample.png b/com.wudsn.ide.lng/icons/sample.png
new file mode 100644
index 00000000..735b1207
Binary files /dev/null and b/com.wudsn.ide.lng/icons/sample.png differ
diff --git a/com.wudsn.ide.lng/icons/topic.gif b/com.wudsn.ide.lng/icons/topic.gif
deleted file mode 100644
index 914073c6..00000000
Binary files a/com.wudsn.ide.lng/icons/topic.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng/icons/topic.png b/com.wudsn.ide.lng/icons/topic.png
new file mode 100644
index 00000000..658af4a0
Binary files /dev/null and b/com.wudsn.ide.lng/icons/topic.png differ
diff --git a/com.wudsn.ide.lng/plugin.xml b/com.wudsn.ide.lng/plugin.xml
index efa8e166..266492e1 100644
--- a/com.wudsn.ide.lng/plugin.xml
+++ b/com.wudsn.ide.lng/plugin.xml
@@ -431,7 +431,7 @@
       </tocProvider>
       <tocIcon
             id="pdf"
-            openIcon="icons/help-topic-pdf-small.gif">
+            openIcon="icons/help-topic-pdf-small.png">
       </tocIcon>
    </extension>
    <extension
@@ -450,7 +450,7 @@
        <action
              class="com.wudsn.ide.lng.editor.LanguageEditorCompileCommandDelegate"
              definitionId="com.wudsn.ide.lng.editor.LanguageEditorCompileAndRunCommand"
-             icon="icons/hardware-generic-16x16.gif"
+             icon="icons/hardware-generic-16x16.png"
              id="com.wudsn.ide.lng.editor.LanguageEditorCompileAndRunAction"
              label="%com.wudsn.ide.lng.editor.LanguageEditorCompileAndRunCommand.name"
              style="pulldown"
@@ -520,7 +520,7 @@
  <extension
        point="org.eclipse.ui.preferenceTransfer">
     <transfer
-          icon="icons/hardware-generic-16x16.gif"
+          icon="icons/hardware-generic-16x16.png"
           id="com.wudsn.ide.lng.preferences.LanguagesPreferences"
           name="%com.wudsn.ide.lng.preferences.LanguagesPreferences.name">
        <mapping
@@ -536,7 +536,7 @@
     <view
           category="org.eclipse.debug.ui"
           class="com.wudsn.ide.lng.symbol.CompilerSymbolsView"
-          icon="icons/outline-label-definition-16x16.gif"
+          icon="icons/outline-label-definition-16x16.png"
           id="com.wudsn.ide.lng.symbol.CompilerSymbolsView"
           name="%com.wudsn.ide.lng.symbol.CompilerSymbolsView.name"
           restorable="true">
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParserTreeObjectLabelProvider.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParserTreeObjectLabelProvider.java
index ba9b37b1..d63f5e3e 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParserTreeObjectLabelProvider.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParserTreeObjectLabelProvider.java
@@ -111,24 +111,24 @@ public final class CompilerSourceParserTreeObjectLabelProvider extends Delegatin
 		super(new StyledLabelProvider());
 		LanguagePlugin plugin;
 		plugin = LanguagePlugin.getInstance();
-		defaultImage = plugin.getImage("outline-default-16x16.gif");
-		definitionSectionImage = plugin.getImage("outline-definition-section-16x16.gif");
-		implementationSectionImage = plugin.getImage("outline-implementation-section-16x16.gif");
+		defaultImage = plugin.getImage("outline-default-16x16.png");
+		definitionSectionImage = plugin.getImage("outline-definition-section-16x16.png");
+		implementationSectionImage = plugin.getImage("outline-implementation-section-16x16.png");
 
-		equateDefintionImage = plugin.getImage("outline-equate-definition-16x16.gif");
-		labelDefinitionImage = plugin.getImage("outline-label-definition-16x16.gif");
+		equateDefintionImage = plugin.getImage("outline-equate-definition-16x16.png");
+		labelDefinitionImage = plugin.getImage("outline-label-definition-16x16.png");
 
-		enumDefinitionSectionImage = plugin.getImage("outline-enum-definition-section-16x16.gif");
-		structureDefinitionSectionImage = plugin.getImage("outline-structure-definition-section-16x16.gif");
-		localSectionImage = plugin.getImage("outline-local-section-16x16.gif");
-		macroDefinitionSectionImage = plugin.getImage("outline-macro-definition-section-16x16.gif");
-		pagesSectionImage = plugin.getImage("outline-pages-section-16x16.gif");
-		procedureDefinitionSectionImage = plugin.getImage("outline-procedure-definition-section-16x16.gif");
-		repeatSectionImage = plugin.getImage("outline-repeat-section-16x16.gif");
+		enumDefinitionSectionImage = plugin.getImage("outline-enum-definition-section-16x16.png");
+		structureDefinitionSectionImage = plugin.getImage("outline-structure-definition-section-16x16.png");
+		localSectionImage = plugin.getImage("outline-local-section-16x16.png");
+		macroDefinitionSectionImage = plugin.getImage("outline-macro-definition-section-16x16.png");
+		pagesSectionImage = plugin.getImage("outline-pages-section-16x16.png");
+		procedureDefinitionSectionImage = plugin.getImage("outline-procedure-definition-section-16x16.png");
+		repeatSectionImage = plugin.getImage("outline-repeat-section-16x16.png");
 
-		sourceIncludeImage = plugin.getImage("outline-source-include-16x16.gif");
-		binaryIncludeImage = plugin.getImage("outline-binary-include-16x16.gif");
-		binaryOutputImage = plugin.getImage("outline-binary-output-16x16.gif");
+		sourceIncludeImage = plugin.getImage("outline-source-include-16x16.png");
+		binaryIncludeImage = plugin.getImage("outline-binary-include-16x16.png");
+		binaryOutputImage = plugin.getImage("outline-binary-output-16x16.png");
 	}
 
 	@Override
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntaxUtility.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntaxUtility.java
index caaf565e..fe547892 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntaxUtility.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntaxUtility.java
@@ -50,18 +50,18 @@ public final class CompilerSyntaxUtility {
 		String path;
 
 		if (instruction instanceof Directive) {
-			path = "instruction-type-directive-16x16.gif";
+			path = "instruction-type-directive-16x16.png";
 		} else {
 			Opcode opcode = (Opcode) instruction;
 			switch (opcode.getType()) {
 			case InstructionType.LEGAL_OPCODE:
-				path = "instruction-type-legal-opcode-16x16.gif";
+				path = "instruction-type-legal-opcode-16x16.png";
 				break;
 			case InstructionType.ILLEGAL_OPCODE:
-				path = "instruction-type-illegal-opcode-16x16.gif";
+				path = "instruction-type-illegal-opcode-16x16.png";
 				break;
 			case InstructionType.PSEUDO_OPCODE:
-				path = "instruction-type-pseudo-opcode-16x16.gif";
+				path = "instruction-type-pseudo-opcode-16x16.png";
 				break;
 			default:
 				throw new IllegalStateException("Unknown opcode type " + opcode.getType() + ".");
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/editor/LanguageContentAssistProcessor.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/editor/LanguageContentAssistProcessor.java
index 913a7418..389694a5 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/editor/LanguageContentAssistProcessor.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/editor/LanguageContentAssistProcessor.java
@@ -173,10 +173,10 @@ final class LanguageContentAssistProcessor implements IContentAssistProcessor {
 		this.editor = editor;
 
 		LanguagePlugin plugin = editor.getPlugin();
-		directiveImage = plugin.getImage("instruction-type-directive-16x16.gif");
-		legalOpcodeImage = plugin.getImage("instruction-type-legal-opcode-16x16.gif");
-		illegalOpcodeImage = plugin.getImage("instruction-type-illegal-opcode-16x16.gif");
-		pseudoOpcodeImage = plugin.getImage("instruction-type-pseudo-opcode-16x16.gif");
+		directiveImage = plugin.getImage("instruction-type-directive-16x16.png");
+		legalOpcodeImage = plugin.getImage("instruction-type-legal-opcode-16x16.png");
+		illegalOpcodeImage = plugin.getImage("instruction-type-illegal-opcode-16x16.png");
+		pseudoOpcodeImage = plugin.getImage("instruction-type-pseudo-opcode-16x16.png");
 		instructionStyler = new InstructionStyler();
 		highlightStyler = new HighlightStyler();
 	}
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/outline/LanguageOutlinePage.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/outline/LanguageOutlinePage.java
index 1e6704a8..3e173715 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/outline/LanguageOutlinePage.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/outline/LanguageOutlinePage.java
@@ -96,7 +96,7 @@ public final class LanguageOutlinePage extends ContentOutlinePage {
 			}
 			setToolTipText(Texts.COMPILER_CONTENT_OUTLINE_SORT_BUTTON_TOOL_TIP);
 			ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(LanguagePlugin.ID,
-					"icons/outline-sort.gif");
+					"icons/outline-sort.png");
 			setImageDescriptor(imageDescriptor);
 			this.editor = editor;
 			this.treeViewer = treeViewer;
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/preferences/LanguageHardwarePreferencesPage.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/preferences/LanguageHardwarePreferencesPage.java
index 7c02839a..a440e3bb 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/preferences/LanguageHardwarePreferencesPage.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/preferences/LanguageHardwarePreferencesPage.java
@@ -600,7 +600,7 @@ public abstract class LanguageHardwarePreferencesPage extends FieldEditorPrefere
 		controlDecoration.setShowHover(true);
 		controlDecoration.setDescriptionText(text);
 
-		controlDecoration.setImage(LanguagePlugin.getInstance().getImage("help-16x16.gif"));
+		controlDecoration.setImage(LanguagePlugin.getInstance().getImage("help-16x16.png"));
 
 		return controlDecoration;
 	}
diff --git a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/symbol/CompilerSymbolLabelProvider.java b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/symbol/CompilerSymbolLabelProvider.java
index 1d3ca892..d0066c0f 100644
--- a/com.wudsn.ide.lng/src/com/wudsn/ide/lng/symbol/CompilerSymbolLabelProvider.java
+++ b/com.wudsn.ide.lng/src/com/wudsn/ide/lng/symbol/CompilerSymbolLabelProvider.java
@@ -57,15 +57,15 @@ final class CompilerSymbolLabelProvider {
 	CompilerSymbolLabelProvider() {
 		LanguagePlugin plugin;
 		plugin = LanguagePlugin.getInstance();
-		defaultImage = plugin.getImage("outline-default-16x16.gif");
+		defaultImage = plugin.getImage("outline-default-16x16.png");
 
-		equateDefintionImage = plugin.getImage("outline-equate-definition-16x16.gif");
-		labelDefinitionImage = plugin.getImage("outline-label-definition-16x16.gif");
+		equateDefintionImage = plugin.getImage("outline-equate-definition-16x16.png");
+		labelDefinitionImage = plugin.getImage("outline-label-definition-16x16.png");
 
-		enumDefinitionSectionImage = plugin.getImage("outline-enum-definition-section-16x16.gif");
-		structureDefinitionSectionImage = plugin.getImage("outline-structure-definition-section-16x16.gif");
-		localSectionImage = plugin.getImage("outline-local-section-16x16.gif");
-		procedureDefinitionSectionImage = plugin.getImage("outline-procedure-definition-section-16x16.gif");
+		enumDefinitionSectionImage = plugin.getImage("outline-enum-definition-section-16x16.png");
+		structureDefinitionSectionImage = plugin.getImage("outline-structure-definition-section-16x16.png");
+		localSectionImage = plugin.getImage("outline-local-section-16x16.png");
+		procedureDefinitionSectionImage = plugin.getImage("outline-procedure-definition-section-16x16.png");
 
 	}