diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index bf7bea98f..e04683532 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -549,10 +549,12 @@ public class Main {
                 return AppStrings.translate("filter.gfx");
             }
         };
-        if (swf.gfx) {
-            fc.setFileFilter(gfxFilter);
-        } else {
-            fc.addChoosableFileFilter(gfxFilter);
+        if (mode == SaveFileMode.SAVE || mode == SaveFileMode.SAVEAS) {
+            if (swf.gfx) {
+                fc.setFileFilter(gfxFilter);
+            } else {
+                fc.addChoosableFileFilter(gfxFilter);
+            }
         }
         fc.setAcceptAllFileFilterUsed(false);
         JFrame f = new JFrame();
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
index b7d80c6d6..ff1e6f23c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java
@@ -284,8 +284,6 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener {
         assignListener(saveCommandButton, ACTION_SAVE);
         saveasCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveas")), View.getResizableIcon("saveas16"));
         assignListener(saveasCommandButton, ACTION_SAVE_AS);
-        saveasexeCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveasexe")), View.getResizableIcon("saveas16"));
-        assignListener(saveasexeCommandButton, ACTION_SAVE_AS_EXE);
 
         reloadCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.reload")), View.getResizableIcon("reload16"));
         assignListener(reloadCommandButton, ACTION_RELOAD);
@@ -293,7 +291,6 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener {
         editBand.addCommandButton(openCommandButton, RibbonElementPriority.TOP);
         editBand.addCommandButton(saveCommandButton, RibbonElementPriority.TOP);
         editBand.addCommandButton(saveasCommandButton, RibbonElementPriority.MEDIUM);
-        editBand.addCommandButton(saveasexeCommandButton, RibbonElementPriority.MEDIUM);
         editBand.addCommandButton(reloadCommandButton, RibbonElementPriority.MEDIUM);
 
         JRibbonBand exportBand = new JRibbonBand(translate("menu.export"), null);
@@ -304,10 +301,13 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener {
         assignListener(exportAllCommandButton, ACTION_EXPORT);
         exportSelectionCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.export.selection")), View.getResizableIcon("exportsel16"));
         assignListener(exportSelectionCommandButton, ACTION_EXPORT_SEL);
+        saveasexeCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveasexe")), View.getResizableIcon("saveasexe16"));
+        assignListener(saveasexeCommandButton, ACTION_SAVE_AS_EXE);
 
         exportBand.addCommandButton(exportFlaCommandButton, RibbonElementPriority.TOP);
         exportBand.addCommandButton(exportAllCommandButton, RibbonElementPriority.MEDIUM);
         exportBand.addCommandButton(exportSelectionCommandButton, RibbonElementPriority.MEDIUM);
+        exportBand.addCommandButton(saveasexeCommandButton, RibbonElementPriority.MEDIUM);
 
         return new RibbonTask(translate("menu.file"), editBand, exportBand);
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
index 5d73f59ef..0e09f97ae 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java
@@ -227,6 +227,10 @@ public class TagTree extends JTree {
                 }
             }
         }
+        
+        if (t instanceof Tag) {
+            return TreeNodeType.OTHER_TAG;
+        }
 
         return TreeNodeType.FOLDER;
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
index f0905776c..280401793 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
@@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.gui.treenodes.SWFNode;
 import com.jpexs.decompiler.flash.gui.treenodes.StringNode;
 import com.jpexs.decompiler.flash.gui.treenodes.TagTreeRoot;
 import com.jpexs.decompiler.flash.tags.DefineSpriteTag;
+import com.jpexs.decompiler.flash.tags.FrameLabelTag;
 import com.jpexs.decompiler.flash.tags.PlaceObject2Tag;
 import com.jpexs.decompiler.flash.tags.PlaceObject3Tag;
 import com.jpexs.decompiler.flash.tags.PlaceObject4Tag;
@@ -130,7 +131,8 @@ public class TagTreeModel implements TreeModel {
                                 || t instanceof PlaceObject3Tag 
                                 || t instanceof PlaceObject4Tag
                                 || t instanceof RemoveObjectTag
-                                || t instanceof RemoveObject2Tag)) {
+                                || t instanceof RemoveObject2Tag
+                                || t instanceof FrameLabelTag)) {
                             others.add(new TagNode(t)); 
                         }
                     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java b/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
index 35d71ff4a..bcb96f567 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java
@@ -37,6 +37,7 @@ public enum TreeNodeType {
     MOVIE,
     SOUND,
     BINARY_DATA,
+    OTHER_TAG,
     FOLDER,
     FOLDER_OPEN,
     BUNDLE_ZIP,
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png
new file mode 100644
index 000000000..6fb1ca40c
Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png differ
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png
new file mode 100644
index 000000000..dd0147859
Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png differ