diff --git a/org.adempiere.base/src/org/compiere/model/MTreeNode.java b/org.adempiere.base/src/org/compiere/model/MTreeNode.java
index c9e4e6d987..59163451a3 100644
--- a/org.adempiere.base/src/org/compiere/model/MTreeNode.java
+++ b/org.adempiere.base/src/org/compiere/model/MTreeNode.java
@@ -118,14 +118,14 @@ public final class MTreeNode extends DefaultMutableTreeNode
 	public static Icon[] 	IMAGES = new Icon[]
 	{
 		null,
-		Env.getImageIcon("mWindow.gif"),
-		Env.getImageIcon("mReport.gif"),
-		Env.getImageIcon("mProcess.gif"),
-		Env.getImageIcon("mWorkFlow.gif"),
-		Env.getImageIcon("mWorkbench.gif"),
-		Env.getImageIcon("mSetVariable.gif"),
-		Env.getImageIcon("mUserChoice.gif"),
-		Env.getImageIcon("mDocAction.gif")
+		Env.getImageIcon("mWindow.png"),
+		Env.getImageIcon("mReport.png"),
+		Env.getImageIcon("mProcess.png"),
+		Env.getImageIcon("mWorkFlow.png"),
+		Env.getImageIcon("mWorkbench.png"),
+		Env.getImageIcon("mSetVariable.png"),
+		Env.getImageIcon("mUserChoice.png"),
+		Env.getImageIcon("mDocAction.png")
 	};
 
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java b/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
index 416253ad0b..a013e8856b 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
@@ -61,7 +61,7 @@ public class AWindow extends CFrame
 	{
 		super(gc);
 		//	Set UI Components
-		this.setIconImage(Env.getImage("mWindow.gif"));
+		this.setIconImage(Env.getImage("mWindow.png"));
 		this.getContentPane().add(m_APanel, BorderLayout.CENTER);
 		this.setGlassPane(m_glassPane);
 	}	//	AWindow
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
index 284db3eeba..ecf1c011f3 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
@@ -201,7 +201,7 @@ public class ProcessDialog extends CFrame
 	 */
 	private void jbInit() throws Exception
 	{
-		setIconImage(Env.getImage("mProcess.gif"));
+		setIconImage(Env.getImage("mProcess.png"));
 		//
 		dialog.setLayout(mainLayout);
 		dialog.setMinimumSize(new Dimension(500, 200));
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif b/org.adempiere.ui.swing/src/org/compiere/images/mDocAction.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mDocAction.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif b/org.adempiere.ui.swing/src/org/compiere/images/mProcess.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mProcess.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mReport.gif b/org.adempiere.ui.swing/src/org/compiere/images/mReport.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mReport.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mReport.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif b/org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif b/org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWindow.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWindow.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
index e4d0bb50fb..6f2aeac6bd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
+++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
@@ -241,7 +241,7 @@ public class Viewer extends CFrame
 	 */
 	private void jbInit() throws Exception
 	{
-		this.setIconImage(Env.getImage("mReport.gif"));
+		this.setIconImage(Env.getImage("mReport.png"));
 		this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		//
 		northPanel.setLayout(northLayout);
@@ -814,7 +814,7 @@ public class Viewer extends CFrame
 				return;
 			//	Create Menu
 			JPopupMenu pop = new JPopupMenu();
-			Icon wi = Env.getImageIcon("mWindow.gif");
+			Icon wi = Env.getImageIcon("mWindow.png");
 			if (m_ddQ != null)
 			{
 				m_ddM = new CMenuItem(m_ddQ.getDisplayName(Env.getCtx()), wi);