diff --git a/main/ui/src/main/resources/bot.png b/main/ui/src/main/resources/bot.png
new file mode 100644
index 000000000..c02c60d7b
Binary files /dev/null and b/main/ui/src/main/resources/bot.png differ
diff --git a/main/ui/src/main/resources/bot@2x.png b/main/ui/src/main/resources/bot@2x.png
new file mode 100644
index 000000000..6192beae5
Binary files /dev/null and b/main/ui/src/main/resources/bot@2x.png differ
diff --git a/main/ui/src/main/resources/bot_welcome.png b/main/ui/src/main/resources/bot_welcome.png
deleted file mode 100644
index a429621d9..000000000
Binary files a/main/ui/src/main/resources/bot_welcome.png and /dev/null differ
diff --git a/main/ui/src/main/resources/bot_welcome@2x.png b/main/ui/src/main/resources/bot_welcome@2x.png
deleted file mode 100644
index d6e201c20..000000000
Binary files a/main/ui/src/main/resources/bot_welcome@2x.png and /dev/null differ
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 91bfcccf0..4a31930f8 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -17,7 +17,7 @@
 }
 
 @font-face {
-	src: url('dosis-bold.ttf');
+	src: url('quicksand-bold.ttf');
 }
 
 /*******************************************************************************
@@ -154,8 +154,8 @@
 }
 
 .main-window .title .label {
-	-fx-font-family: 'Dosis';
-	-fx-font-size: 21px;
+	-fx-font-family: 'Quicksand';
+	-fx-font-size: 16px;
 	-fx-font-style: normal;
 	-fx-font-weight: 700;
 	-fx-text-fill: TITLE_TEXT_FILL;
diff --git a/main/ui/src/main/resources/css/dosis-bold.ttf b/main/ui/src/main/resources/css/dosis-bold.ttf
deleted file mode 100644
index d5e938e24..000000000
Binary files a/main/ui/src/main/resources/css/dosis-bold.ttf and /dev/null differ
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index dd95b5678..64e4a527b 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -17,7 +17,7 @@
 }
 
 @font-face {
-	src: url('dosis-bold.ttf');
+	src: url('quicksand-bold.ttf');
 }
 
 /*******************************************************************************
@@ -153,8 +153,8 @@
 }
 
 .main-window .title .label {
-	-fx-font-family: 'Dosis';
-	-fx-font-size: 21px;
+	-fx-font-family: 'Quicksand';
+	-fx-font-size: 16px;
 	-fx-font-style: normal;
 	-fx-font-weight: 700;
 	-fx-text-fill: TITLE_TEXT_FILL;
diff --git a/main/ui/src/main/resources/css/quicksand-bold.ttf b/main/ui/src/main/resources/css/quicksand-bold.ttf
new file mode 100644
index 000000000..f538c6fa3
Binary files /dev/null and b/main/ui/src/main/resources/css/quicksand-bold.ttf differ
diff --git a/main/ui/src/main/resources/fxml/addvault_welcome.fxml b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
index 0be047ca4..faa974931 100644
--- a/main/ui/src/main/resources/fxml/addvault_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
@@ -21,7 +21,7 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-			<Image url="/bot_welcome.png"/>
+			<Image url="/bot.png"/>
 		</ImageView>
 
 		<Region VBox.vgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml
index 0078cf5b0..31965fea0 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -19,7 +19,7 @@
 		<Insets bottom="6" left="12" right="12" top="6"/>
 	</padding>
 	<children>
-		<Label text="Cryptomator"/>
+		<Label text="CRYPTOMATOR"/>
 		<Region HBox.hgrow="ALWAYS"/>
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showDonationKeyPreferences" focusTraversable="false" visible="${!controller.licenseHolder.validLicense}">
 			<graphic>
diff --git a/main/ui/src/main/resources/tray_icon.png b/main/ui/src/main/resources/tray_icon.png
index 766b601e0..684db1824 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_unlocked.png b/main/ui/src/main/resources/tray_icon_unlocked.png
deleted file mode 100644
index fb516b24d..000000000
Binary files a/main/ui/src/main/resources/tray_icon_unlocked.png and /dev/null differ
diff --git a/main/ui/src/main/resources/tray_icon_unlocked_mac_black.png b/main/ui/src/main/resources/tray_icon_unlocked_mac_black.png
deleted file mode 100644
index 1530566e0..000000000
Binary files a/main/ui/src/main/resources/tray_icon_unlocked_mac_black.png and /dev/null differ
diff --git a/main/ui/src/main/resources/tray_icon_unlocked_mac_black@2x.png b/main/ui/src/main/resources/tray_icon_unlocked_mac_black@2x.png
deleted file mode 100644
index ae6058522..000000000
Binary files a/main/ui/src/main/resources/tray_icon_unlocked_mac_black@2x.png and /dev/null differ
diff --git a/main/ui/src/main/resources/tray_icon_unlocked_mac_white.png b/main/ui/src/main/resources/tray_icon_unlocked_mac_white.png
deleted file mode 100644
index 848d1a217..000000000
Binary files a/main/ui/src/main/resources/tray_icon_unlocked_mac_white.png and /dev/null differ
diff --git a/main/ui/src/main/resources/tray_icon_unlocked_mac_white@2x.png b/main/ui/src/main/resources/tray_icon_unlocked_mac_white@2x.png
deleted file mode 100644
index 6ea6bac4d..000000000
Binary files a/main/ui/src/main/resources/tray_icon_unlocked_mac_white@2x.png and /dev/null differ
diff --git a/main/ui/src/main/resources/window_icon_32.png b/main/ui/src/main/resources/window_icon_32.png
index 07f2fd241..0b7e697c5 100644
Binary files a/main/ui/src/main/resources/window_icon_32.png and b/main/ui/src/main/resources/window_icon_32.png differ
diff --git a/main/ui/src/main/resources/window_icon_512.png b/main/ui/src/main/resources/window_icon_512.png
index 1e0832c42..b050bdf93 100644
Binary files a/main/ui/src/main/resources/window_icon_512.png and b/main/ui/src/main/resources/window_icon_512.png differ