diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index b650b6e17..c16fbe1a6 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -389,6 +389,16 @@
 	-fx-background-color: MUTED_BG;
 }
 
+/* Note: These values below are kinda random such that it looks ok. I'm pretty sure there is room for improvement. Additionally, fx-text-fill does not work*/
+.badge-debug {
+	-fx-font-family: 'Open Sans Bold';
+	-fx-font-size: 1.0em;
+	-fx-background-radius: 8px;
+	-fx-padding: 0.3em 0.55em 0.3em 0.55em;
+	-fx-background-color: RED_5;
+	-fx-background-radius: 2em;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Password Strength Indicator                                                 *
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 031e48b07..54ee8b238 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -1,5 +1,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
@@ -20,7 +21,17 @@
 	</padding>
 	<children>
 		<Label text="CRYPTOMATOR"/>
+
 		<Region HBox.hgrow="ALWAYS"/>
+
+		<Hyperlink onAction="#showGeneralPreferences" focusTraversable="false" visible="${controller.debugModeEnabled}" styleClass="badge-debug" text="DEBUG MODE" textFill="white">
+			<tooltip>
+				<Tooltip text="%main.debugModeEnabled.tooltip"/>
+			</tooltip>
+		</Hyperlink>
+
+		<Region HBox.hgrow="ALWAYS"/>
+
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showDonationKeyPreferences" focusTraversable="false" visible="${!controller.licenseHolder.validLicense}">
 			<graphic>
 				<StackPane>
@@ -32,14 +43,6 @@
 				<Tooltip text="%main.donationKeyMissing.tooltip"/>
 			</tooltip>
 		</Button>
-		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showGeneralPreferences" focusTraversable="false" visible="${controller.debugModeEnabled}">
-			<graphic>
-				<FontAwesome5IconView glyph="BUG" glyphSize="16"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="%main.debugModeEnabled.tooltip"/>
-			</tooltip>
-		</Button>
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showPreferences" focusTraversable="false">
 			<graphic>
 				<StackPane>