diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml
index ab065531..f287b558 100644
--- a/ManifestResourceTransformer/pom.xml
+++ b/ManifestResourceTransformer/pom.xml
@@ -7,8 +7,8 @@
     <parent>
         <groupId>com.openwebstart</groupId>
         <artifactId>openwebstart-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ManifestResourceTransformer</artifactId>
diff --git a/documentation/pom.xml b/documentation/pom.xml
index f1e39952..6dbc0a9c 100755
--- a/documentation/pom.xml
+++ b/documentation/pom.xml
@@ -7,7 +7,8 @@
     <parent>
         <groupId>com.openwebstart</groupId>
         <artifactId>openwebstart-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>openwebstart-documentation</artifactId>
diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml
index cebbccbf..fdad4cbe 100755
--- a/openwebstart/pom.xml
+++ b/openwebstart/pom.xml
@@ -7,7 +7,8 @@
     <parent>
         <groupId>com.openwebstart</groupId>
         <artifactId>openwebstart-parent</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>openwebstart</artifactId>
@@ -16,7 +17,7 @@
     <description>Additional Java Code which is only available in OWS and not in ITW</description>
 
     <properties>
-        <icedtea-web.version>2.0.0-SNAPSHOT</icedtea-web.version>
+        <icedtea-web.version>3.0.0-SNAPSHOT</icedtea-web.version>
     </properties>
 
     <dependencies>
diff --git a/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java b/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java
index 4a1e2352..4273ad92 100644
--- a/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java
+++ b/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java
@@ -12,10 +12,6 @@ public interface Images {
 
     URL JVM_64_URL = Images.class.getResource("jvm-64.png");
 
-    URL QUESTION_64_URL = Images.class.getResource("question-64.png");
-
-    URL ERROR_64_URL = Images.class.getResource("error-64.png");
-
     URL NETWORK_64_URL = Images.class.getResource("network-64.png");
 
 }
diff --git a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java
index 4c01e057..5d029a6c 100644
--- a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java
+++ b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java
@@ -12,7 +12,7 @@
 import net.adoptopenjdk.icedteaweb.ProcessUtils;
 import net.adoptopenjdk.icedteaweb.i18n.Translator;
 import net.adoptopenjdk.icedteaweb.jnlp.element.resource.JREDesc;
-import net.adoptopenjdk.icedteaweb.jnlp.element.security.ApplicationPermissionLevel;
+import net.adoptopenjdk.icedteaweb.jnlp.element.security.ApplicationEnvironment;
 import net.adoptopenjdk.icedteaweb.jnlp.version.VersionId;
 import net.adoptopenjdk.icedteaweb.jnlp.version.VersionString;
 import net.adoptopenjdk.icedteaweb.jvm.JvmUtils;
@@ -143,7 +143,7 @@ private void launchExternal(
     }
 
     private List<String> extractVmArgs(final JNLPFile jnlpFile) {
-        if (jnlpFile.getSecurity().getApplicationPermissionLevel() == ApplicationPermissionLevel.ALL) {
+        if (jnlpFile.getSecurity().getApplicationEnvironment() == ApplicationEnvironment.ALL) {
             final List<String> result = new ArrayList<>();
             final Map<String, String> properties = jnlpFile.getResources().getPropertiesMap();
             properties.keySet().forEach(property -> {
diff --git a/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java b/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java
index c6b6bb76..de2e8e34 100644
--- a/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java
+++ b/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java
@@ -1,13 +1,12 @@
 package com.openwebstart.ui;
 
-import com.openwebstart.jvm.ui.Images;
 import net.adoptopenjdk.icedteaweb.Assert;
 import net.adoptopenjdk.icedteaweb.i18n.Translator;
+import net.adoptopenjdk.icedteaweb.image.ImageGallery;
 import net.adoptopenjdk.icedteaweb.logging.Logger;
 import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;
 import net.adoptopenjdk.icedteaweb.ui.swing.SwingUtils;
 
-import javax.swing.ImageIcon;
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import java.io.PrintWriter;
@@ -30,7 +29,7 @@ private static JTextArea createStackTraceDetailsComponent(final Exception error)
     }
 
     public ErrorDialog(final String message, final Exception error) {
-        super(Translator.getInstance().translate("dialog.error.title"), new ImageIcon(Images.ERROR_64_URL), message, createStackTraceDetailsComponent(error));
+        super(Translator.getInstance().translate("dialog.error.title"), ImageGallery.ERROR.asImageIcon(), message, createStackTraceDetailsComponent(error));
     }
 
     private static String getStackTrace(final Exception exception) {
diff --git a/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java b/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java
index 7cbe7cfa..db2c7512 100644
--- a/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java
+++ b/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java
@@ -39,6 +39,7 @@ public void setContentPane(final Container contentPane) {
     public void showAndWait() {
         pack();
         setLocationRelativeTo(null);
+        setAlwaysOnTop(true);
         setVisible(true);
     }
 
diff --git a/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java b/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java
index dc540179..91f4e4b9 100644
--- a/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java
+++ b/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java
@@ -3,6 +3,7 @@
 import com.openwebstart.jvm.ui.Images;
 import com.openwebstart.ui.IconComponent;
 import com.openwebstart.util.LayoutFactory;
+import net.adoptopenjdk.icedteaweb.image.ImageGallery;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -22,7 +23,7 @@ public class SimpleDialogWithResult<R> extends ButtonBasedDialogWithResult<R> {
     private final ImageIcon imageIcon;
 
     public SimpleDialogWithResult(final String title, final String message, final DialogButton<R>... buttons) {
-        this(title, message, new ImageIcon(Images.QUESTION_64_URL), buttons);
+        this(title, message, ImageGallery.QUESTION.asImageIcon(), buttons);
 
     }
 
diff --git a/openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png b/openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png
deleted file mode 100644
index 0425fcc7..00000000
Binary files a/openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png and /dev/null differ
diff --git a/openwebstart/src/main/resources/com/openwebstart/jvm/ui/question-64.png b/openwebstart/src/main/resources/com/openwebstart/jvm/ui/question-64.png
deleted file mode 100644
index 822b12dd..00000000
Binary files a/openwebstart/src/main/resources/com/openwebstart/jvm/ui/question-64.png and /dev/null differ
diff --git a/pom.xml b/pom.xml
index bfd35272..a69f7a88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.openwebstart</groupId>
     <artifactId>openwebstart-parent</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>OpenWebStart Parent</name>