diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
index 7d724e121..37309c249 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
@@ -775,18 +775,25 @@ public class Helper {
                 sb.append((char) ch);
             }
         }
+
+        char lastChar = sb.charAt(sb.length() - 1);
+        if (lastChar == ' ') {
+            sb.setLength(sb.length() - 1);
+            sb.append("%20");
+        } else if (lastChar == ' ') {
+            sb.setLength(sb.length() - 1);
+            sb.append("%2E");
+        }
+
         str = sb.toString();
-        if (str.endsWith(" ")) {
-            str = str.substring(0, str.length() - 1) + "%20";
-        }
-        if (str.endsWith(".")) {
-            str = str.substring(0, str.length() - 1) + "%2E";
-        }
-        str = "." + str + ".";
         for (String inv : invalidFilenamesParts) {
-            str = Pattern.compile("\\." + Pattern.quote(inv) + "\\.", Pattern.CASE_INSENSITIVE).matcher(str).replaceAll("._" + inv + ".");
+            if (str.startsWith(inv)) {
+                if (str.equals(inv) || str.startsWith(".")) {
+                    str = "_" + str;
+                }
+            }
         }
-        str = str.substring(1, str.length() - 1); //remove dots
+
         if (str.isEmpty()) {
             str = "unnamed";
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index f7b42fcfb..84be2998b 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -318,8 +318,6 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
     private static final Logger logger = Logger.getLogger(MainPanel.class.getName());
 
-    private Map<String, ASMSource> asms = new HashMap<>();
-
     public void setPercent(int percent) {
         progressBar.setValue(percent);
         progressBar.setVisible(true);
@@ -816,7 +814,6 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
         mainFrame.setTitle(ApplicationInfo.applicationVerName + (Configuration.displayFileName.get() ? " - " + swf.getFileTitle() : ""));
 
         List<ABCContainerTag> abcList = swf.getAbcList();
-        asms = swf.getASMs(true);
 
         boolean hasAbc = !abcList.isEmpty();
 
@@ -1608,6 +1605,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
             if (rawScriptName.startsWith("#PCODE ")) {
                 rawScriptName = rawScriptName.substring("#PCODE ".length());
             }
+            Map<String, ASMSource> asms = swf.getASMs(true);
             if (actionPanel != null && asms.containsKey(rawScriptName)) {
                 actionPanel.setSource(asms.get(rawScriptName), true);
             }
@@ -2670,12 +2668,24 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
         if (item instanceof ShapeTag) {
             ShapeTag st = (ShapeTag) item;
-            File selectedFile = showImportFileChooser("filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp");
+            String filter = "filter.images|*.jpg;*.jpeg;*.gif;*.png;*.bmp";
+            if (Configuration.experimentalSvgImportEnabled.get()) {
+                filter += ";*.svg";
+            }
+
+            File selectedFile = showImportFileChooser(filter);
             if (selectedFile != null) {
                 File selfile = Helper.fixDialogFile(selectedFile);
-                byte[] data = Helper.readFile(selfile.getAbsolutePath());
+                byte[] data = null;
+                String svgText = null;
+                if (".svg".equals(Path.getExtension(selfile))) {
+                    svgText = Helper.readTextFile(selfile.getAbsolutePath());
+                } else {
+                    data = Helper.readFile(selfile.getAbsolutePath());
+                }
                 try {
-                    Tag newTag = new ShapeImporter().importImage(st, data, 0, false);
+                    ShapeImporter shapeImporter = new ShapeImporter();
+                    Tag newTag = svgText != null ? shapeImporter.importSvg(st, svgText, false) : shapeImporter.importImage(st, data, 0, false);
                     SWF swf = st.getSwf();
                     if (newTag != null) {
                         refreshTree(swf);
diff --git a/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java b/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
index 630bc5a20..633af979b 100644
--- a/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/player/FlashPlayerPanel.java
@@ -250,7 +250,7 @@ public final class FlashPlayerPanel extends Panel implements Closeable, MediaDis
 
     private Thread playQueue;
 
-    private Object queueLock = new Object();
+    private final Object queueLock = new Object();
 
     public synchronized void displaySWF(final String flashName, final Color bgColor, final float frameRate) {