diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css
index a2e88c29a..68d6dda03 100644
--- a/src/main/resources/css/light_theme.css
+++ b/src/main/resources/css/light_theme.css
@@ -1191,7 +1191,89 @@
 	Notification Window
 **/
 .notification-window {
-  	-fx-background-radius: 18 18 18 18;
-    -fx-border-radius: 18 18 18 18;
-    -fx-background-color: MAIN_BG;
-}
\ No newline at end of file
+	-fx-background-color: MAIN_BG;
+	-fx-background-radius: 22;
+	-fx-border-radius: 22;
+	-fx-background-insets: 0;
+	-fx-background-color: rgba(255, 255, 255, 0.92);
+	-fx-border-color: rgba(0, 0, 0, 0.1);
+	-fx-border-width: 1px;
+	-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 28, 0.35, 0, 6);
+}
+
+.notification-window .dialog-header {
+	-fx-alignment: center-left;
+}
+
+.notification-window .brand-title {
+	-fx-font-family: 'Open Sans SemiBold';
+	-fx-font-size: 18px;
+}
+
+.notification-window .close-button {
+	-fx-background-color: transparent;
+	-fx-border-color: transparent;
+	-fx-padding: 6 8 6 8;
+}
+
+.notification-window .close-button:hover {
+	-fx-background-color: CONTROL_BG_HOVER;
+	-fx-background-radius: 8;
+}
+
+.notification-window .close-button:pressed {
+	-fx-background-color: CONTROL_BG_ARMED;
+}
+
+.notification-window .notification-title {
+	-fx-font-family: 'Open Sans Bold';
+	-fx-font-size: 28px;
+	-fx-text-fill: TEXT_FILL;
+}
+
+.notification-window .notification-description {
+	-fx-font-size: 20px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-line-spacing: 6px;
+}
+
+.notification-window .action-button {
+	-fx-background-color: CONTROL_BG_NORMAL;
+	-fx-border-color: CONTROL_BORDER_NORMAL;
+	-fx-border-width: 2px;
+	-fx-background-radius: 12;
+	-fx-border-radius: 12;
+	-fx-font-family: 'Open Sans SemiBold';
+	-fx-font-size: 22px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-padding: 10 28 12 28;
+}
+
+.notification-window .action-button:hover {
+	-fx-background-color: CONTROL_BG_HOVER;
+	-fx-border-color: CONTROL_BORDER_FOCUSED;
+}
+
+.notification-window .action-button:pressed {
+	-fx-background-color: CONTROL_BG_ARMED;
+}
+
+.notification-window .nav-button {
+	-fx-background-color: transparent;
+	-fx-border-color: transparent;
+	-fx-padding: 6 8 6 8;
+}
+
+.notification-window .nav-button:hover {
+	-fx-background-color: CONTROL_BG_HOVER;
+	-fx-background-radius: 8;
+}
+
+.notification-window .nav-button:pressed {
+	-fx-background-color: CONTROL_BG_ARMED;
+}
+
+.notification-window .page-indicator {
+	-fx-font-size: 14px;
+	-fx-text-fill: TEXT_FILL;
+}
diff --git a/src/main/resources/fxml/notification.fxml b/src/main/resources/fxml/notification.fxml
index 5f24eb25b..fed6005aa 100644
--- a/src/main/resources/fxml/notification.fxml
+++ b/src/main/resources/fxml/notification.fxml
@@ -4,50 +4,63 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Separator?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.TextFlow?>
-<?import com.sun.javafx.scene.control.IntegerField?>
 <?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
-	  fx:controller="org.cryptomator.ui.notification.NotificationController"
-	  maxHeight="200.0" maxWidth="400.0" styleClass="notification-window" spacing="6">
+<?import javafx.scene.layout.BorderPane?>
+<BorderPane xmlns="http://javafx.com/javafx"
+			xmlns:fx="http://javafx.com/fxml"
+			fx:controller="org.cryptomator.ui.notification.NotificationController"
+			prefHeight="360.0" prefWidth="1100.0" maxHeight="600.0" maxWidth="1200.0"
+			styleClass="notification-window">
 	<padding>
-		<Insets topRightBottomLeft="6"/>
+		<Insets top="18" right="24" bottom="22" left="24"/>
 	</padding>
-		<HBox spacing="6">
-			<ImageView fitHeight="16" preserveRatio="true" cache="true">
+	<top>
+		<HBox spacing="12" styleClass="dialog-header" alignment="CENTER_LEFT">
+			<ImageView fitHeight="28" preserveRatio="true" cache="true">
 				<Image url="@../img/logo64.png"/>
 			</ImageView>
-			<Label text="Vault Notification" />
+			<Label text="cryptomator" styleClass="brand-title"/>
 			<Region HBox.hgrow="ALWAYS"/>
-			<Button contentDisplay="GRAPHIC_ONLY" onAction="#close">
+			<Button contentDisplay="GRAPHIC_ONLY" onAction="#close" styleClass="close-button">
 				<graphic>
-					<FontAwesome5IconView glyph="TIMES" glyphSize="16"/>
+					<FontAwesome5IconView glyph="TIMES" glyphSize="18"/>
 				</graphic>
 			</Button>
 		</HBox>
-	<Separator orientation="HORIZONTAL" />
-	<Label text="${controller.message}" styleClass="label-large" wrapText="true"/>
-	<Label text="${controller.description}" wrapText="true"/>
-	<HBox>
-		<Button text="${controller.actionText}" onAction="#handleButtonAction" visible="${controller.buttonVisible}" managed="${controller.buttonVisible}"/>
-		<Region HBox.hgrow="ALWAYS"/>
-		<Button contentDisplay="GRAPHIC_ONLY">
-			<graphic>
-				<FontAwesome5IconView glyph="CHEVRON_LEFT" glyphSize="6"/>
-			</graphic>
-		</Button>
-		<FormattedLabel format="a%d/%d" arg1="${controller.selectionIndex}" arg2="${controller.numberOfNotifications}"/>
-		<Button contentDisplay="GRAPHIC_ONLY">
-			<graphic>
-				<FontAwesome5IconView glyph="CHEVRON_RIGHT" glyphSize="6"/>
-			</graphic>
-		</Button>
-	</HBox>
-</VBox>
+	</top>
+
+	<center>
+		<VBox spacing="10">
+			<Label text="${controller.message}" styleClass="notification-title" wrapText="true"/>
+			<Label text="${controller.description}" styleClass="notification-description" wrapText="true"/>
+		</VBox>
+	</center>
+
+	<bottom>
+		<HBox spacing="12" alignment="CENTER_LEFT">
+			<Button text="${controller.actionText}" onAction="#handleButtonAction"
+					visible="${controller.buttonVisible}" managed="${controller.buttonVisible}"
+					styleClass="action-button"/>
+			<Region HBox.hgrow="ALWAYS"/>
+			<HBox spacing="6" alignment="CENTER">
+				<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#previousNotification">
+					<graphic>
+						<FontAwesome5IconView glyph="CHEVRON_LEFT" glyphSize="10"/>
+					</graphic>
+				</Button>
+				<FormattedLabel format="a%d / %d" arg1="${controller.selectionIndex}" arg2="${controller.numberOfNotifications}"
+								styleClass="page-indicator"/>
+				<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#nextNotification">
+					<graphic>
+						<FontAwesome5IconView glyph="CHEVRON_RIGHT" glyphSize="10"/>
+					</graphic>
+				</Button>
+			</HBox>
+		</HBox>
+	</bottom>
+</BorderPane>