diff --git a/main/core/pom.xml b/main/core/pom.xml
index a406c3c1d..ba2c5f52e 100644
--- a/main/core/pom.xml
+++ b/main/core/pom.xml
@@ -65,18 +65,16 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml
index 3fe9c62c1..9e9bf7192 100644
--- a/main/crypto-aes/pom.xml
+++ b/main/crypto-aes/pom.xml
@@ -48,20 +48,18 @@
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml
index 78c8c3e7a..5512d2fd5 100644
--- a/main/crypto-api/pom.xml
+++ b/main/crypto-api/pom.xml
@@ -25,18 +25,16 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/main/ui/package/linux/Cryptomator.png b/main/ui/package/linux/Cryptomator.png
new file mode 100644
index 000000000..d1e5c447a
Binary files /dev/null and b/main/ui/package/linux/Cryptomator.png differ
diff --git a/main/ui/package/macosx/Cryptomator-background.png b/main/ui/package/macosx/Cryptomator-background.png
new file mode 100644
index 000000000..e05f1e8cf
Binary files /dev/null and b/main/ui/package/macosx/Cryptomator-background.png differ
diff --git a/main/ui/src/main/resources/logo.icns b/main/ui/package/macosx/Cryptomator-volume.icns
similarity index 100%
rename from main/ui/src/main/resources/logo.icns
rename to main/ui/package/macosx/Cryptomator-volume.icns
diff --git a/main/ui/package/macosx/Cryptomator.icns b/main/ui/package/macosx/Cryptomator.icns
new file mode 100644
index 000000000..f2eb85138
Binary files /dev/null and b/main/ui/package/macosx/Cryptomator.icns differ
diff --git a/main/ui/package/windows/Cryptomator.ico b/main/ui/package/windows/Cryptomator.ico
new file mode 100644
index 000000000..8a62b707c
Binary files /dev/null and b/main/ui/package/windows/Cryptomator.ico differ
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 0b1c57673..6c1491b99 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -50,82 +50,73 @@
 		</dependency>
 	</dependencies>
 
-
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>copy</id>
-						<phase>prepare-package</phase>
+						<id>make-assembly</id>
+						<phase>package</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>single</goal>
 						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/libs</outputDirectory>
-							<includeScope>compile</includeScope>
-							<includeScope>runtime</includeScope>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<finalName>${javafx.application.name}</finalName>
+					<appendAssemblyId>false</appendAssemblyId>
+					<archive>
+						<manifestEntries>
+							<Main-Class>${exec.mainClass}</Main-Class>
+						</manifestEntries>
+					</archive>
+				</configuration>
 			</plugin>
+
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<version>1.7</version>
 				<executions>
 					<execution>
-						<id>native-launcher</id>
-						<phase>package</phase>
+						<id>create-deployment-bundle</id>
+						<phase>install</phase>
 						<goals>
 							<goal>run</goal>
 						</goals>
 						<configuration>
 							<target xmlns:fx="javafx:com.sun.javafx.tools.ant">
-								<taskdef uri="javafx:com.sun.javafx.tools.ant" resource="com/sun/javafx/tools/ant/antlib.xml" classpath="${javafx.tools.ant.jar}" />
-								<fx:application id="fxApp" version="${project.version}" name="${javafx.application.name}" mainClass="${exec.mainClass}" />
+								<taskdef uri="javafx:com.sun.javafx.tools.ant" resource="com/sun/javafx/tools/ant/antlib.xml" classpath="${project.basedir}:${javafx.tools.ant.jar}" />
 
-								<fx:jar destfile="${project.build.directory}/${project.build.finalName}">
-									<fx:application refid="fxApp" />
-									<fx:fileset dir="${project.build.directory}/classes" />
-									<fx:resources>
-										<fx:fileset dir="${project.build.directory}" includes="libs/*.jar" />
-									</fx:resources>
-								</fx:jar>
-
-								<fx:deploy outdir="${project.build.directory}/dist" outfile="${project.build.finalName}" nativeBundles="all">
-									<fx:info title="Cryptomator" vendor="cryptomator.org" copyright="cryptomator.org" license="MIT">
-										<!-- todo provide .ico files for win -->
-										<fx:icon href="${project.build.outputDirectory}/logo.icns" width="512" height="512" />
-									</fx:info>
+								<fx:deploy nativeBundles="all" outdir="${project.build.directory}/dist" outfile="${project.build.finalName}" verbose="false">
+									<fx:application name="${javafx.application.name}" version="${project.version}" mainClass="${exec.mainClass}" />
+									<fx:info title="${javafx.application.name}" vendor="cryptomator.org" copyright="cryptomator.org" license="MIT" category="Utility" />
 									<fx:platform basedir="" javafx="2.2+" j2se="8.0" />
-									<fx:application refid="fxApp" />
 									<fx:resources>
-										<!-- If you changed <fx:jar> above, don't forget to modify the line below -->
-										<fx:fileset dir="${project.build.directory}" includes="${project.build.finalName}.jar" />
-										<fx:fileset dir="${project.build.directory}" includes="libs/*.jar" />
+										<fx:fileset dir="${project.build.directory}" includes="${javafx.application.name}.jar" />
 									</fx:resources>
-									<fx:preferences install="false" />
+									<fx:permissions elevated="true" />
+									<fx:preferences install="true" />
 								</fx:deploy>
 							</target>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 </project>