diff --git a/src/main/resources/css/dark_theme.css b/src/main/resources/css/dark_theme.css
index a00e46845..0263895a0 100644
--- a/src/main/resources/css/dark_theme.css
+++ b/src/main/resources/css/dark_theme.css
@@ -16,10 +16,6 @@
 	src: url('opensans-bold.ttf');
 }
 
-@font-face {
-	src: url('quicksand-bold.ttf');
-}
-
 /*******************************************************************************
  *                                                                             *
  * Root Styling & Colors                                                       *
@@ -179,14 +175,6 @@
 	-fx-background-insets: 0, 0 0 1px 0;
 }
 
-.main-window .title .label {
-	-fx-font-family: 'Quicksand';
-	-fx-font-size: 16px;
-	-fx-font-style: normal;
-	-fx-font-weight: 700;
-	-fx-text-fill: TITLE_TEXT_FILL;
-}
-
 .main-window .title .button {
 	-fx-pref-height: 30px;
 	-fx-pref-width: 30px;
diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css
index 09c743705..65460e7d6 100644
--- a/src/main/resources/css/light_theme.css
+++ b/src/main/resources/css/light_theme.css
@@ -16,9 +16,7 @@
 	src: url('opensans-bold.ttf');
 }
 
-@font-face {
-	src: url('quicksand-bold.ttf');
-}
+
 
 /*******************************************************************************
  *                                                                             *
@@ -178,14 +176,6 @@
 	-fx-background-color: TITLE_BG;
 }
 
-.main-window .title .label {
-	-fx-font-family: 'Quicksand';
-	-fx-font-size: 16px;
-	-fx-font-style: normal;
-	-fx-font-weight: 700;
-	-fx-text-fill: TITLE_TEXT_FILL;
-}
-
 .main-window .title .button {
 	-fx-pref-height: 30px;
 	-fx-pref-width: 30px;
diff --git a/src/main/resources/fxml/addvault_welcome.fxml b/src/main/resources/fxml/addvault_welcome.fxml
index 7d7244973..d86162020 100644
--- a/src/main/resources/fxml/addvault_welcome.fxml
+++ b/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="@../img/bot/bot.png"/>
+			<Image url="@../img/logo.png"/>
 		</ImageView>
 
 		<Region VBox.vgrow="ALWAYS"/>
diff --git a/src/main/resources/fxml/health_start.fxml b/src/main/resources/fxml/health_start.fxml
index a23eda414..00bb69207 100644
--- a/src/main/resources/fxml/health_start.fxml
+++ b/src/main/resources/fxml/health_start.fxml
@@ -26,7 +26,7 @@
 		<HBox VBox.vgrow="ALWAYS">
 			<VBox alignment="CENTER" minWidth="175" maxWidth="175">
 				<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-					<Image url="@../img/bot/bot.png"/>
+					<Image url="@../img/logo.png"/>
 				</ImageView>
 			</VBox>
 			<VBox HBox.hgrow="ALWAYS" alignment="CENTER">
diff --git a/src/main/resources/fxml/main_window_title.fxml b/src/main/resources/fxml/main_window_title.fxml
index 734107e4f..bd60aa25d 100644
--- a/src/main/resources/fxml/main_window_title.fxml
+++ b/src/main/resources/fxml/main_window_title.fxml
@@ -7,6 +7,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:id="titleBar"
@@ -20,7 +22,9 @@
 		<Insets bottom="6" left="12" right="12" top="6"/>
 	</padding>
 	<children>
-		<Label text="CRYPTOMATOR"/>
+		<ImageView HBox.hgrow="ALWAYS" fitHeight="14" preserveRatio="true" cache="true">
+			<Image url="@../img/title-logo.png"/>
+		</ImageView>
 
 		<Region HBox.hgrow="ALWAYS"/>
 
diff --git a/src/main/resources/fxml/preferences_about.fxml b/src/main/resources/fxml/preferences_about.fxml
index ce2a31e4e..07f026e91 100644
--- a/src/main/resources/fxml/preferences_about.fxml
+++ b/src/main/resources/fxml/preferences_about.fxml
@@ -18,7 +18,7 @@
 	<children>
 		<HBox spacing="12" VBox.vgrow="NEVER">
 			<ImageView VBox.vgrow="ALWAYS" fitHeight="64" preserveRatio="true" smooth="true" cache="true">
-				<Image url="@../img/bot/bot.png"/>
+				<Image url="@../img/logo.png"/>
 			</ImageView>
 			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-large" format="Cryptomator %s" arg1="${controller.applicationVersion}"/>
diff --git a/src/main/resources/fxml/vault_detail_welcome.fxml b/src/main/resources/fxml/vault_detail_welcome.fxml
index b2cbce7fa..8fdcf85eb 100644
--- a/src/main/resources/fxml/vault_detail_welcome.fxml
+++ b/src/main/resources/fxml/vault_detail_welcome.fxml
@@ -11,7 +11,7 @@
 	  spacing="24">
 	<children>
 		<ImageView VBox.vgrow="ALWAYS" fitHeight="128" preserveRatio="true" smooth="true" cache="true">
-			<Image url="@../img/bot/bot.png"/>
+			<Image url="@../img/logo.png"/>
 		</ImageView>
 
 		<TextFlow styleClass="text-flow" prefWidth="-Infinity" visible="${controller.noVaultPresent}" managed="${controller.noVaultPresent}">
diff --git a/src/main/resources/img/logo.png b/src/main/resources/img/logo.png
new file mode 100644
index 000000000..cdbecfa1a
Binary files /dev/null and b/src/main/resources/img/logo.png differ
diff --git a/src/main/resources/img/logo@2x.png b/src/main/resources/img/logo@2x.png
new file mode 100644
index 000000000..de8f79ded
Binary files /dev/null and b/src/main/resources/img/logo@2x.png differ
diff --git a/src/main/resources/img/title-logo.png b/src/main/resources/img/title-logo.png
new file mode 100644
index 000000000..fc5375314
Binary files /dev/null and b/src/main/resources/img/title-logo.png differ
diff --git a/src/main/resources/img/title-logo@2x.png b/src/main/resources/img/title-logo@2x.png
new file mode 100644
index 000000000..fdfe8a6bd
Binary files /dev/null and b/src/main/resources/img/title-logo@2x.png differ