diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33a1af0bae4..48482f765e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,7 +83,6 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We disabled the actions "Open Terminal here" and "Reveal in file explorer" for unsaved libraries. [#11920](https://github.com/JabRef/jabref/issues/11920)
 - JabRef now opens the corresponding directory in the library properties when "Browse" is clicked. [#12223](https://github.com/JabRef/jabref/pull/12223)
 
-
 ### Fixed
 
 - We fixed an issue where certain actions were not disabled when no libraries were open. [#11923](https://github.com/JabRef/jabref/issues/11923)
@@ -126,6 +125,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue when the preview was out of sync. [#9172](https://github.com/JabRef/jabref/issues/9172)
 - We fixed an issue where identifier paste couldn't work with Unicode REPLACEMENT CHARACTER. [#11986](https://github.com/JabRef/jabref/issues/11986)
 - We fixed an issue when click on entry at "Check Integrity" wasn't properly focusing the entry and field. [#11997](https://github.com/JabRef/jabref/issues/11997)
+- We fixed an issue with the ui not scaling when changing the font size [#11219](https://github.com/JabRef/jabref/issues/11219)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 635c295af1c..af7759a1453 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -341,6 +341,10 @@ TextFlow > .hyperlink:visited,
     -fx-underline: true;
 }
 
+.TextFlow > .embeddedHyperlink {
+    -fx-padding: 0.166667em 0.25em 0.166667em 0.25em;
+}
+
 .glyph-icon {
     /* This adjusts text alignment within the bounds of text nodes so that
        the text is always vertically centered within the bounds. Based on
@@ -395,7 +399,7 @@ TextFlow > .tooltip-text-monospaced {
 .combo-box-base:editable > .arrow-button {
     -fx-background-color: transparent;
     -fx-background-insets: 0;
-    -fx-background-radius: 4px;
+    -fx-background-radius: 0.25em;
     -fx-text-fill: -fx-text-base-color;
 }
 
@@ -403,8 +407,8 @@ TextFlow > .tooltip-text-monospaced {
 .button {
     -fx-background-color: transparent;
     -fx-border-color: -fx-outer-border; /* rgba(0, 0, 0, 0.23); */
-    -fx-border-width: 1px;
-    -fx-border-radius: 4px;
+    -fx-border-width: 0.062em;
+    -fx-border-radius: 0.25em;
     -fx-padding: 0.5em 1em 0.5em 1em;
 }
 
@@ -435,7 +439,7 @@ TextFlow > .tooltip-text-monospaced {
 }
 
 .text-button {
-    -fx-border-width: 0px;
+    -fx-border-width: 0;
 }
 
 .contained-button {
@@ -446,7 +450,7 @@ TextFlow > .tooltip-text-monospaced {
 .icon-buttonNoSpaceBottom,
 .icon-buttonNoSpaceTop,
 .icon-button {
-    -fx-border-width: 0px;
+    -fx-border-width: 0;
     -fx-background-color: -jr-icon-background;
     -fx-padding: 0.5em;
 }
@@ -491,7 +495,7 @@ TextFlow > .tooltip-text-monospaced {
 
 .progress-indicator {
     -fx-progress-color: -jr-theme;
-    -fx-border-width: 0px;
+    -fx-border-width: 0;
     -fx-background-color: -jr-icon-background;
 }
 
@@ -514,13 +518,13 @@ TextFlow > .tooltip-text-monospaced {
 
 .check-box > .box {
     -fx-border-color: -fx-outer-border; /* rgba(0, 0, 0, 0.54); */
-    -fx-border-width: 2px;
-    -fx-border-radius: 1px;
+    -fx-border-width: 0.125em;
+    -fx-border-radius: 0.062em;
     -fx-padding: 0.1em 0.1em 0.2em 0.2em;
 }
 
 .check-box:selected > .box {
-    -fx-background-insets: 2px;
+    -fx-background-insets: 0.125em;
     -fx-border-color: -jr-checked;
     -fx-background-color: -jr-checked;
 }
@@ -539,7 +543,7 @@ TextFlow > .tooltip-text-monospaced {
     -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
     -fx-padding: 0.35em; /* padding from outside edge to the inner dot */
     -fx-background-color: rgba(0, 0, 0, 0.54), -fx-control-inner-background;
-    -fx-background-insets: 0, 2px;
+    -fx-background-insets: 0, 0.125em;
 }
 
 .radio-button:selected > .radio {
@@ -646,7 +650,7 @@ TextFlow > .tooltip-text-monospaced {
 }
 
 .tab-pane > .tab-header-area > .headers-region > .tab .glyph-icon {
-    -glyph-size: 13px;
+    -glyph-size: 0.812em;
     -fx-fill: -fx-mid-text-color;
     -fx-text-fill: -fx-mid-text-color;
 }
@@ -1001,7 +1005,7 @@ TextFlow > .tooltip-text-monospaced {
 .sidePaneComponentHeader .ikonli-font-icon {
     -fx-fill: -jr-sidepane-header-color;
     -fx-text-fill: -jr-sidepane-header-color;
-    -fx-font-size: 16px;
+    -fx-font-size: 1.0em;
     -fx-icon-color: -jr-theme-text;
 }
 
@@ -1242,7 +1246,7 @@ We want to have a look that matches our icons in the tool-bar */
 
 .notification-bar > .pane {
     -fx-background-color: -jr-gray-3;
-    -fx-background-radius: 4px;
+    -fx-background-radius: 0.25em;
 }
 
 .notification-bar > .pane > .title,
@@ -1254,17 +1258,17 @@ We want to have a look that matches our icons in the tool-bar */
 
 .notification-bar > .pane {
     -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.3), 9, 0, 0, 2);
-    -fx-padding: 6px 7px 6px 32px;
-    -fx-background-radius: 0px;
-    -fx-border-radius: 0px;
+    -fx-padding: 0.375em 0.438em 0.375em 2.0em;
+    -fx-background-radius: 0;
+    -fx-border-radius: 0;
 }
 
 .notification-bar > .pane > .button-bar > .container {
-    -fx-padding: 0px 24px 0px 0px;
+    -fx-padding: 0.0em 1.5em 0.0em 0.0em;
 }
 
 .notification-bar > .pane > .label {
-    -fx-graphic-text-gap: 8px;
+    -fx-graphic-text-gap: 0.5em;
 }
 
 .notification-pane .notification-bar > .pane .close-button > .graphic {
@@ -1272,7 +1276,7 @@ We want to have a look that matches our icons in the tool-bar */
 }
 
 .notification-bar > .pane > .label > .ikonli-font-icon {
-    -fx-icon-size: 16px;
+    -fx-icon-size: 1.0em;
     -fx-icon-color: -jr-base;
 }
 
@@ -1293,19 +1297,19 @@ We want to have a look that matches our icons in the tool-bar */
 .color-picker:focused,
 .color-picker {
     -fx-background-color: transparent, transparent, transparent, transparent;
-    -fx-background-radius: 0px;
-    -fx-background-insets: 0px;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
     -fx-effect: null;
 }
 
 .color-palette {
     -fx-background-color: -fx-background;
-    -fx-background-radius: 0px;
-    -fx-background-insets: 0px;
+    -fx-background-radius: 0;
+    -fx-background-insets: 0;
 }
 
 .color-palette-region .button {
-    -fx-border-width: 0px;
+    -fx-border-width: 0;
 }
 
 .bibEntry {
@@ -1428,8 +1432,8 @@ We want to have a look that matches our icons in the tool-bar */
 }
 
 .tags-field {
-    -fx-pref-height: 30px;
-    -fx-margin: 0em;
+    -fx-pref-height: 1.875em;
+    -fx-margin: 0;
     -fx-border-style: none;
     -fx-background-color: -fx-outer-border, -fx-control-inner-background;
 }
@@ -1478,7 +1482,7 @@ We want to have a look that matches our icons in the tool-bar */
 
 .rating {
     -fx-skin: "org.jabref.gui.util.CustomRatingSkin";
-    -fx-padding: 0.5em 0px 0px 0px;
+    -fx-padding: 0.5em 0.0em 0.0em 0.0em;
 }
 
 .rating > .container > .button {
@@ -1503,8 +1507,6 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-radius: 10;
 }
 
-/* region: fix for making text area round corners (source: https://stackoverflow.com/a/49617953) */
-
 .chat-message-text-area .scroll-pane {
     -fx-background-color: transparent;
 }
@@ -1517,10 +1519,7 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-color: transparent;
 }
 
-/* endregion */
-
-/* region: maintable css */
-
+/* MainTable */
 
 .main-table .column-icon {
     -fx-alignment: baseline-center;
@@ -1731,5 +1730,696 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0);
 }
 
+/* AboutDialog */
+#aboutDialog .about-heading {
+    -fx-font-size: 30;
+    -fx-text-fill: -jr-theme;
+}
+
+#aboutDialog .about-heading:pressed {
+    -fx-text-fill: -jr-selected;
+}
+
+#aboutDialog .top-padding {
+    -fx-padding: 5 0 0 0;
+}
+
+#aboutDialog .dev-heading {
+    -fx-font-size: 18;
+    -fx-padding: -10 0 0 0;
+}
+
+#aboutDialog .sub-heading {
+    -fx-font-size: 18;
+    -fx-padding: 0.312em;
+}
+
+#aboutDialog .about-top {
+    -fx-padding: 0 5 15 5;
+}
+
+#aboutDialog .space {
+    -fx-padding: 0 5 0 5;
+}
+
+#aboutDialog .space-after {
+    -fx-padding: 0 5 0 0;
+}
+
+#aboutDialog .info-sections {
+    -fx-padding: 0.312em;
+}
+
+#aboutDialog .contrib-section {
+    -fx-padding: 5 5 10 5;
+}
+
+#aboutDialog .logo-pane {
+    -fx-fill: transparent;
+}
+
+#aboutDialog .logo-pane SVGPath {
+    -fx-fill: #4f5f8f;
+}
+
+/* DocumentViewer */
+#documentViewerDialog #mainPane {
+    -fx-background-color: -fx-accented-background;
+    -fx-padding: 0;
+}
+
+#documentViewerDialog .document-viewer .page {
+    -fx-padding: 0em 0em 1em 0em;
+    -fx-background-insets: 0;
+}
+
+/* EntryEditor */
+#entryEditor .editorPane {
+    -fx-hgap: 10;
+    -fx-vgap: 6;
+    -fx-background-color: -fx-control-inner-background;
+    -fx-padding: 5 5 5 15;
+}
+
+#entryEditor Text {
+    -fx-text-fill: -fx-text-base-color;
+    -fx-fill: -fx-text-base-color;
+}
+
+#entryEditor .date-picker > .date-picker-display-node {
+    -fx-text-origin: baseline;
+}
+
+#entryEditor .date-picker > .date-picker-display-node *.text {
+    -fx-text-origin: bottom;
+}
+
+#entryEditor .combo-box > *.text {
+    -fx-text-origin: baseline;
+}
+
+#entryEditor #typeLabel {
+    -fx-padding: 0.1em;
+    -fx-font-size: 1.166667em;
+    -fx-font-weight: bold;
+    -fx-text-fill: -jr-theme-text;
+}
+
+#entryEditor #typeLabel:hover {
+    -fx-padding: 0.1em;
+    -fx-font-size: 1.166667em;
+    -fx-font-weight: bold;
+    -fx-background-color: -jr-icon-background-active;
+}
+
+#entryEditor #typeLabel .context-menu {
+    -fx-font-size: 0.92em;
+    -fx-font-weight: normal;
+}
+
+#entryEditor #typeLabel .tooltip {
+    -fx-font-size: 1em;
+    -fx-font-weight: normal;
+}
+
+#entryEditor .icon-button.narrow {
+    -fx-padding: 0.1em;
+}
+
+#entryEditor .icon-buttonNoSpaceBottom.narrow {
+    -fx-padding: 0.1em 0.1em -0.2em 0.1em;
+}
+
+#entryEditor .icon-buttonNoSpaceTop.narrow {
+    -fx-padding: -0.2em 0.1em 0.1em 0.1em;
+}
+
+#entryEditor .tool-bar {
+    -fx-background-color: -jr-background-alt;
+    -fx-background-insets: 0;
+}
+
+#entryEditor .tool-bar .glyph-icon {
+    -glyph-size: 1.0em;
+    -fx-font-size: 2em;
+    -fx-fill: -jr-theme-text;
+    -fx-text-fill: -jr-theme-text;
+}
+
+#entryEditor .warning-icon {
+    -fx-fill: -jr-warn;
+}
+
+#entryEditor .error-icon {
+    -fx-text-fill: -jr-error;
+    -fx-fill: -jr-error;
+}
+
+#entryEditor .tooltip-warning {
+    -fx-background-color: -jr-warn;
+}
+
+#entryEditor .tooltip-error {
+    -fx-background-color: -jr-error;
+}
+
+#entryEditor .code-area .context-menu {
+    -fx-font-family: sans-serif;
+}
+
+#entryEditor #related-articles-tab {
+    -fx-padding: 20 20 20 20;
+    -fx-background-color: -fx-control-inner-background;
+}
+
+#entryEditor .ai-tab {
+    -fx-padding: 20 20 20 20;
+    -fx-background-color: -fx-control-inner-background;
+}
+
+#entryEditor .gdpr-notice {
+    -fx-border-color: -jr-warn;
+    -fx-border-insets: 5;
+    -fx-border-style: dashed;
+    -fx-border-width: 2;
+    -fx-padding: 12;
+    -fx-font-size: 1.3em;
+}
+
+#entryEditor .recommendation-item {
+    -fx-padding: 0 0 0 20;
+}
+
+#entryEditor #bibtexSourceCodeArea {
+    -fx-padding: 4 4 4 4;
+    -fx-background-color: -fx-control-inner-background;
+}
+
+#entryEditor #bibtexSourceCodeArea .search {
+    -rtfx-background-color: #ffff00;
+    -fx-fill: #7800A9 ;
+    -fx-font-size: 1.2em;
+    -fx-font-weight: bolder;
+}
+
+#entryEditor #citationsPane {
+    -fx-padding: 0;
+    -fx-background-color: -fx-control-inner-background;
+}
+
+#entryEditor #citationsPane *,
+#entryEditor #scitePane Label,
+#entryEditor #scitePane Text {
+    -fx-fill: -fx-text-background-color;
+}
+
+#entryEditor .heading {
+    -fx-font-size: 1.5em;
+    -fx-font-weight: bold;
+}
+
+#entryEditor .description {
+    -fx-font-style: italic;
+}
+
+#entryEditor .scite-tallies-label {
+    -fx-font-size: 1.5em;
+    -fx-font-weight: bold;
+}
+
+#entryEditor .scite-error-box {
+    -fx-padding: 30 0 0 30;
+}
+
+#entryEditor .scite-message-box {
+    -fx-padding: 30 0 0 30;
+}
+
+#entryEditor #scite-error-label {
+    -fx-font-size: 1.5em;
+    -fx-font-weight: bold;
+    -fx-text-fill: -jr-error;
+}
+
+/* ErrorConsole */
+
+#errorConsole .list-content {
+    -fx-padding: 0.625em;
+}
+
+#errorConsole .info-section {
+    -fx-padding: 0.625em;
+    -fx-background-color: -fx-background;
+}
+
+#errorConsole .info-section .glyph-icon {
+    -fx-font-size: 24.0;
+}
+
+#errorConsole .exception .glyph-icon {
+    -fx-font-size: 18.0;
+    -fx-fill: -jr-error;
+}
+
+#errorConsole .output .glyph-icon {
+    -fx-font-size: 18.0;
+    -fx-fill: -jr-warn;
+}
+
+#errorConsole .log .glyph-icon {
+    -fx-font-size: 18.0;
+    -fx-fill: -jr-info;
+}
+
+#errorConsole .custom-buttons {
+    -fx-padding: 0.312em;
+}
+
+#errorConsole .exception {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#errorConsole .output {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#errorConsole .log {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+/* GroupTree */
+
+#groupTree:focused,
+#groupTree:filled:selected {
+    -fx-background-color: -jr-sidepane-background;
+    -fx-table-cell-border-color: transparent;
+}
+
+#groupTree, .tree-table-row-cell {
+    -fx-background-color: -jr-sidepane-background;
+}
+
+#groupTree .tree-table-cell {
+    -fx-padding: 0.35em 0em 0.25em 0em;
+}
+
+#groupTree .numberColumn {
+    -fx-alignment: top-right;
+    -fx-padding: 0.35em 0.2em 0.25em 0em;
+}
+
+#groupTree .numberColumn > .hits {
+    -fx-font-size: 0.75em;
+    -fx-background-color: -jr-group-hits-bg;
+    -fx-padding: 0.4em 0.4em 0.4em 0.4em;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0.7em;
+}
+
+#groupTree .numberColumn > .hits .text {
+    -fx-fill: -jr-group-hits-fg;
+}
+
+#groupTree .expansionNodeColumn {
+    -fx-alignment: top-right;
+}
+
+#groupTree .tree-table-row-cell:dragOver-bottom {
+    -fx-border-color: -jr-drag-target;
+    -fx-border-width: 0 0 2 0;
+    -fx-padding: 0 0 -2 0;
+}
+
+#groupTree .tree-table-row-cell:dragOver-center {
+    -fx-border-color: -jr-drag-target;
+    -fx-border-width: 1 1 1 1;
+    -fx-padding: -1 -1 -1 -1;
+    -fx-background-color: -jr-drag-target-hover;
+}
+
+#groupTree .tree-table-row-cell:dragOver-top {
+    -fx-border-color: -jr-drag-target;
+    -fx-border-width: 2 0 0 0;
+    -fx-padding: -2 0 0 0;
+}
+
+#groupTree .tree-table-row-cell:sub > .tree-table-cell {
+    -fx-padding: 0.20em 0em 0.20em 0em;
+}
+
+#groupTree .tree-table-row-cell:sub > .numberColumn {
+    -fx-padding: 0.20em 0.2em 0.20em 0em;
+}
+
+#groupTree .tree-table-row-cell:root {
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: -jr-separator;
+}
+
+#groupTree .tree-table-row-cell:root > .tree-table-cell {
+    -fx-padding: 0.65em 0em 0.65em 1em;
+}
+
+#groupTree .tree-table-row-cell:root > .numberColumn {
+    -fx-padding: 0.40em 0.2em 0.40em 0em;
+}
+
+#groupTree .tree-table-row-cell:root > .expansionNodeColumn {
+    -fx-padding: 0.45em 0.2em 0.45em 0.2em;
+}
+
+#groupTree .tree-table-row-cell:empty {
+    -fx-background-color: transparent; /* hide cells which are not bound to a group */
+}
+
+#groupTree .column-header-background {
+    visibility: hidden; /* hide column header */
+    -fx-padding: -0.8em;
+}
+
+#groupTree .tree-table-row-cell > .tree-table-cell > .tree-disclosure-node > .arrow {
+    -fx-background-color: -fx-mid-text-color;
+    -fx-max-height: 0.5em;
+    -fx-max-width: 0.5em;
+    -fx-padding: 0.333333em 0.229em 0.333333em 0.229em; /* 4 */
+    -fx-shape: "m64,416l96,96l256,-256l-256,-256l-96,96l160,160l-160,160z";
+}
+
+#groupTree .tree-table-row-cell:expanded > .tree-table-cell > .tree-disclosure-node > .arrow {
+    -fx-rotate: 90;
+}
+
+#groupTree .tree-table-row-cell > .tree-table-cell > .icon {
+    -fx-translate-x: -0.4em;
+}
+
+#groupFilterBar {
+    -fx-background-color: -jr-sidepane-header-background;
+    -fx-border-color: -jr-separator;
+    -fx-border-width: 1 0 0 0;
+    -fx-padding: 0em 1em 0em 1em;
+}
+
+#groupFilterBar .glyph-icon {
+    -fx-font-size: 2em;
+}
+
+#groupBar .glyph-icon {
+    -fx-font-size: 2em;
+}
+
+/* ImportEntriesDialog */
+
+#importEntriesDialog .addEntryButton {
+    -fx-font-size: 2em;
+}
+
+#importEntriesDialog .addEntryButton:selected {
+    -fx-background-color: transparent;
+    -fx-fill: -jr-selected;
+}
+
+#importEntriesDialog .entry-container {
+    -fx-padding: 0.5em 0em 0.5em 0em;
+}
+
+/* ManageStudyDefinition */
+
+.slr-tab {
+    -fx-padding: 1em;
+}
+
+/* MultiMergeEntries */
+
+#multiMergeEntries .text-changed {
+    -fx-fill: -jr-orange;
+}
+
+#multiMergeEntries .text-added {
+    -fx-fill: -jr-green;
+}
+
+#multiMergeEntries .text-removed {
+    -fx-fill: -jr-red;
+}
+
+#multiMergeEntries .grid-pane {
+    -fx-hgap: 10;
+    -fx-vgap: 10;
+}
+
+#multiMergeEntries .toggle-button {
+    -fx-border-insets: 0;
+    -fx-background-insets: 0;
+    -fx-border-image-insets: 0;
+    -fx-padding: 0.5em;
+    -fx-background-radius: 0;
+}
+
+#multiMergeEntries .box {
+    -fx-spacing: 10;
+}
+
+/* ParseLatexResult */
+
+#referenceListView {
+    -fx-background-color: -jr-sidepane-background;
+}
+
+#referenceListView > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-padding: 4 4 4 4;
+    -fx-background: transparent;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#referenceListView > .virtual-flow > .clipped-container > .sheet > .list-cell * {
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#parseLatexResultDialog > .split-pane > .split-pane-divider {
+    -fx-padding: 0 4 0 4;
+    -fx-background-color: transparent;
+}
+
+#parseLatexResultDialog .button-bar > .container {
+    -fx-border-width: 1 0 0 0;
+    -fx-border-color: -jr-sidepane-background;
+}
+
+/* PreferenceDialog */
+#preferencesDialog #sidepane {
+    -fx-background-color: -jr-sidepane-background;
+}
+
+#preferencesDialog #preferenceTabList {
+    -fx-background-color: transparent;
+}
+
+#preferencesDialog #preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-padding: 8 8 8 8;
+    -fx-background: transparent;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#preferencesDialog .button-bar > .container {
+    -fx-border-width: 1 0 0 0;
+    -fx-border-color: -jr-sidepane-background;
+}
+
+#preferencesDialog #preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background: -fx-control-inner-background;
+}
+
+#preferencesDialog > .split-pane > .split-pane-divider {
+    -fx-padding: 0 4 0 4;
+    -fx-background-color: transparent;
+}
+
+#preferencesDialog .preferencesTab {
+    -fx-padding: 0.5em;
+}
+
+#preferencesDialog *:search-highlight {
+    -fx-background-color: -jr-light-red;
+}
 
-/* endregion */
+#preferencesDialog .code-area {
+    -fx-padding: 0;
+    -fx-border-width: 1;
+    -fx-background-color: transparent;
+}
+
+#preferencesDialog .code-area .text {
+    -fx-fill: -fx-text-background-color;
+}
+
+#preferencesDialog .code-area .tagmark {
+    -fx-fill: gray;
+}
+
+#preferencesDialog .code-area .anytag {
+    -fx-fill: crimson;
+}
+
+#preferencesDialog .code-area .paren {
+    -fx-fill: firebrick;
+    -fx-font-weight: bold;
+}
+
+#preferencesDialog .code-area .attribute {
+    -fx-fill: darkviolet;
+}
+
+#preferencesDialog .code-area .avalue {
+    -fx-fill: green;
+}
+
+#preferencesDialog .code-area .comment {
+    -fx-fill: teal;
+}
+
+#preferencesDialog .code-area .highlight-keyword {
+    -fx-text-fill: -jr-purple;
+}
+
+#preferencesDialog .code-area .context-menu .menu-item .label {
+    -fx-padding: 2;
+}
+
+/* CitationRelationsTab */
+
+#citationRelationsTab .addEntryButton {
+    -fx-font-size: 2em;
+}
+
+#citationRelationsTab .addEntryButton:selected {
+    -fx-background-color: transparent;
+    -fx-fill: -jr-selected;
+}
+
+#citationRelationsTab .entry-container {
+    -fx-padding: 0.5em 0em 0.5em 0em;
+}
+
+/* JournalInfo */
+.journalInfo {
+    -fx-background-color: -jr-background-alt;
+}
+
+.journalInfo .info-heading {
+    -fx-font-size: 2.5em;
+    -fx-text-fill: -jr-theme;
+}
+
+.journalInfo .info-label {
+    -fx-font-size: 1.25em;
+    -fx-text-fill: -jr-theme;
+}
+
+.journalInfo .hIndex {
+    -fx-font-size: 2em;
+}
+
+.journalInfo .grid-cell {
+    -fx-border-color: transparent -fx-outer-border -fx-outer-border transparent;
+    -fx-border-width: 0 0.062em 0.062em 0;
+}
+
+.journalInfo .grid-cell-r {
+    -fx-border-color: transparent -fx-outer-border transparent transparent;
+    -fx-border-width: 0 0.062em 0 0;
+}
+
+journalInfo .grid-cell-b {
+    -fx-border-color: transparent transparent -fx-outer-border transparent;
+    -fx-border-width: 0 0 0.062em 0;
+}
+
+/* KeyBindingsTab */
+
+.keybinding-table {
+    -fx-table-cell-border-color: transparent;
+    -fx-background-color: transparent;
+}
+
+.keybinding-table .tree-table-row-cell {
+    -fx-background-color: transparent;
+    /* visibility: hidden; */
+}
+
+.keybinding-table .tree-table-row-cell:selected > .tree-table-cell > .icon,
+.keybinding-table .tree-table-row-cell:pressed > .tree-table-cell > .icon {
+    -fx-fill: white;
+}
+
+/* ThreeWayMergeView */
+.three-way-merge .merged-field .styled-text-area {
+    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+    -fx-prompt-text-fill: -fx-mid-text-color;
+}
+
+.three-way-merge .merged-field .styled-text-area:focused {
+    -fx-highlight-fill: derive(-jr-accent, 20%);
+    -fx-background-color: -jr-accent, -fx-control-inner-background;
+    -fx-background-insets: 0, 2;
+    -fx-highlight-text-fill: -fx-text-inner-color;
+}
+
+.three-way-merge .merge-field-value:selected .selection-box {
+    -fx-background-color: -jr-accent-alt;
+    -fx-border-color: -jr-accent;
+}
+
+.three-way-merge .merge-field-value .selection-box {
+    -fx-background-color: #0000;
+    -fx-border-color: #0000;
+    -fx-border-radius: 8;
+    -fx-background-radius: 8;
+    -fx-border-width: 2.5;
+}
+
+.three-way-merge .styled-text-area .text{
+    -fx-fill: -fx-text-background-color;
+}
+
+.three-way-merge .field-cell:odd {
+    -fx-background-color: -jr-row-odd-background;
+}
+
+.three-way-merge .field-cell:even {
+    -fx-background-color: -jr-row-even-background;
+}
+
+.three-way-merge .field-cell {
+    -fx-padding: 8;
+}
+
+.three-way-merge .merge-toolbox {
+    -fx-background-color: -jr-menu-background;
+}
+
+.three-way-merge .merge-header-cell .label{
+    -fx-font-weight: bold;
+    -fx-padding: 1, 0, 1, 0;
+}
+
+.three-way-merge .field-name .glyph-icon,
+.three-way-merge .field-name .ikonli-font-icon {
+    -fx-icon-size: 17;
+    -fx-icon-color:  -jr-theme-text;
+}
+
+/* Miscellaneous */
+
+.chatHistory {
+    -fx-border-color: black;
+}
+
+#styleSelectDialog .currentStyleLabel {
+    -fx-font-size: 1em;
+}
+
+#styleSelectDialog .currentStyleNameLabel {
+    -fx-font-size: 1em; -fx-font-weight: bold; -fx-text-fill: -jr-theme;
+}
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
index a479ace35e6..bd222d360f9 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/AiChatComponent.fxml
@@ -11,56 +11,43 @@
 <?import org.jabref.gui.ai.components.aichat.chatprompt.ChatPromptComponent?>
 <?import org.jabref.gui.ai.components.util.Loadable?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root
-        type="javafx.scene.layout.VBox"
-        spacing="10"
-        xmlns="http://javafx.com/javafx/17.0.2-ea"
-        xmlns:fx="http://javafx.com/fxml/1"
-        fillWidth="true"
-        fx:controller="org.jabref.gui.ai.components.aichat.AiChatComponent">
+<fx:root type="javafx.scene.layout.VBox"
+         spacing="10"
+         xmlns="http://javafx.com/javafx/17.0.2-ea"
+         xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.ai.components.aichat.AiChatComponent">
     <padding>
-        <Insets bottom="10.0"
-                left="10.0"
-                right="10.0"
-                top="10.0"/>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
     </padding>
-    <children>
-        <Loadable fx:id="uiLoadableChatHistory" VBox.vgrow="ALWAYS">
-            <ChatHistoryComponent fx:id="uiChatHistory" VBox.vgrow="ALWAYS" fitToWidth="true" />
-        </Loadable>
+    <Loadable fx:id="uiLoadableChatHistory" VBox.vgrow="ALWAYS">
+        <ChatHistoryComponent fx:id="uiChatHistory" VBox.vgrow="ALWAYS" fitToWidth="true" />
+    </Loadable>
 
-            <HBox spacing="10">
-                <Button alignment="CENTER"
-                        fx:id="notificationsButton"
-                        styleClass="icon-button,narrow"
-                        textAlignment="CENTER">
-                    <tooltip>
-                        <Tooltip
-                                text="%Notifications"/>
-                    </tooltip>
-                </Button>
-                <ChatPromptComponent fx:id="chatPrompt" HBox.hgrow="ALWAYS" />
-            </HBox>
-
-            <HBox alignment="CENTER"
-                  spacing="50">
-                <Label fx:id="noticeText"
-                       text="%Current AI model: %0. The AI may generate inaccurate or inappropriate responses. Please verify any information provided."
-                       BorderPane.alignment="CENTER"/>
-
-                <Button alignment="CENTER"
-                        onAction="#onClearChatHistory"
-                        styleClass="icon-button,narrow"
-                        textAlignment="CENTER">
-                    <graphic>
-                        <JabRefIconView
-                                glyph="DELETE_ENTRY"/>
-                    </graphic>
-                    <tooltip>
-                        <Tooltip
-                                text="%Clear chat history"/>
-                    </tooltip>
-                </Button>
-            </HBox>
-    </children>
+    <HBox spacing="10">
+        <Button alignment="CENTER"
+                fx:id="notificationsButton"
+                styleClass="icon-button,narrow"
+                textAlignment="CENTER">
+            <tooltip>
+                <Tooltip text="%Notifications"/>
+            </tooltip>
+        </Button>
+        <ChatPromptComponent fx:id="chatPrompt" HBox.hgrow="ALWAYS" />
+    </HBox>
+    <HBox alignment="CENTER" spacing="50">
+        <Label fx:id="noticeText"
+               text="%Current AI model: %0. The AI may generate inaccurate or inappropriate responses. Please verify any information provided."
+               BorderPane.alignment="CENTER"/>
+        <Button alignment="CENTER"
+                onAction="#onClearChatHistory"
+                styleClass="icon-button,narrow"
+                textAlignment="CENTER">
+            <graphic>
+                <JabRefIconView glyph="DELETE_ENTRY"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Clear chat history"/>
+            </tooltip>
+        </Button>
+    </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
index 20836e0e3bb..0c6adb56cb9 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chathistory/ChatHistoryComponent.fxml
@@ -3,19 +3,14 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.VBox?>
-<fx:root
-        type="javafx.scene.control.ScrollPane"
-        xmlns="http://javafx.com/javafx/17.0.2-ea"
-        xmlns:fx="http://javafx.com/fxml/1"
-        fx:controller="org.jabref.gui.ai.components.aichat.chathistory.ChatHistoryComponent"
-        style="-fx-border-color: black;">
-    <VBox fx:id="vBox"
-          spacing="10.0">
+<fx:root type="javafx.scene.control.ScrollPane"
+         xmlns="http://javafx.com/javafx/17.0.2-ea"
+         xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.ai.components.aichat.chathistory.ChatHistoryComponent"
+         styleClass="chatHistory">
+    <VBox fx:id="vBox" spacing="10.0">
         <padding>
-            <Insets bottom="10.0"
-                    left="10.0"
-                    right="10.0"
-                    top="10.0"/>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
         </padding>
     </VBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
index 92f428872d1..cf56ad0d56b 100644
--- a/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/aichat/chatmessage/ChatMessageComponent.fxml
@@ -10,35 +10,31 @@
 <?import javafx.scene.text.Font?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <?import com.dlsc.gemsfx.ExpandingTextArea?>
-<fx:root nodeOrientation="LEFT_TO_RIGHT" type="javafx.scene.layout.Pane" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.aichat.chatmessage.ChatMessageComponent">
-    <children>
-        <HBox fx:id="wrapperHBox" spacing="10.0">
-            <VBox fx:id="vBox" spacing="10.0">
-                <padding>
-                    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                </padding>
-                <children>
-                    <Label fx:id="sourceLabel" text="Source">
-                        <font>
-                            <Font name="System Bold" size="12.0" />
-                        </font>
-                    </Label>
-                    <ExpandingTextArea fx:id="contentTextArea" editable="false" nodeOrientation="LEFT_TO_RIGHT" text="Content" styleClass="chat-message-text-area" />
-                </children>
-            </VBox>
+<fx:root nodeOrientation="LEFT_TO_RIGHT" type="javafx.scene.layout.Pane"
+         xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.ai.components.aichat.chatmessage.ChatMessageComponent">
+    <HBox fx:id="wrapperHBox" spacing="10.0">
+        <VBox fx:id="vBox" spacing="10.0">
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+            <Label fx:id="sourceLabel" text="Source">
+                <font>
+                    <Font name="System Bold" size="12.0" />
+                </font>
+            </Label>
+            <ExpandingTextArea fx:id="contentTextArea" editable="false" nodeOrientation="LEFT_TO_RIGHT" text="Content" styleClass="chat-message-text-area" />
+        </VBox>
 
-            <VBox fx:id="buttonsVBox" alignment="BASELINE_RIGHT">
-                <children>
-                    <Button onAction="#onDeleteClick" styleClass="icon-button,narrow" textAlignment="CENTER">
-                        <graphic>
-                            <JabRefIconView glyph="DELETE_ENTRY"/>
-                        </graphic>
-                        <tooltip>
-                            <Tooltip text="%Delete message from chat history" />
-                        </tooltip>
-                    </Button>
-                </children>
-            </VBox>
-        </HBox>
-    </children>
+        <VBox fx:id="buttonsVBox" alignment="BASELINE_RIGHT">
+            <Button onAction="#onDeleteClick" styleClass="icon-button,narrow" textAlignment="CENTER">
+                <graphic>
+                    <JabRefIconView glyph="DELETE_ENTRY"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Delete message from chat history" />
+                </tooltip>
+            </Button>
+        </VBox>
+    </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
index a4f4da47cc2..543571673f4 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
@@ -1,97 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
-<?import javafx.scene.text.TextFlow?>
-<fx:root type="ScrollPane" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.privacynotice.PrivacyNoticeComponent">
-      <VBox spacing="10.0">
-         <padding>
-            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-         </padding>
-         <children>
-            <Label wrapText="true" text="%Privacy notice">
-               <font>
-                  <Font name="System Bold" size="24.0" />
-               </font>
-            </Label>
-            <Label wrapText="true" text="%JabRef uses AI providers to enable AI functionality (chatting with attached file(s) and summarization). AI provider is an external service. To enable processing of attached file(s), their contents need to be shared with the currently selected AI provider.">
-               <font>
-                  <Font size="14.0" />
-               </font>
-            </Label>
-            <Label wrapText="true" text="%As soon as you ask a question, the text content of all PDFs attached to the entry are sent to external service.">
-               <font>
-                  <Font size="14.0" />
-               </font>
-            </Label>
-            <TextFlow fx:id="openAiPrivacyTextFlow">
-               <children>
-                   <Text text="%If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.">
-                     <font>
-                        <Font size="14.0" />
-                     </font>
-                  </Text>
-               </children>
-            </TextFlow>
-            <TextFlow fx:id="mistralAiPrivacyTextFlow">
-               <children>
-                   <Text text="%If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.">
-                     <font>
-                        <Font size="14.0" />
-                     </font>
-                  </Text>
-               </children>
-            </TextFlow>
-             <TextFlow fx:id="geminiPrivacyTextFlow">
-                 <children>
-                     <Text text="%If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.">
-                         <font>
-                             <Font size="14.0" />
-                         </font>
-                     </Text>
-                 </children>
-             </TextFlow>
-            <TextFlow fx:id="huggingFacePrivacyTextFlow">
-               <children>
-                   <Text text="%If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.">
-                     <font>
-                        <Font size="14.0" />
-                     </font>
-                  </Text>
-               </children>
-            </TextFlow>
-             <TextFlow fx:id="gpt4AllTextFlow">
-                 <children>
-                     <Text text="%If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.">
-                         <font>
-                             <Font size="14.0" />
-                         </font>
-                     </Text>
-                 </children>
-             </TextFlow>
-             <TextFlow>
-                <Text fx:id="embeddingModelText" text="%Additionally, we use Deep Java Library (DJL) embedding models for both chatting and summarization. The embedding model will be downloaded in background (size %0) from Deep Java Library servers anonymously.">
-                   <font>
-                      <Font size="14.0" />
-                   </font>
-                </Text>
-                 <Hyperlink wrapText="true" onAction="#onDjlPrivacyPolicyClick" style="-fx-padding: 0.166667em 0.25em 0.166667em 0.25em;" text="%You find information about the privacy policy here.">
-                     <font>
-                         <Font size="14.0" />
-                     </font>
-                 </Hyperlink>
-             </TextFlow>
-            <Button mnemonicParsing="false" onAction="#onIAgreeButtonClick" text="%I agree">
-               <font>
-                  <Font size="14.0" />
-               </font>
-            </Button>
-         </children>
-      </VBox>
+<fx:root type="ScrollPane" styleClass="ai-tab"
+         xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.ai.components.privacynotice.PrivacyNoticeComponent">
+    <VBox spacing="20.0" styleClass="gdpr-notice" fx:id="text">
+        <Label wrapText="true" text="%Privacy notice" styleClass="heading" />
+        <Text text="%JabRef uses AI providers to enable AI functionality (chatting with attached file(s) and summarization). AI provider is an external service. To enable processing of attached file(s), their contents need to be shared with the currently selected AI provider. As soon as you ask a question, the text content of all PDFs attached to the entry are sent to external service. By using this service you agree to the privacy police of the selected AI provider."/>
+        <Text text="%This setting may be changed in preferences at any time."/>
+        <GridPane fx:id="aiPolicies" hgap="4" vgap="4" />
+        <Text fx:id="embeddingModelText" text="%Additionally, we use Deep Java Library (DJL) embedding models for both chatting and summarization. The embedding model will be downloaded in background (size %0) from Deep Java Library servers anonymously." />
+        <Hyperlink wrapText="true" onAction="#onDjlPrivacyPolicyClick" styleClass="embeddedHyperlink" text="%You find information about the privacy policy here." />
+        <Button onAction="#onIAgreeButtonClick" text="%I agree"/>
+    </VBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
index 4ef78da8c36..925c786080e 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
@@ -2,11 +2,15 @@
 
 import java.io.IOException;
 
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.DoubleBinding;
 import javafx.fxml.FXML;
 import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-import javafx.scene.text.TextFlow;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
@@ -21,11 +25,8 @@
 public class PrivacyNoticeComponent extends ScrollPane {
     private final Logger LOGGER = LoggerFactory.getLogger(PrivacyNoticeComponent.class);
 
-    @FXML private TextFlow openAiPrivacyTextFlow;
-    @FXML private TextFlow mistralAiPrivacyTextFlow;
-    @FXML private TextFlow geminiPrivacyTextFlow;
-    @FXML private TextFlow huggingFacePrivacyTextFlow;
-    @FXML private TextFlow gpt4AllTextFlow;
+    @FXML private VBox text;
+    @FXML private GridPane aiPolicies;
     @FXML private Text embeddingModelText;
 
     private final AiPreferences aiPreferences;
@@ -46,11 +47,11 @@ public PrivacyNoticeComponent(AiPreferences aiPreferences, Runnable onIAgreeButt
 
     @FXML
     private void initialize() {
-        initPrivacyHyperlink(openAiPrivacyTextFlow, AiProvider.OPEN_AI);
-        initPrivacyHyperlink(mistralAiPrivacyTextFlow, AiProvider.MISTRAL_AI);
-        initPrivacyHyperlink(geminiPrivacyTextFlow, AiProvider.GEMINI);
-        initPrivacyHyperlink(huggingFacePrivacyTextFlow, AiProvider.HUGGING_FACE);
-        initPrivacyHyperlink(gpt4AllTextFlow, AiProvider.GPT4ALL);
+        addPrivacyHyperlink(aiPolicies, AiProvider.OPEN_AI);
+        addPrivacyHyperlink(aiPolicies, AiProvider.MISTRAL_AI);
+        addPrivacyHyperlink(aiPolicies, AiProvider.GEMINI);
+        addPrivacyHyperlink(aiPolicies, AiProvider.HUGGING_FACE);
+        addPrivacyHyperlink(aiPolicies, AiProvider.GPT4ALL);
 
         String newEmbeddingModelText = embeddingModelText.getText().replaceAll("%0", aiPreferences.getEmbeddingModel().sizeInfo());
         embeddingModelText.setText(newEmbeddingModelText);
@@ -58,35 +59,26 @@ private void initialize() {
         // Because of the https://bugs.openjdk.org/browse/JDK-8090400 bug, the text in the privacy policy cannot be
         // fully wrapped.
 
-        embeddingModelText.wrappingWidthProperty().bind(this.widthProperty());
+        DoubleBinding textWidth = Bindings.subtract(this.widthProperty(), 88d);
+        text.getChildren().forEach(child -> {
+            if (child instanceof Text line) {
+                line.wrappingWidthProperty().bind(textWidth);
+            }
+        });
+        aiPolicies.prefWidthProperty().bind(textWidth);
+        embeddingModelText.wrappingWidthProperty().bind(textWidth);
     }
 
-    private void initPrivacyHyperlink(TextFlow textFlow, AiProvider aiProvider) {
-        if (textFlow.getChildren().isEmpty() || !(textFlow.getChildren().getFirst() instanceof Text text)) {
-            return;
-        }
-
-        String replacedText = text.getText().replaceAll("%0", aiProvider.getLabel()).replace("%1", "");
-
-        replacedText = replacedText.endsWith(".") ? replacedText.substring(0, replacedText.length() - 1) : replacedText;
-
-        text.setText(replacedText);
-        text.wrappingWidthProperty().bind(this.widthProperty());
+    private void addPrivacyHyperlink(GridPane gridPane, AiProvider aiProvider) {
+        int row = gridPane.getRowCount();
+        Label aiName = new Label(aiProvider.getLabel());
+        gridPane.add(aiName, 0, row);
 
         Hyperlink hyperlink = new Hyperlink(aiProvider.getApiUrl());
         hyperlink.setWrapText(true);
-        hyperlink.setFont(text.getFont());
-        hyperlink.setOnAction(event -> {
-            openBrowser(aiProvider.getApiUrl());
-        });
-
-        textFlow.getChildren().add(hyperlink);
-
-        Text dot = new Text(".");
-        dot.setFont(text.getFont());
-        dot.wrappingWidthProperty().bind(this.widthProperty());
-
-        textFlow.getChildren().add(dot);
+        // hyperlink.setFont(aiName.getFont());
+        hyperlink.setOnAction(event -> openBrowser(aiProvider.getApiUrl()));
+        gridPane.add(hyperlink, 1, row);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css
deleted file mode 100644
index 61291c1b2b0..00000000000
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.css
+++ /dev/null
@@ -1,10 +0,0 @@
-#mainPane {
-    -fx-background-color: -fx-accented-background;
-    -fx-padding: 0;
-}
-
-.document-viewer .page {
-    -fx-padding: 0em 0em 1em 0em;
-    -fx-background-insets: 0;
-}
-
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
index 0fca11e3873..3a1361d2b7a 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewer.fxml
@@ -15,7 +15,8 @@
 <?import org.jabref.gui.icon.JabRefIconView?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" depthTest="DISABLE" prefHeight="600.0" prefWidth="750.0"
             xmlns="http://javafx.com/javafx/8.0.112"
-            fx:controller="org.jabref.gui.documentviewer.DocumentViewerView">
+            fx:controller="org.jabref.gui.documentviewer.DocumentViewerView"
+            id="documentViewerDialog">
     <content>
         <BorderPane fx:id="mainPane">
             <fx:define>
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
deleted file mode 100644
index 48dbb5785b7..00000000000
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.css
+++ /dev/null
@@ -1,167 +0,0 @@
-.editorPane {
-    -fx-hgap: 10;
-    -fx-vgap: 6;
-    -fx-background-color: -fx-control-inner-background;
-    -fx-padding: 5 5 5 15;
-}
-
-.date-picker > .date-picker-display-node {
-    -fx-text-origin: baseline;
-}
-
-.date-picker > .date-picker-display-node *.text {
-    -fx-text-origin: bottom;
-}
-
-.combo-box > *.text {
-    -fx-text-origin: baseline;
-}
-
-#typeLabel {
-    -fx-padding: 0.1em;
-    -fx-font-size: 1.166667em;
-    -fx-font-weight: bold;
-    -fx-text-fill: -jr-theme-text;
-}
-
-#typeLabel:hover {
-    -fx-padding: 0.1em;
-    -fx-font-size: 1.166667em;
-    -fx-font-weight: bold;
-    -fx-background-color: -jr-icon-background-active;
-}
-
-#typeLabel .context-menu {
-    -fx-font-size: 0.92em;
-    -fx-font-weight: normal;
-}
-
-#typeLabel .tooltip {
-    -fx-font-size: 1em;
-    -fx-font-weight: normal;
-}
-
-.icon-button.narrow {
-    -fx-padding: 0.1em;
-}
-
-.icon-buttonNoSpaceBottom.narrow {
-    -fx-padding: 0.1em 0.1em -0.2em 0.1em;
-}
-
-.icon-buttonNoSpaceTop.narrow {
-    -fx-padding: -0.2em 0.1em 0.1em 0.1em;
-}
-
-.tool-bar {
-    -fx-background-color: -jr-background-alt;
-    -fx-background-insets: 0;
-}
-
-.tool-bar > .container > .separator {
-    -fx-background-color: -jr-separator;
-}
-
-.tool-bar .glyph-icon {
-    -glyph-size: 16px;
-    -fx-font-size: 2em;
-    -fx-fill: -jr-theme-text;
-    -fx-text-fill: -jr-theme-text;
-}
-
-.warning-icon {
-    -fx-fill: -jr-warn;
-}
-
-.error-icon {
-    -fx-text-fill: -jr-error;
-    -fx-fill: -jr-error;
-}
-
-.tooltip-warning {
-    -fx-background-color: -jr-warn;
-}
-
-.tooltip-error {
-    -fx-background-color: -jr-error;
-}
-
-.code-area .context-menu {
-    -fx-font-family: sans-serif;
-}
-
-#related-articles-tab {
-    -fx-padding: 20 20 20 20;
-    -fx-background-color: -fx-control-inner-background;
-}
-
-#related-articles-tab * {
-    -fx-fill: -fx-text-background-color;
-}
-
-#gdpr-dialog {
-    -fx-border-color: -jr-warn;
-    -fx-border-insets: 5;
-    -fx-border-style: dashed;
-    -fx-border-width: 2;
-    -fx-padding: 12;
-    -fx-font-size: 1.3em;
-}
-
-#gdpr-dialog * {
-    -fx-fill: -fx-text-background-color;
-}
-
-.recommendation-item {
-    -fx-padding: 0 0 0 20;
-}
-
-#bibtexSourceCodeArea {
-    -fx-padding: 4 4 4 4;
-    -fx-background-color: -fx-control-inner-background;
-}
-
-#bibtexSourceCodeArea .search {
-    -rtfx-background-color: #ffff00;
-    -fx-fill: #7800A9 ;
-    -fx-font-size: 1.2em;
-    -fx-font-weight: bolder;
-}
-
-#citationsPane {
-    -fx-padding: 0;
-    -fx-background-color: -fx-control-inner-background;
-}
-
-#citationsPane *,
-#scitePane Label, #scitePane Text {
-    -fx-fill: -fx-text-background-color;
-}
-
-.heading {
-    -fx-font-size: 1.5em;
-    -fx-font-weight: bold;
-}
-
-.description {
-    -fx-font-style: italic;
-}
-
-.scite-tallies-label {
-    -fx-font-size: 1.5em;
-    -fx-font-weight: bold;
-}
-
-.scite-error-box {
-    -fx-padding: 30 0 0 30;
-}
-
-.scite-message-box {
-    -fx-padding: 30 0 0 30;
-}
-
-#scite-error-label {
-    -fx-font-size: 1.5em;
-    -fx-font-weight: bold;
-    -fx-text-fill: -jr-error;
-}
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
index f709db8aed1..bc5add45b73 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.fxml
@@ -11,8 +11,10 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root xmlns:fx="http://javafx.com/fxml/1" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.112"
-         fx:controller="org.jabref.gui.entryeditor.EntryEditor" minHeight="50">
+<fx:root type="BorderPane"
+         xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.112"
+         fx:controller="org.jabref.gui.entryeditor.EntryEditor" minHeight="50"
+         id="entryEditor">
     <left>
         <ToolBar orientation="VERTICAL">
             <Button styleClass="icon-button,narrow" onAction="#close">
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index dba05a35317..dabd79369c1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -188,7 +188,7 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
         ScrollPane root = new ScrollPane();
         root.setId("related-articles-tab");
         VBox vbox = new VBox();
-        vbox.setId("gdpr-dialog");
+        vbox.getStyleClass().add("gdpr-notice");
         vbox.setSpacing(20.0);
 
         Text title = new Text(Localization.lang("Mr. DLib Privacy settings"));
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.css b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.css
deleted file mode 100644
index 8c196804bc3..00000000000
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.addEntryButton {
-    -fx-font-size: 2em;
-}
-
-.addEntryButton:selected {
-    -fx-background-color: transparent;
-    -fx-fill: -jr-selected;
-}
-
-.entry-container {
-    -fx-padding: 0.5em 0em 0.5em 0em;
-}
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
index c4a84fb925c..a3a9fc49b93 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
@@ -117,6 +117,7 @@ public CitationRelationsTab(DialogService dialogService,
         this.stateManager = stateManager;
         setText(Localization.lang("Citation relations"));
         setTooltip(new Tooltip(Localization.lang("Show articles related by citation")));
+        setId("citationRelationsTab");
 
         this.entryTypesManager = bibEntryTypesManager;
         this.duplicateCheck = new DuplicateCheck(entryTypesManager);
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css b/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css
deleted file mode 100644
index ae5bbfdf9d8..00000000000
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.list-content {
-    -fx-padding: 10px;
-}
-
-.info-section {
-    -fx-padding: 10px;
-    -fx-background-color: -fx-background;
-}
-
-.info-section .glyph-icon {
-    -fx-font-size: 24.0;
-}
-
-.exception .glyph-icon {
-    -fx-font-size: 18.0;
-    -fx-fill: -jr-error;
-}
-
-.output .glyph-icon {
-    -fx-font-size: 18.0;
-    -fx-fill: -jr-warn;
-}
-
-.log .glyph-icon {
-    -fx-font-size: 18.0;
-    -fx-fill: -jr-info;
-}
-
-.custom-buttons {
-    -fx-padding: 5px;
-}
-
-.exception {
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.output {
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.log {
-    -fx-text-fill: -fx-text-base-color;
-}
-
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml b/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml
index ab10833b4fd..5c1c4941021 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsole.fxml
@@ -5,8 +5,10 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.BorderPane?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="500.0" prefWidth="1080.0"
-            xmlns="http://javafx.com/javafx/8.0.60" fx:controller="org.jabref.gui.errorconsole.ErrorConsoleView">
+<DialogPane prefHeight="500.0" prefWidth="1080.0"
+            xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.60"
+            fx:controller="org.jabref.gui.errorconsole.ErrorConsoleView"
+            id="errorConsole">
     <content>
         <ListView fx:id="messagesListView" onKeyPressed="#copySelectedLogEntries" styleClass="list-content"
                   BorderPane.alignment="CENTER"/>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css
deleted file mode 100644
index 6b618d5083d..00000000000
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.info-container {
-    -fx-background-color: -jr-background-alt;
-}
-
-.info-heading {
-    -fx-font-size: 30;
-    -fx-text-fill: -jr-theme;
-}
-
-.info-label {
-    -fx-font-size: 15;
-    -fx-text-fill: -jr-theme;
-}
-
-.grid-cell {
-    -fx-border-color: transparent -fx-outer-border -fx-outer-border transparent;
-    -fx-border-width: 0 1px 1px 0;
-}
-
-.grid-cell-r {
-    -fx-border-color: transparent -fx-outer-border transparent transparent;
-    -fx-border-width: 0 1px 0 0;
-}
-
-.grid-cell-b {
-    -fx-border-color: transparent transparent -fx-outer-border transparent;
-    -fx-border-width: 0 0 1px 0;
-}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
index f3dd7a75d5f..e822c9d6632 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
@@ -10,7 +10,10 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-<fx:root VBox.vgrow="ALWAYS" alignment="TOP_CENTER" prefHeight="800.0" prefWidth="1200.0" spacing="10.0" styleClass="info-container" type="VBox" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.fieldeditors.journalinfo.JournalInfoView">
+<fx:root VBox.vgrow="ALWAYS" alignment="TOP_CENTER" prefHeight="800.0" prefWidth="1200.0" spacing="10.0"
+         styleClass="journalInfo" type="VBox"
+         xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.fieldeditors.journalinfo.JournalInfoView">
     <Label fx:id="title" styleClass="info-heading">
         <opaqueInsets>
             <Insets bottom="1.0" right="10.0" top="10.0" />
@@ -33,7 +36,7 @@
                     <Insets bottom="10.0" />
                 </VBox.margin>
             </Label>
-            <Label fx:id="hIndex" style="-fx-font-size: 24;" />
+            <Label fx:id="hIndex" styleClass="hIndex"/>
             <padding>
                 <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
             </padding>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
index 24712ff4a3b..ce768fc7a6c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
@@ -1,19 +1,15 @@
 package org.jabref.gui.fieldeditors.journalinfo;
 
-import java.util.Objects;
-
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.chart.LineChart;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.logic.importer.FetcherException;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-@AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class JournalInfoView extends VBox {
     @FXML private Label title;
     @FXML private Label categories;
@@ -35,8 +31,6 @@ public JournalInfoView() {
                   .root(this)
                   .load();
 
-        this.getStylesheets().add(Objects.requireNonNull(JournalInfoView.class.getResource("JournalInfo.css")).toExternalForm());
-
         title.textProperty().bind(viewModel.titleProperty());
         categories.textProperty().bind(viewModel.categoriesProperty());
         publisher.textProperty().bind(viewModel.publisherProperty());
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index b1375a4776f..324ed9ca48a 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -66,7 +66,7 @@
                     </VBox>
                 </VBox>
             </HBox>
-            <Label text="%Collect by" styleClass="sectionHeader" style="-fx-padding: 0 10 0 0;"/>
+            <Label text="%Collect by" styleClass="sectionHeader"/>
             <HBox>
                 <VBox spacing="10.0">
                     <RadioButton fx:id="explicitRadioButton" toggleGroup="$type" wrapText="true"
diff --git a/src/main/java/org/jabref/gui/groups/GroupTree.css b/src/main/java/org/jabref/gui/groups/GroupTree.css
deleted file mode 100644
index 29a4b5a204e..00000000000
--- a/src/main/java/org/jabref/gui/groups/GroupTree.css
+++ /dev/null
@@ -1,118 +0,0 @@
-#groupTree:focused,
-#groupTree:filled:selected {
-    -fx-background-color: -jr-sidepane-background;
-}
-
-.tree-table-view, .tree-table-row-cell {
-    -fx-background-color: -jr-sidepane-background;
-    -fx-table-cell-border-color: transparent; /* hide grid lines */
-}
-
-.tree-table-cell {
-    -fx-padding: 0.35em 0em 0.25em 0em;
-}
-
-.numberColumn {
-    -fx-alignment: top-right;
-    -fx-padding: 0.35em 0.2em 0.25em 0em;
-}
-
-.numberColumn > .hits {
-    -fx-font-size: 0.75em;
-    -fx-background-color: -jr-group-hits-bg;
-    -fx-padding: 0.4em 0.4em 0.4em 0.4em;
-    -fx-background-insets: 0;
-    -fx-background-radius: 0.7em;
-}
-
-.numberColumn > .hits .text {
-    -fx-fill: -jr-group-hits-fg;
-}
-
-.expansionNodeColumn {
-    -fx-alignment: top-right;
-}
-
-.tree-table-row-cell:dragOver-bottom {
-    -fx-border-color: -jr-drag-target;
-    -fx-border-width: 0 0 2 0;
-    -fx-padding: 0 0 -2 0;
-}
-
-.tree-table-row-cell:dragOver-center {
-    -fx-border-color: -jr-drag-target;
-    -fx-border-width: 1 1 1 1;
-    -fx-padding: -1 -1 -1 -1;
-    -fx-background-color: -jr-drag-target-hover;
-}
-
-.tree-table-row-cell:dragOver-top {
-    -fx-border-color: -jr-drag-target;
-    -fx-border-width: 2 0 0 0;
-    -fx-padding: -2 0 0 0;
-}
-
-.tree-table-row-cell:sub > .tree-table-cell {
-    -fx-padding: 0.20em 0em 0.20em 0em;
-}
-
-.tree-table-row-cell:sub > .numberColumn {
-    -fx-padding: 0.20em 0.2em 0.20em 0em;
-}
-
-.tree-table-row-cell:root {
-    -fx-border-width: 0 0 1 0;
-    -fx-border-color: -jr-separator;
-}
-
-.tree-table-row-cell:root > .tree-table-cell {
-    -fx-padding: 0.65em 0em 0.65em 1em;
-}
-
-.tree-table-row-cell:root > .numberColumn {
-    -fx-padding: 0.40em 0.2em 0.40em 0em;
-}
-
-.tree-table-row-cell:root > .expansionNodeColumn {
-    -fx-padding: 0.45em 0.2em 0.45em 0.2em;
-}
-
-.tree-table-row-cell:empty {
-    -fx-background-color: transparent; /* hide cells which are not bound to a group */
-}
-
-.column-header-background {
-    visibility: hidden; /* hide column header */
-    -fx-padding: -0.8em;
-}
-
-.tree-table-row-cell > .tree-table-cell > .tree-disclosure-node > .arrow {
-    -fx-background-color: -fx-mid-text-color;
-    -fx-max-height: 0.5em;
-    -fx-max-width: 0.5em;
-    -fx-padding: 0.333333em 0.229em 0.333333em 0.229em; /* 4 */
-    -fx-shape: "m64,416l96,96l256,-256l-256,-256l-96,96l160,160l-160,160z";
-}
-
-.tree-table-row-cell:expanded > .tree-table-cell > .tree-disclosure-node > .arrow {
-    -fx-rotate: 90;
-}
-
-.tree-table-row-cell > .tree-table-cell > .icon {
-    -fx-translate-x: -0.4em;
-}
-
-#groupFilterBar {
-    -fx-background-color: -jr-sidepane-header-background;
-    -fx-border-color: -jr-separator;
-    -fx-border-width: 1 0 0 0;
-    -fx-padding: 0em 1em 0em 1em;
-}
-
-#groupFilterBar .glyph-icon {
-    -fx-font-size: 2em;
-}
-
-#groupBar .glyph-icon {
-    -fx-font-size: 2em;
-}
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 7b6efa2ecdd..27ac6216706 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -43,7 +42,6 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Text;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
@@ -71,7 +69,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class GroupTreeView extends BorderPane {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeView.class);
@@ -108,8 +105,7 @@ public GroupTreeView(TaskExecutor taskExecutor,
                          StateManager stateManager,
                          GuiPreferences preferences,
                          DialogService dialogService,
-                         AiService aiService
-    ) {
+                         AiService aiService) {
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -117,13 +113,13 @@ public GroupTreeView(TaskExecutor taskExecutor,
         this.aiService = aiService;
 
         createNodes();
-        this.getStylesheets().add(Objects.requireNonNull(GroupTreeView.class.getResource("GroupTree.css")).toExternalForm());
         initialize();
     }
 
     private void createNodes() {
         searchField = SearchTextField.create(preferences.getKeyBindingRepository());
         searchField.setPromptText(Localization.lang("Filter groups..."));
+        searchField.setId("groupFilterBar");
         this.setTop(searchField);
 
         mainColumn = new TreeTableColumn<>();
@@ -151,7 +147,6 @@ private void createNodes() {
         mainColumn.prefWidthProperty().bind(groupTree.widthProperty().subtract(80d).subtract(15d));
 
         Button addNewGroup = new Button(Localization.lang("Add group"));
-        addNewGroup.setId("addNewGroup");
         addNewGroup.setMaxWidth(Double.MAX_VALUE);
         HBox.setHgrow(addNewGroup, Priority.ALWAYS);
         addNewGroup.setTooltip(new Tooltip(Localization.lang("New group")));
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.css b/src/main/java/org/jabref/gui/help/AboutDialog.css
deleted file mode 100644
index 50d86c04a8d..00000000000
--- a/src/main/java/org/jabref/gui/help/AboutDialog.css
+++ /dev/null
@@ -1,50 +0,0 @@
-.about-heading {
-    -fx-font-size: 30;
-    -fx-text-fill: -jr-theme;
-}
-
-.about-heading:pressed {
-    -fx-text-fill: -jr-selected;
-}
-
-.top-padding {
-    -fx-padding: 5 0 0 0;
-}
-
-.dev-heading {
-    -fx-font-size: 18;
-    -fx-padding: -10 0 0 0;
-}
-
-.sub-heading {
-    -fx-font-size: 18;
-    -fx-padding: 5px;
-}
-
-.about-top {
-    -fx-padding: 0 5 15 5;
-}
-
-.space {
-    -fx-padding: 0 5 0 5;
-}
-
-.space-after {
-    -fx-padding: 0 5 0 0;
-}
-
-.info-sections {
-    -fx-padding: 5px;
-}
-
-.contrib-section {
-    -fx-padding: 5 5 10 5;
-}
-
-.logo-pane {
-    -fx-fill: transparent;
-}
-
-.logo-pane SVGPath {
-    -fx-fill: #4f5f8f;
-}
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.fxml b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
index bda361a6046..da779d3be1f 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.fxml
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
@@ -15,7 +15,10 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.SVGPath?>
-<DialogPane prefWidth="530.0" prefHeight="510.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.help.AboutDialogView">
+<DialogPane prefWidth="530.0" prefHeight="510.0"
+            xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.help.AboutDialogView"
+            id="aboutDialog">
     <content>
         <VBox alignment="CENTER_LEFT" BorderPane.alignment="CENTER">
             <AnchorPane>
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
deleted file mode 100644
index 8c196804bc3..00000000000
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.addEntryButton {
-    -fx-font-size: 2em;
-}
-
-.addEntryButton:selected {
-    -fx-background-color: transparent;
-    -fx-fill: -jr-selected;
-}
-
-.entry-container {
-    -fx-padding: 0.5em 0em 0.5em 0em;
-}
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
index 4be2fabb5c4..8dbec6a69fa 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.fxml
@@ -14,7 +14,8 @@
 <?import org.controlsfx.control.CheckListView?>
 <?import org.fxmisc.richtext.CodeArea?>
 <DialogPane prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.ImportEntriesDialog">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.importer.ImportEntriesDialog"
+            id="importEntriesDialog">
     <content>
         <VBox spacing="10.0">
             <Label text="%Select the entries to be imported:"/>
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.css b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.css
deleted file mode 100644
index 99dffba7da4..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.text-changed {
-    -fx-fill: -jr-orange;
-}
-
-.text-added {
-    -fx-fill: -jr-green;
-}
-
-.text-removed {
-    -fx-fill: -jr-red;
-}
-
-.grid-pane {
-    -fx-hgap: 10;
-    -fx-vgap: 10;
-}
-
-.toggle-button {
-    -fx-border-insets: 0;
-    -fx-background-insets: 0;
-    -fx-border-image-insets: 0;
-    -fx-padding: 0;
-    -fx-background-radius: 0;
-}
-
-.box {
-    -fx-spacing: 10;
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
index d0a7c0de7a4..813ccd470bb 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntries.fxml
@@ -12,7 +12,8 @@
 <?import javafx.scene.layout.VBox?>
 <DialogPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
             fx:controller="org.jabref.gui.mergeentries.MultiMergeEntriesView"
-            prefHeight="500.0" prefWidth="800.0">
+            prefHeight="500.0" prefWidth="800.0"
+            id="multiMergeEntries">
 
     <content>
         <VBox styleClass="box">
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css
deleted file mode 100644
index 52b87f36949..00000000000
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.merged-field .styled-text-area {
-    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-prompt-text-fill: -fx-mid-text-color;
-}
-.merged-field .styled-text-area:focused {
-    -fx-highlight-fill: derive(-jr-accent, 20%);
-    -fx-background-color: -jr-accent, -fx-control-inner-background;
-    -fx-background-insets: 0, 2;
-    -fx-highlight-text-fill: -fx-text-inner-color;
-}
-
-.merge-field-value:selected .selection-box {
-    -fx-background-color: -jr-accent-alt;
-    -fx-border-color: -jr-accent;
-}
-
-.merge-field-value .selection-box {
-    -fx-background-color: #0000;
-    -fx-border-color: #0000;
-    -fx-border-radius: 8;
-    -fx-background-radius: 8;
-    -fx-border-width: 2.5;
-}
-
-.styled-text-area .text{
-    -fx-fill: -fx-text-background-color;
-}
-
-.field-cell:odd {
-    -fx-background-color: -jr-row-odd-background;
-}
-
-.field-cell:even {
-    -fx-background-color: -jr-row-even-background;
-}
-
-.field-cell {
-    -fx-padding: 8;
-}
-
-.merge-toolbox {
-    -fx-background-color: -jr-menu-background;
-}
-
-.merge-header-cell .label{
-    -fx-font-weight: bold;
-    -fx-padding: 1, 0, 1, 0;
-}
-
-.field-name .glyph-icon,
-.field-name .ikonli-font-icon {
-    -fx-icon-size: 17;
-    -fx-icon-color:  -jr-theme-text;
-}
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
index b4d36e34e60..e70d8ff8807 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -11,7 +11,6 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Screen;
 
-import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
 import org.jabref.gui.preferences.GuiPreferences;
@@ -20,7 +19,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 
-@AllowedToUseClassGetResource("JavaFX internally handles the passed URLs properly.")
 public class ThreeWayMergeView extends VBox {
     public static final int GRID_COLUMN_MIN_WIDTH = 250;
 
@@ -47,7 +45,6 @@ public class ThreeWayMergeView extends VBox {
     public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader, GuiPreferences preferences) {
         this.preferences = preferences;
 
-        getStylesheets().add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
         viewModel = new ThreeWayMergeViewModel((BibEntry) leftEntry.clone(), (BibEntry) rightEntry.clone(), leftHeader, rightHeader);
         this.fieldMergerFactory = new FieldMergerFactory(preferences.getBibEntryPreferences());
         this.keywordSeparator = preferences.getBibEntryPreferences().getKeywordSeparator().toString();
@@ -67,6 +64,8 @@ public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHea
         this.setPrefWidth(Screen.getPrimary().getBounds().getWidth() * 0.97);
 
         getChildren().addAll(toolbar, headerView, scrollPane);
+
+        getStyleClass().add("three-way-merge");
     }
 
     public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, GuiPreferences preferences) {
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
index beb8516bf90..9eada3a1bdf 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.fxml
@@ -16,70 +16,61 @@
 <?import org.controlsfx.control.textfield.CustomTextField?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" minHeight="-Infinity" minWidth="-Infinity" prefHeight="550.0"
             prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.171"
-            fx:controller="org.jabref.gui.openoffice.StyleSelectDialogView">
+            fx:controller="org.jabref.gui.openoffice.StyleSelectDialogView"
+            id="styleSelectDialog">
     <content>
         <VBox spacing="10.0">
             <TabPane fx:id="tabPane" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
-                <tabs>
-                    <Tab text="CSL Styles">
-                        <content>
-                            <VBox spacing="10.0" VBox.vgrow="ALWAYS">
-                                <padding>
-                                    <Insets top="10.0" right="10.0" bottom="10.0" left="10.0"/>
-                                </padding>
-                                <VBox spacing="4.0" VBox.vgrow="ALWAYS">
-                                    <Label text="%Available" styleClass="sectionHeader"/>
-                                    <CustomTextField fx:id="searchBox" promptText="%Filter" prefHeight="20.0"/>
-                                    <ListView fx:id="availableListView" VBox.vgrow="ALWAYS"/>
-                                </VBox>
-                                <VBox spacing="4.0">
-                                    <Label text="%Preview" styleClass="sectionHeader"/>
-                                    <VBox fx:id="cslPreviewBox" prefHeight="300.0" spacing="4.0"/>
-                                </VBox>
-                            </VBox>
-                        </content>
-                    </Tab>
-                    <Tab text="JStyles">
-                        <content>
-                            <BorderPane>
-                                <top>
-                                    <TableView fx:id="tvStyles" prefHeight="208.0" prefWidth="662.0" BorderPane.alignment="CENTER">
-                                        <columns>
-                                            <TableColumn fx:id="colName" minWidth="100.0" prefWidth="-1.0" text="%Name"/>
-                                            <TableColumn fx:id="colJournals" minWidth="100.0" prefWidth="75.0" text="%Journals"/>
-                                            <TableColumn fx:id="colFile" minWidth="100.0" prefWidth="-1.0" text="%File"/>
-                                            <TableColumn fx:id="colDeleteIcon" minWidth="100.0" prefWidth="-1.0"/>
-                                        </columns>
-                                        <columnResizePolicy>
-                                            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                                        </columnResizePolicy>
-                                    </TableView>
-                                </top>
-                                <right>
-                                    <Button fx:id="add" alignment="TOP_RIGHT" mnemonicParsing="false" onAction="#addStyleFile"
-                                            text="%Add style file" BorderPane.alignment="CENTER"/>
-                                </right>
-                                <bottom>
-                                    <VBox fx:id="jstylePreviewBox" prefHeight="84.0" prefWidth="665.0" BorderPane.alignment="CENTER"/>
-                                </bottom>
-                            </BorderPane>
-                        </content>
-                    </Tab>
-                </tabs>
+                <Tab text="CSL Styles">
+                    <VBox spacing="10.0" VBox.vgrow="ALWAYS">
+                        <padding>
+                            <Insets top="10.0" right="10.0" bottom="10.0" left="10.0"/>
+                        </padding>
+                        <VBox spacing="4.0" VBox.vgrow="ALWAYS">
+                            <Label text="%Available" styleClass="sectionHeader"/>
+                            <CustomTextField fx:id="searchBox" promptText="%Filter" prefHeight="20.0"/>
+                            <ListView fx:id="availableListView" VBox.vgrow="ALWAYS"/>
+                        </VBox>
+                        <VBox spacing="4.0">
+                            <Label text="%Preview" styleClass="sectionHeader"/>
+                            <VBox fx:id="cslPreviewBox" prefHeight="300.0" spacing="4.0"/>
+                        </VBox>
+                    </VBox>
+                </Tab>
+                <Tab text="JStyles">
+                    <BorderPane>
+                        <top>
+                            <TableView fx:id="tvStyles" prefHeight="208.0" prefWidth="662.0" BorderPane.alignment="CENTER">
+                                <columns>
+                                    <TableColumn fx:id="colName" minWidth="100.0" prefWidth="-1.0" text="%Name"/>
+                                    <TableColumn fx:id="colJournals" minWidth="100.0" prefWidth="75.0" text="%Journals"/>
+                                    <TableColumn fx:id="colFile" minWidth="100.0" prefWidth="-1.0" text="%File"/>
+                                    <TableColumn fx:id="colDeleteIcon" minWidth="100.0" prefWidth="-1.0"/>
+                                </columns>
+                                <columnResizePolicy>
+                                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                                </columnResizePolicy>
+                            </TableView>
+                        </top>
+                        <right>
+                            <Button fx:id="add" alignment="TOP_RIGHT" mnemonicParsing="false" onAction="#addStyleFile"
+                                    text="%Add style file" BorderPane.alignment="CENTER"/>
+                        </right>
+                        <bottom>
+                            <VBox fx:id="jstylePreviewBox" prefHeight="84.0" prefWidth="665.0" BorderPane.alignment="CENTER"/>
+                        </bottom>
+                    </BorderPane>
+                </Tab>
             </TabPane>
             <HBox alignment="CENTER_LEFT" spacing="10.0">
                 <padding>
                     <Insets left="10.0" right="10.0" bottom="10.0"/>
                 </padding>
-                <Label text="Currently set style:" styleClass="currentStyleLabel"
-                       style="-fx-font-size: 14px;"/>
-                <Label fx:id="currentStyleNameLabel" styleClass="currentStyleNameLabel"
-                       style="-fx-font-size: 14px; -fx-font-weight: bold; -fx-text-fill: #626C9F;"/>
+                <Label text="Currently set style:" styleClass="currentStyleLabel"/>
+                <Label fx:id="currentStyleNameLabel" styleClass="currentStyleNameLabel"/>
             </HBox>
         </VBox>
     </content>
-    <buttonTypes>
-        <ButtonType fx:constant="CANCEL"/>
-        <ButtonType fx:constant="OK"/>
-    </buttonTypes>
+    <ButtonType fx:constant="CANCEL"/>
+    <ButtonType fx:constant="OK"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
deleted file mode 100644
index 1b1e95c675b..00000000000
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ /dev/null
@@ -1,78 +0,0 @@
-#sidepane {
-    -fx-background-color: -jr-sidepane-background;
-}
-
-#preferenceTabList {
-    -fx-background-color: transparent;
-}
-
-#preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell {
-    -fx-padding: 8 8 8 8;
-    -fx-background: transparent;
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.button-bar > .container {
-    -fx-border-width: 1 0 0 0;
-    -fx-border-color: -jr-sidepane-background;
-}
-
-#preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background: -fx-control-inner-background;
-}
-
-.split-pane > .split-pane-divider {
-    -fx-padding: 0 4 0 4;
-    -fx-background-color: transparent;
-}
-
-.preferencesTab {
-    -fx-padding: 0.5em;
-}
-
-*:search-highlight {
-    -fx-background-color: -jr-light-red;
-}
-
-.code-area {
-    -fx-padding: 0;
-    -fx-border-width: 1;
-    -fx-background-color: transparent;
-}
-
-.code-area .text {
-    -fx-fill: -fx-text-background-color;
-}
-
-.code-area .tagmark {
-    -fx-fill: gray;
-}
-
-.code-area .anytag {
-    -fx-fill: crimson;
-}
-
-.code-area .paren {
-    -fx-fill: firebrick;
-    -fx-font-weight: bold;
-}
-
-.code-area .attribute {
-    -fx-fill: darkviolet;
-}
-
-.code-area .avalue {
-    -fx-fill: green;
-}
-
-.code-area .comment {
-    -fx-fill: teal;
-}
-
-.code-area .highlight-keyword {
-    -fx-text-fill: -jr-purple;
-}
-
-.code-area .context-menu .menu-item .label {
-    -fx-padding: 2;
-}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index de98129187b..53603ade391 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -15,7 +15,8 @@
 <?import org.controlsfx.control.textfield.CustomTextField?>
 <DialogPane prefHeight="700.0" prefWidth="1100.0" minHeight="400" minWidth="600"
             xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="org.jabref.gui.preferences.PreferencesDialogView">
+            fx:controller="org.jabref.gui.preferences.PreferencesDialogView"
+            id="preferencesDialog">
     <content>
         <SplitPane dividerPositions="0.2">
             <VBox id="sidepane">
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
deleted file mode 100644
index 65ecab8c829..00000000000
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.keybinding-table {
-    -fx-table-cell-border-color: transparent;
-}
-
-.tree-table-row-cell:empty {
-    visibility: hidden;
-}
-
-.tree-table-row-cell:selected > .tree-table-cell > .icon,
-.tree-table-row-cell:pressed > .tree-table-cell > .icon {
-    -fx-fill: white;
-}
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.css b/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.css
deleted file mode 100644
index e4f5540d22e..00000000000
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.slr-tab {
-    -fx-padding: 1em;
-}
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResult.css b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.css
deleted file mode 100644
index 38bdb760e13..00000000000
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResult.css
+++ /dev/null
@@ -1,25 +0,0 @@
-#referenceListView {
-    -fx-background-color: -jr-sidepane-background;
-}
-
-#referenceListView > .virtual-flow > .clipped-container > .sheet > .list-cell {
-    -fx-padding: 4 4 4 4;
-    -fx-background: transparent;
-    -fx-text-fill: -fx-text-base-color;
-}
-
-#referenceListView > .virtual-flow > .clipped-container > .sheet > .list-cell * {
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.split-pane > .split-pane-divider {
-    -fx-padding: 0 4 0 4;
-    -fx-background-color: transparent;
-}
-
-.button-bar > .container {
-    -fx-border-width: 1 0 0 0;
-    -fx-border-color: -jr-sidepane-background;
-}
-
-
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
index 1e4d10c9c07..bcdf3818af4 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
@@ -9,7 +9,8 @@
 <?import org.jabref.gui.texparser.CitationsDisplay?>
 <DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="org.jabref.gui.texparser.ParseLatexResultView"
-            prefWidth="900.0" prefHeight="600.0">
+            prefWidth="900.0" prefHeight="600.0"
+            id="parseLatexResultDialog">
     <content>
         <SplitPane dividerPositions="0.2">
             <ListView fx:id="referenceListView" prefWidth="200.0"/>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index f0842f5bab4..32bc777fcc6 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2603,9 +2603,8 @@ No\ summary\ can\ be\ generated\ for\ entry\ '%0'.\ Could\ not\ find\ attached\
 Rebuild=Rebuild
 API\ base\ URL\ setting\ appears\ to\ be\ incorrect.\ Please\ check\ it\ in\ AI\ expert\ settings.=API base URL setting appears to be incorrect. Please check it in AI expert settings.
 AI-generated\ summary\ of\ attached\ file(s)=AI-generated summary of attached file(s)
-As\ soon\ as\ you\ ask\ a\ question,\ the\ text\ content\ of\ all\ PDFs\ attached\ to\ the\ entry\ are\ sent\ to\ external\ service.=As soon as you ask a question, the text content of all PDFs attached to the entry are sent to external service.
 Downloading\ embedding\ model...\ Afterward,\ you\ will\ be\ able\ to\ chat\ with\ your\ files.=Downloading embedding model... Afterward, you will be able to chat with your files.
-JabRef\ uses\ AI\ providers\ to\ enable\ AI\ functionality\ (chatting\ with\ attached\ file(s)\ and\ summarization).\ AI\ provider\ is\ an\ external\ service.\ To\ enable\ processing\ of\ attached\ file(s),\ their\ contents\ need\ to\ be\ shared\ with\ the\ currently\ selected\ AI\ provider.=JabRef uses AI providers to enable AI functionality (chatting with attached file(s) and summarization). AI provider is an external service. To enable processing of attached file(s), their contents need to be shared with the currently selected AI provider.
+JabRef\ uses\ AI\ providers\ to\ enable\ AI\ functionality\ (chatting\ with\ attached\ file(s)\ and\ summarization).\ AI\ provider\ is\ an\ external\ service.\ To\ enable\ processing\ of\ attached\ file(s),\ their\ contents\ need\ to\ be\ shared\ with\ the\ currently\ selected\ AI\ provider.\ As\ soon\ as\ you\ ask\ a\ question,\ the\ text\ content\ of\ all\ PDFs\ attached\ to\ the\ entry\ are\ sent\ to\ external\ service.\ By\ using\ this\ service\ you\ agree\ to\ the\ privacy\ police\ of\ the\ selected\ AI\ provider.=JabRef uses AI providers to enable AI functionality (chatting with attached file(s) and summarization). AI provider is an external service. To enable processing of attached file(s), their contents need to be shared with the currently selected AI provider. As soon as you ask a question, the text content of all PDFs attached to the entry are sent to external service. By using this service you agree to the privacy police of the selected AI provider.
 Please\ attach\ at\ least\ one\ PDF\ file\ to\ enable\ chatting\ with\ PDF\ file(s).=Please attach at least one PDF file to enable chatting with PDF file(s).
 The\ attached\ file(s)\ are\ currently\ being\ processed\ by\ %0.\ Once\ completed,\ you\ will\ be\ able\ to\ see\ the\ summary.=The attached file(s) are currently being processed by %0. Once completed, you will be able to see the summary.
 Waiting\ summary\ for\ %0...=Waiting summary for %0...
@@ -2651,7 +2650,6 @@ Generating\ embeddings\ for\ %0=Generating embeddings for %0
 RAG\ minimum\ score\ must\ be\ a\ number=RAG minimum score must be a number
 RAG\ minimum\ score\ must\ be\ greater\ than\ 0\ and\ less\ than\ 1=RAG minimum score must be greater than 0 and less than 1
 Temperature\ must\ be\ a\ number=Temperature must be a number
-If\ you\ have\ chosen\ %0\ as\ an\ AI\ provider,\ the\ privacy\ policy\ of\ %0\ applies.\ You\ find\ it\ at\ %1.=If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.
 Automatically\ generate\ embeddings\ for\ new\ entries=Automatically generate embeddings for new entries
 Automatically\ generate\ summaries\ for\ new\ entries=Automatically generate summaries for new entries
 Connection=Connection