diff --git a/src/main/java/eva2/gui/MainFrame.java b/src/main/java/eva2/gui/MainFrame.java
index deb9d71e..d19ebc6d 100644
--- a/src/main/java/eva2/gui/MainFrame.java
+++ b/src/main/java/eva2/gui/MainFrame.java
@@ -482,11 +482,16 @@ public class MainFrame extends JFrame implements OptimizationStateListener {
 
                 @Override
                 public void windowClosing(final WindowEvent event) {
+                    BasicResourceLoader loader = BasicResourceLoader.getInstance();
+                    byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
+                    ImageIcon icon = new ImageIcon(bytes);
                     int result = JOptionPane.showConfirmDialog(
                             MainFrame.this,
                             "Do you really want to exit EvA2?",
                             "Exit Application",
-                            JOptionPane.YES_NO_OPTION);
+                            JOptionPane.YES_NO_OPTION,
+                            JOptionPane.QUESTION_MESSAGE,
+                            icon);
                     if (result == JOptionPane.YES_OPTION) {
                         MainFrame.this.close();
                     }
diff --git a/src/main/java/eva2/gui/PropertyDialog.java b/src/main/java/eva2/gui/PropertyDialog.java
index 297bad72..773e9d00 100644
--- a/src/main/java/eva2/gui/PropertyDialog.java
+++ b/src/main/java/eva2/gui/PropertyDialog.java
@@ -1,7 +1,5 @@
 package eva2.gui;
 
-import eva2.EvAInfo;
-import eva2.tools.BasicResourceLoader;
 import eva2.tools.StringTools;
 
 import javax.swing.*;
@@ -23,8 +21,7 @@ public class PropertyDialog extends JDialog {
     public PropertyDialog(Window parent, PropertyEditor editor, String title) {
         super(parent, title, ModalityType.APPLICATION_MODAL);
         setTitle(getFrameNameFromEditor(editor));
-        BasicResourceLoader loader = BasicResourceLoader.getInstance();
-        byte[] bytes = loader.getBytesFromResourceLocation(EvAInfo.iconLocation, true);
+
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
         setLayout(new BorderLayout());
         propertyEditor = editor;
diff --git a/src/main/java/eva2/problems/ERPStarter.java b/src/main/java/eva2/problems/ERPStarter.java
index d73dacaa..a93a3d7a 100644
--- a/src/main/java/eva2/problems/ERPStarter.java
+++ b/src/main/java/eva2/problems/ERPStarter.java
@@ -139,9 +139,7 @@ public class ERPStarter {
         filterCols[4] = initialPosBoxLenColIndex;
         filterCols[5] = isObjectiveColIndex;
         filterCols[6] = fitWeightsColIndex;
-//		double[][] dat = BasicResourceLoader.loadDoubleData(fname, null, ";", 1, -1, new int[]{2,3,4,5,6,7,8,9});
         double[][] dat = BasicResourceLoader.loadDoubleData(fname, null, ";", 1, -1, filterCols);
-//		System.out.println(BeanInspector.toString(dat));
         double[][] filteredVars = ToolBox.filterBy(dat, 0, 1., 1.); // filter only those with a value of one in column isVariable
         double[][] range = ToolBox.getCols(filteredVars, 1, 2); // get columns with lower and upper bound
         double[][] initPos = ToolBox.getCols(filteredVars, 3); // get column with initial position center