diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java
index dec45a031..be31d94ee 100644
--- a/trunk/src/com/jpexs/asdec/Main.java
+++ b/trunk/src/com/jpexs/asdec/Main.java
@@ -247,8 +247,10 @@ public class Main {
     }
 
 
-    public static boolean saveFileDialog(Frame f) {
+    public static boolean saveFileDialog() {
         JFileChooser fc = new JFileChooser();
+        JFrame f=new JFrame();
+        View.setWindowIcon(f);
         int returnVal = fc.showSaveDialog(f);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             File file = fc.getSelectedFile();
@@ -279,7 +281,9 @@ public class Main {
             }
 
         });
-        int returnVal = fc.showOpenDialog(null);
+        JFrame f=new JFrame();
+        View.setWindowIcon(f);
+        int returnVal = fc.showOpenDialog(f);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             File selfile = fc.getSelectedFile();
             Main.openFile(selfile.getAbsolutePath());
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
index b9929cd53..139bc3874 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
@@ -248,19 +248,24 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
 
         JMenu menuFile = new JMenu("File");
         JMenuItem miOpen = new JMenuItem("Open...");
+        miOpen.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/open16.png")));
         miOpen.setActionCommand("OPEN");
         miOpen.addActionListener(this);
         JMenuItem miSave = new JMenuItem("Save");
+        miSave.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/save16.png")));
         miSave.setActionCommand("SAVE");
         miSave.addActionListener(this);
         JMenuItem miSaveAs = new JMenuItem("Save as...");
+        miSaveAs.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/save16.png")));
         miSaveAs.setActionCommand("SAVEAS");
         miSaveAs.addActionListener(this);
         JMenuItem miExport = new JMenuItem("Export as ActionScript...");
+        miExport.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exportas16.png")));
         miExport.setActionCommand("EXPORT");
         miExport.addActionListener(this);
 
         JMenuItem miExportPCode = new JMenuItem("Export as PCode...");
+        miExportPCode.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exportpc16.png")));
         miExportPCode.setActionCommand("EXPORTPCODE");
         miExportPCode.addActionListener(this);
         menuFile.add(miOpen);
@@ -270,6 +275,7 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
         menuFile.add(miExportPCode);
         menuFile.addSeparator();
         JMenuItem miClose = new JMenuItem("Exit");
+        miClose.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exit16.png")));
         miClose.setActionCommand("EXIT");
         miClose.addActionListener(this);
         menuFile.add(miClose);
@@ -351,7 +357,7 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
             }
         }
         if (e.getActionCommand().equals("SAVEAS")) {
-            if (Main.saveFileDialog(this)) {
+            if (Main.saveFileDialog()) {
                 setTitle(Main.applicationName + " - " + Main.getFileTitle());
             }
         }
diff --git a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
index 8e2216b69..e80294117 100644
--- a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java
@@ -147,15 +147,19 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
 
         JMenu menuFile = new JMenu("File");
         JMenuItem miOpen = new JMenuItem("Open...");
+        miOpen.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/open16.png")));
         miOpen.setActionCommand("OPEN");
         miOpen.addActionListener(this);
         JMenuItem miSave = new JMenuItem("Save");
+        miSave.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/save16.png")));
         miSave.setActionCommand("SAVE");
         miSave.addActionListener(this);
         JMenuItem miSaveAs = new JMenuItem("Save as...");
+        miSaveAs.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/save16.png")));
         miSaveAs.setActionCommand("SAVEAS");
         miSaveAs.addActionListener(this);
         JMenuItem miExport = new JMenuItem("Export...");
+        miExport.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exportas16.png")));
         miExport.setActionCommand("EXPORT");
         miExport.addActionListener(this);
         menuFile.add(miOpen);
@@ -164,6 +168,7 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
         //menuFile.add(miExport);
         menuFile.addSeparator();
         JMenuItem miClose = new JMenuItem("Exit");
+        miClose.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exit16.png")));
         miClose.setActionCommand("EXIT");
         miClose.addActionListener(this);
         menuFile.add(miClose);
@@ -289,7 +294,7 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi
             }
         }
         if (e.getActionCommand().equals("SAVEAS")) {
-            if (Main.saveFileDialog(this)) {
+            if (Main.saveFileDialog()) {
                 setTitle(Main.applicationName + " - " + Main.getFileTitle());
             }
         }
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exit16.png b/trunk/src/com/jpexs/asdec/gui/graphics/exit16.png
new file mode 100644
index 000000000..2e430b2c7
Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/exit16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exit24.png b/trunk/src/com/jpexs/asdec/gui/graphics/exit24.png
index 386a9e241..1cb6c08f2 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/exit24.png and b/trunk/src/com/jpexs/asdec/gui/graphics/exit24.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exportas16.png b/trunk/src/com/jpexs/asdec/gui/graphics/exportas16.png
new file mode 100644
index 000000000..25b2686db
Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/exportas16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exportpc16.png b/trunk/src/com/jpexs/asdec/gui/graphics/exportpc16.png
new file mode 100644
index 000000000..26a5d9d50
Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/exportpc16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/open16.png b/trunk/src/com/jpexs/asdec/gui/graphics/open16.png
new file mode 100644
index 000000000..47d852853
Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/open16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/open24.png b/trunk/src/com/jpexs/asdec/gui/graphics/open24.png
index 1ad9b2387..5e8619939 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/open24.png and b/trunk/src/com/jpexs/asdec/gui/graphics/open24.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png b/trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png
index f30e12adc..cc26966e0 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png and b/trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png b/trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png
index 7f2f94214..00e7d8d5b 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png and b/trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png b/trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png
index 191b2fab9..7ccb71fea 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png and b/trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png b/trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png
index 7acc97131..d78cfe4ee 100644
Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png and b/trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/save16.png b/trunk/src/com/jpexs/asdec/gui/graphics/save16.png
new file mode 100644
index 000000000..febec9129
Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/save16.png differ
diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java
index 0a54dcdfc..5325d6634 100644
--- a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java
+++ b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java
@@ -121,8 +121,8 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene
         buttonsPanel3.setLayout(new FlowLayout());
         buttonsPanel3.add(new JLabel("Sniff:"));
         buttonsPanel3.add(sniffSWFCheckBox);
-        buttonsPanel3.add(sniffJSCheckBox);
-        buttonsPanel3.add(sniffXMLCheckBox);
+        //buttonsPanel3.add(sniffJSCheckBox);
+        //buttonsPanel3.add(sniffXMLCheckBox);
 
         buttonsPanel23.add(buttonsPanel2);
         buttonsPanel23.add(buttonsPanel3);