diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
index acd5d7006..6081f4e08 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import java.util.ResourceBundle;
 import javax.swing.JDialog;
 import javax.swing.JRootPane;
@@ -30,7 +31,9 @@ public abstract class AppDialog extends JDialog {
 
     public AppDialog() {
         View.installEscapeCloseOperation(this);
-        getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
+        if (Configuration.useRibbonInterface.get()) {
+            getRootPane().setWindowDecorationStyle(JRootPane.FRAME);
+        }
     }
 
     public String translate(String key) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index c8cf9a381..9fbc69f36 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -59,6 +59,7 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.filechooser.FileFilter;
 
 /**
@@ -397,6 +398,7 @@ public class Main {
             mainFrame.setVisible(false);
             mainFrame = null;
         }
+        initGui();
         reloadSWFs();
     }
 
@@ -592,6 +594,12 @@ public class Main {
     private static void initGui() {
         if (Configuration.useRibbonInterface.get()) {
             View.setLookAndFeel();
+        } else {
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException ex) {
+                Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
         View.execInEventDispatch(new Runnable() {
             @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java
index d3d2e67a0..05b95aefa 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java
@@ -296,6 +296,12 @@ public class MainFrameClassicMenu implements MainFrameMenu, ActionListener {
         }
         menuSettings.add(miLanguage);
 
+        JMenuItem advancedSettingsCommandButton = new JMenuItem(translate("menu.advancedsettings.advancedsettings"));
+        advancedSettingsCommandButton.setActionCommand(ACTION_ADVANCED_SETTINGS);
+        advancedSettingsCommandButton.setIcon(View.getIcon("settings16"));
+        advancedSettingsCommandButton.addActionListener(this);
+        menuSettings.add(advancedSettingsCommandButton);
+
         menuBar.add(menuSettings);
         JMenu menuHelp = new JMenu(translate("menu.help"));
         JMenuItem miAbout = new JMenuItem(translate("menu.help.about"));