diff --git a/src/main/resources/css/dark_theme.css b/src/main/resources/css/dark_theme.css
index a50bcd985..5b8c717c1 100644
--- a/src/main/resources/css/dark_theme.css
+++ b/src/main/resources/css/dark_theme.css
@@ -1210,41 +1210,13 @@
 	-fx-alignment: center-left;
 }
 
-.notification-window .close-button {
+.notification-window .window-bar-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;
+.notification-window .window-bar-button:armed {
+	-fx-background-color: CONTROL_BG_ARMED;
 	-fx-background-radius: 8;
-}
-
-.notification-window .close-button:pressed {
-	-fx-background-color: CONTROL_BG_ARMED;
-}
-
-.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;
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css
index 2439000b6..38e476923 100644
--- a/src/main/resources/css/light_theme.css
+++ b/src/main/resources/css/light_theme.css
@@ -1211,41 +1211,13 @@
 	-fx-alignment: center-left;
 }
 
-.notification-window .close-button {
+.notification-window .window-bar-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;
+.notification-window .window-bar-button:armed {
+	-fx-background-color: CONTROL_BG_ARMED;
 	-fx-background-radius: 8;
-}
-
-.notification-window .close-button:pressed {
-	-fx-background-color: CONTROL_BG_ARMED;
-}
-
-.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;
 }
\ No newline at end of file
diff --git a/src/main/resources/fxml/notification.fxml b/src/main/resources/fxml/notification.fxml
index 82893481c..5f82f3113 100644
--- a/src/main/resources/fxml/notification.fxml
+++ b/src/main/resources/fxml/notification.fxml
@@ -29,19 +29,19 @@
 				<Label text="Cryptomator" styleClass="label-window-title"/>
 				<Region HBox.hgrow="ALWAYS"/>
 				<HBox styleClass="dialog-header" alignment="CENTER_LEFT" visible="${!controller.singleEvent}">
-					<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#previousNotification" accessibleText="%generic.button.previous">
+					<Button contentDisplay="GRAPHIC_ONLY" styleClass="window-bar-button" onAction="#previousNotification" accessibleText="%generic.button.previous">
 						<graphic>
 							<FontAwesome5IconView glyph="CHEVRON_LEFT" glyphSize="12"/>
 						</graphic>
 					</Button>
 					<Label text="${controller.paging}" styleClass="label-window-title"/>
-					<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#nextNotification" accessibleText="%generic.button.next">
+					<Button contentDisplay="GRAPHIC_ONLY" styleClass="window-bar-button" onAction="#nextNotification" accessibleText="%generic.button.next">
 						<graphic>
 							<FontAwesome5IconView glyph="CHEVRON_RIGHT" glyphSize="12"/>
 						</graphic>
 					</Button>
 				</HBox>
-				<Button contentDisplay="GRAPHIC_ONLY" onAction="#close" styleClass="close-button" accessibleText="%generic.button.close">
+				<Button contentDisplay="GRAPHIC_ONLY" onAction="#close" styleClass="window-bar-button" accessibleText="%generic.button.close">
 					<graphic>
 						<FontAwesome5IconView glyph="TIMES" glyphSize="12"/>
 					</graphic>