diff --git a/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.gif
deleted file mode 100644
index d6d12fd1..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.png
new file mode 100644
index 00000000..abb192cf
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-acme-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.gif
deleted file mode 100644
index 3269e0a1..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.png
new file mode 100644
index 00000000..97f3c35e
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-asm6-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.gif
deleted file mode 100644
index e4633f21..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.png
new file mode 100644
index 00000000..027c94db
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-atasm-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.gif
deleted file mode 100644
index 933dc281..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.png
new file mode 100644
index 00000000..6b0357a4
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-dasm-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.gif
deleted file mode 100644
index 21a1fbd3..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.png
new file mode 100644
index 00000000..9740a6d1
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-kickass-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.gif
deleted file mode 100644
index 23b9db7c..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.png
new file mode 100644
index 00000000..e0cf1e9b
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-mads-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.gif
deleted file mode 100644
index 9755078c..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.png
new file mode 100644
index 00000000..643586d7
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-merlin32-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.gif
deleted file mode 100644
index 21a1fbd3..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.png
new file mode 100644
index 00000000..9740a6d1
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-tass-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.gif b/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.gif
deleted file mode 100644
index 86b761f4..00000000
Binary files a/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.gif and /dev/null differ
diff --git a/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.png b/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.png
new file mode 100644
index 00000000..1eb94aba
Binary files /dev/null and b/com.wudsn.ide.lng.asm/icons/editor-xasm-16x16.png differ
diff --git a/com.wudsn.ide.lng.asm/plugin.xml b/com.wudsn.ide.lng.asm/plugin.xml
index 606358c9..c45cda03 100644
--- a/com.wudsn.ide.lng.asm/plugin.xml
+++ b/com.wudsn.ide.lng.asm/plugin.xml
@@ -335,7 +335,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="true"
           extensions="a"
-          icon="icons/editor-acme-16x16.gif"
+          icon="icons/editor-acme-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.acme.AcmeEditor"
           name="%com.wudsn.ide.lng.asm.compiler.acme.AcmeEditor.name">
        <contentTypeBinding
@@ -347,7 +347,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="false"
           extensions="asm"
-          icon="icons/editor-asm6-16x16.gif"
+          icon="icons/editor-asm6-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.asm6.Asm6Editor"
           name="%com.wudsn.ide.lng.asm.compiler.asm6.Asm6Editor.name">
        <contentTypeBinding
@@ -359,7 +359,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="false"
           extensions="asm"
-          icon="icons/editor-atasm-16x16.gif"
+          icon="icons/editor-atasm-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.atasm.AtasmEditor"
           name="%com.wudsn.ide.lng.asm.compiler.atasm.AtasmEditor.name">
        <contentTypeBinding
@@ -371,7 +371,7 @@
         contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
         default="false"
         extensions="asm"
-        icon="icons/editor-dasm-16x16.gif"
+        icon="icons/editor-dasm-16x16.png"
         id="com.wudsn.ide.lng.asm.compiler.dasm.DasmEditor"
         name="%com.wudsn.ide.lng.asm.compiler.dasm.DasmEditor.name">
      <contentTypeBinding
@@ -383,7 +383,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="true"
           extensions="asm"
-          icon="icons/editor-kickass-16x16.gif"
+          icon="icons/editor-kickass-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.kickass.KickAssEditor"
           name="%com.wudsn.ide.lng.asm.compiler.kickass.KickAssEditor.name">
        <contentTypeBinding
@@ -395,7 +395,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="true"
           extensions="asm"
-          icon="icons/editor-mads-16x16.gif"
+          icon="icons/editor-mads-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.mads.MadsEditor"
           name="%com.wudsn.ide.lng.asm.compiler.mads.MadsEditor.name">
        <contentTypeBinding
@@ -407,7 +407,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="false"
           extensions="s"
-          icon="icons/editor-merlin32-16x16.gif"
+          icon="icons/editor-merlin32-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.merlin32.Merlin32Editor"
           name="%com.wudsn.ide.lng.asm.compiler.merlin32.Merlin32Editor.name">
        <contentTypeBinding
@@ -419,7 +419,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="false"
           extensions="asm"
-          icon="icons/editor-tass-16x16.gif"
+          icon="icons/editor-tass-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.tass.TassEditor"
           name="%com.wudsn.ide.lng.asm.compiler.tass.TassEditor.name">
        <contentTypeBinding
@@ -431,7 +431,7 @@
           contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
           default="true"
           extensions="asx"
-          icon="icons/editor-xasm-16x16.gif"
+          icon="icons/editor-xasm-16x16.png"
           id="com.wudsn.ide.lng.asm.compiler.xasm.XasmEditor"
           name="%com.wudsn.ide.lng.asm.compiler.xasm.XasmEditor.name">
        <contentTypeBinding