diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
index 9b61b5374..8ad1adbe2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java
@@ -46,8 +46,6 @@ import javafx.scene.Node;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 
 @Singleton
 public class WelcomeController extends AbstractFXMLViewController {
@@ -69,9 +67,6 @@ public class WelcomeController extends AbstractFXMLViewController {
 		this.executor = executor;
 	}
 
-	@FXML
-	private ImageView botImageView;
-
 	@FXML
 	private Node checkForUpdatesContainer;
 
@@ -86,10 +81,8 @@ public class WelcomeController extends AbstractFXMLViewController {
 
 	@Override
 	public void initialize() {
-		botImageView.setImage(new Image(getClass().getResource("/bot_welcome.png").toString()));
 		if (areUpdatesManagedExternally()) {
 			checkForUpdatesContainer.setVisible(false);
-			checkForUpdatesContainer.setManaged(false);
 		} else if (settings.isCheckForUpdatesEnabled()) {
 			executor.execute(this::checkForUpdates);
 		}
@@ -114,9 +107,6 @@ public class WelcomeController extends AbstractFXMLViewController {
 	}
 
 	private void checkForUpdates() {
-		if (areUpdatesManagedExternally()) {
-			return;
-		}
 		Platform.runLater(() -> {
 			checkForUpdatesStatus.setText(localization.getString("welcome.checkForUpdates.label.currentlyChecking"));
 			checkForUpdatesIndicator.setVisible(true);
diff --git a/main/ui/src/main/resources/bot_welcome.png b/main/ui/src/main/resources/bot_welcome.png
index 3906db706..5daf92fd6 100644
Binary files a/main/ui/src/main/resources/bot_welcome.png and b/main/ui/src/main/resources/bot_welcome.png differ
diff --git a/main/ui/src/main/resources/bot_welcome@2x.png b/main/ui/src/main/resources/bot_welcome@2x.png
new file mode 100644
index 000000000..8c25a5e21
Binary files /dev/null and b/main/ui/src/main/resources/bot_welcome@2x.png differ
diff --git a/main/ui/src/main/resources/css/linux_theme.css b/main/ui/src/main/resources/css/linux_theme.css
index 767bed353..4beabf9e8 100644
--- a/main/ui/src/main/resources/css/linux_theme.css
+++ b/main/ui/src/main/resources/css/linux_theme.css
@@ -251,12 +251,15 @@
 	-fx-background-color: transparent;
 	-fx-padding: 0.4em;
 }
-.menu-item:focused {
-	-fx-background-color: COLOR_VGRAD_DARK;
+.menu-item > .graphic-container {
+    -fx-padding: 0 6px 0 0;
 }
 .menu-item > .label {
 	-fx-text-fill: COLOR_TEXT;
 }
+.menu-item:focused {
+	-fx-background-color: COLOR_VGRAD_DARK;
+}
 .menu-item:disabled > .label {
 	-fx-text-fill: COLOR_TEXT_DISABLED;
 }
diff --git a/main/ui/src/main/resources/css/mac_theme.css b/main/ui/src/main/resources/css/mac_theme.css
index ecd72ff52..bac4a985d 100644
--- a/main/ui/src/main/resources/css/mac_theme.css
+++ b/main/ui/src/main/resources/css/mac_theme.css
@@ -323,7 +323,10 @@
     -fx-border-width: 0.0 0.0 0.0 0.0;
     -fx-border-color:transparent;
 }
-.menu-item >.label {
+.menu-item > .graphic-container {
+    -fx-padding: 1px 6px 0 0;
+}
+.menu-item > .label {
     -fx-padding: 0em 0.5em 0em 0em;
     -fx-text-fill: COLOR_TEXT;
 }
diff --git a/main/ui/src/main/resources/css/win_theme.css b/main/ui/src/main/resources/css/win_theme.css
index 14c885dda..6456ee414 100644
--- a/main/ui/src/main/resources/css/win_theme.css
+++ b/main/ui/src/main/resources/css/win_theme.css
@@ -291,6 +291,9 @@
     -fx-border-width: 0.0 0.0 0.0 0.0;
     -fx-border-color:transparent;
 }
+.menu-item > .graphic-container {
+    -fx-padding: 0 6px 0 0;
+}
 .menu-item >.label {
     -fx-padding: 0em 0.5em 0em 0em;
     -fx-text-fill: COLOR_TEXT;
diff --git a/main/ui/src/main/resources/fxml/main.fxml b/main/ui/src/main/resources/fxml/main.fxml
index d3b56bd2c..0891651a4 100644
--- a/main/ui/src/main/resources/fxml/main.fxml
+++ b/main/ui/src/main/resources/fxml/main.fxml
@@ -19,6 +19,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.Label?>
 
 <HBox fx:id="rootPane" prefHeight="440.0" prefWidth="652.0" spacing="12.0" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
 
@@ -27,14 +28,22 @@
 	<fx:define>
 		<ContextMenu fx:id="vaultListCellContextMenu">
 			<items>
-				<MenuItem text="%main.directoryList.contextMenu.remove" onAction="#didClickRemoveSelectedEntry" />
-				<MenuItem text="%main.directoryList.contextMenu.changePassword" onAction="#didClickChangePassword" />
+				<MenuItem text="%main.directoryList.contextMenu.remove" onAction="#didClickRemoveSelectedEntry">
+					<graphic><Label text="&#xf12a;" styleClass="ionicons"/></graphic>
+				</MenuItem>
+				<MenuItem text="%main.directoryList.contextMenu.changePassword" onAction="#didClickChangePassword">
+					<graphic><Label text="&#xf2bf;" styleClass="ionicons"/></graphic>
+				</MenuItem>
 			</items>
 		</ContextMenu>
 		<ContextMenu fx:id="addVaultContextMenu">
 			<items>
-				<MenuItem text="%main.addDirectory.contextMenu.new" onAction="#didClickCreateNewVault" />
-				<MenuItem text="%main.addDirectory.contextMenu.open" onAction="#didClickAddExistingVaults" />
+				<MenuItem text="%main.addDirectory.contextMenu.new"  onAction="#didClickCreateNewVault">
+					<graphic><Label text="&#xf2c7;" styleClass="ionicons"/></graphic>
+				</MenuItem>
+				<MenuItem text="%main.addDirectory.contextMenu.open" onAction="#didClickAddExistingVaults">
+					<graphic><Label text="&#xf2f5;" styleClass="ionicons"/></graphic>
+				</MenuItem>
 			</items>
 		</ContextMenu>
 	</fx:define>
@@ -51,6 +60,7 @@
 			</items>
 		</ToolBar>
 	</VBox>
+	
 	<Pane fx:id="contentPane" prefWidth="400.0" cacheShape="true" cache="true"/>
 
 </HBox>
diff --git a/main/ui/src/main/resources/fxml/welcome.fxml b/main/ui/src/main/resources/fxml/welcome.fxml
index 3cd570b9a..5f975cf7c 100644
--- a/main/ui/src/main/resources/fxml/welcome.fxml
+++ b/main/ui/src/main/resources/fxml/welcome.fxml
@@ -8,41 +8,28 @@
       Sebastian Stenzel - initial API and implementation
 -->
 <?import java.net.URL?>
-<?import java.lang.String?>
-<?import javafx.scene.shape.Arc?>
-<?import javafx.scene.shape.QuadCurve?>
-<?import javafx.scene.shape.Path?>
-<?import javafx.scene.shape.Line?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.control.Button?>
 
-<AnchorPane xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
+<VBox prefWidth="400.0" prefHeight="400.0" spacing="24.0" alignment="CENTER" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
 	
-	<children>
-		<VBox AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="20.0" prefWidth="400.0" alignment="CENTER" spacing="10.0" cacheShape="true" cache="true">
-			<Label alignment="CENTER" style="-fx-font-size: 1.5em;" text="%welcome.welcomeLabel" cacheShape="true" cache="true" />
-			<VBox fx:id="checkForUpdatesContainer" prefWidth="400.0" alignment="CENTER" spacing="5.0" cacheShape="true" cache="true">
-				<HBox alignment="CENTER" spacing="5.0" cacheShape="true" cache="true">
-					<Label fx:id="checkForUpdatesStatus" cacheShape="true" cache="true" />
-					<ProgressIndicator fx:id="checkForUpdatesIndicator" progress="-1" prefWidth="15.0" prefHeight="15.0" visible="false" cacheShape="true" cache="true" cacheHint="SPEED" />
-				</HBox>
-				<Hyperlink alignment="CENTER" fx:id="updateLink" onAction="#didClickUpdateLink" visible="false" cacheShape="true" cache="true" />
-			</VBox>
-		</VBox>
-		
-		<ImageView fx:id="botImageView" AnchorPane.leftAnchor="100.0" AnchorPane.topAnchor="200.0" fitHeight="200.0" preserveRatio="true" smooth="false" cache="true"/>
-		
-		<Line AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="380.0" startX="0.0" endX="6.0" startY="5.0" endY="0.0" strokeWidth="1.0" cache="true" />
-		<Line AnchorPane.leftAnchor="6.0" AnchorPane.topAnchor="385.0" startX="0.0" endX="15.0" startY="0.0" endY="0.0" strokeWidth="1.0" cache="true" />
-		<Line AnchorPane.leftAnchor="4.0" AnchorPane.topAnchor="385.0" startX="0.0" endX="6.0" startY="0.0" endY="5.0" strokeWidth="1.0" cache="true" />
-		
-		<Label AnchorPane.leftAnchor="25.0" AnchorPane.topAnchor="377.0" text="%welcome.addButtonInstructionLabel" cacheShape="true" cache="true" />
-	</children>
+	<VBox fx:id="checkForUpdatesContainer" spacing="6.0" alignment="CENTER" cacheShape="true" cache="true">
+		<HBox alignment="CENTER" spacing="5.0" cacheShape="true" cache="true">
+			<Label fx:id="checkForUpdatesStatus" cacheShape="true" cache="true" />
+			<ProgressIndicator fx:id="checkForUpdatesIndicator" progress="-1" prefWidth="15.0" prefHeight="15.0" cacheShape="true" cache="true" cacheHint="SPEED" />
+		</HBox>
+		<Hyperlink alignment="CENTER" fx:id="updateLink" onAction="#didClickUpdateLink" cacheShape="true" cache="true" />
+	</VBox>
 	
-</AnchorPane>
\ No newline at end of file
+	<ImageView fitHeight="200.0" preserveRatio="true" smooth="false" cache="true">
+		<Image url="/bot_welcome.png"/>
+	</ImageView>
+
+</VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization.properties b/main/ui/src/main/resources/localization.properties
index 3b149dcc1..83a189018 100644
--- a/main/ui/src/main/resources/localization.properties
+++ b/main/ui/src/main/resources/localization.properties
@@ -13,11 +13,9 @@ app.name=Cryptomator
 main.directoryList.contextMenu.remove=Remove from list
 main.directoryList.contextMenu.changePassword=Change password
 main.addDirectory.contextMenu.new=Create new vault
-main.addDirectory.contextMenu.open=Add existing vault
+main.addDirectory.contextMenu.open=Open existing vault
 
 # welcome.fxml
-welcome.welcomeLabel=Welcome to Cryptomator
-welcome.addButtonInstructionLabel=Start by adding a new vault
 welcome.checkForUpdates.label.currentlyChecking=Checking for Updates...
 welcome.newVersionMessage=Version %s can be downloaded. This is %s.
 
diff --git a/main/ui/src/main/resources/tray_icon.png b/main/ui/src/main/resources/tray_icon.png
index f7a10f8ed..e033cffa3 100644
Binary files a/main/ui/src/main/resources/tray_icon.png and b/main/ui/src/main/resources/tray_icon.png differ
diff --git a/main/ui/src/main/resources/tray_icon@2x.png b/main/ui/src/main/resources/tray_icon@2x.png
new file mode 100644
index 000000000..2e6f43e8d
Binary files /dev/null and b/main/ui/src/main/resources/tray_icon@2x.png differ
diff --git a/main/ui/src/main/resources/tray_icon_white.png b/main/ui/src/main/resources/tray_icon_white.png
index 434f5e5aa..a3046e6d7 100644
Binary files a/main/ui/src/main/resources/tray_icon_white.png and b/main/ui/src/main/resources/tray_icon_white.png differ
diff --git a/main/ui/src/main/resources/tray_icon_white@2x.png b/main/ui/src/main/resources/tray_icon_white@2x.png
new file mode 100644
index 000000000..b789114bc
Binary files /dev/null and b/main/ui/src/main/resources/tray_icon_white@2x.png differ