diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42da6cc6765..ea2b0bf2a19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - The JabRef specific meta-data content in the main field such as priorities (prio1, prio2, ...) are migrated to their respective fields. They are removed from the keywords. [#6840](https://github.com/jabref/jabref/issues/6840)
 - We fixed an issue where groups generated from authors' last names did not include all entries of the authors' [#5833](https://github.com/JabRef/jabref/issues/5833)
 - The export to MS Office XML now uses the month name for the field `MonthAcessed` instead of the two digit number [#7354](https://github.com/JabRef/jabref/issues/7354)
+- We included some standalone dialogs from the options menu in the main preference dialog and fixed some visual issues in the preferences dialog. [#7384](https://github.com/JabRef/jabref/pull/7384)
 
 ### Fixed
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 7e412efcff5..89be3494a67 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -60,7 +60,6 @@
 import org.jabref.gui.contentselector.ManageContentSelectorAction;
 import org.jabref.gui.copyfiles.CopyFilesAction;
 import org.jabref.gui.customentrytypes.CustomizeEntryAction;
-import org.jabref.gui.customizefields.SetupGeneralFieldsAction;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.documentviewer.ShowDocumentViewerAction;
@@ -75,7 +74,6 @@
 import org.jabref.gui.entryeditor.PreviewSwitchAction;
 import org.jabref.gui.exporter.ExportCommand;
 import org.jabref.gui.exporter.ExportToClipboardAction;
-import org.jabref.gui.exporter.ManageCustomExportsAction;
 import org.jabref.gui.exporter.SaveAction;
 import org.jabref.gui.exporter.SaveAllAction;
 import org.jabref.gui.exporter.SaveDatabaseAction;
@@ -90,15 +88,12 @@
 import org.jabref.gui.help.SearchForUpdateAction;
 import org.jabref.gui.importer.ImportCommand;
 import org.jabref.gui.importer.ImportEntriesDialog;
-import org.jabref.gui.importer.ManageCustomImportsAction;
 import org.jabref.gui.importer.NewDatabaseAction;
 import org.jabref.gui.importer.NewEntryAction;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.importer.fetcher.LookupIdentifierAction;
 import org.jabref.gui.integrity.IntegrityCheckAction;
 import org.jabref.gui.journals.AbbreviateAction;
-import org.jabref.gui.journals.ManageJournalsAction;
-import org.jabref.gui.keyboard.CustomizeKeyBindingAction;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.libraryproperties.LibraryPropertiesAction;
@@ -108,7 +103,6 @@
 import org.jabref.gui.metadata.PreambleEditor;
 import org.jabref.gui.preferences.ShowPreferencesAction;
 import org.jabref.gui.preview.CopyCitationAction;
-import org.jabref.gui.protectedterms.ManageProtectedTermsAction;
 import org.jabref.gui.push.PushToApplicationAction;
 import org.jabref.gui.push.PushToApplicationsManager;
 import org.jabref.gui.search.GlobalSearchBar;
@@ -851,15 +845,6 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
-                factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
-                factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
-                factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction()),
-
-                new SeparatorMenuItem(),
-
                 factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new ManageContentSelectorAction(this, stateManager)),
                 factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(stateManager, Globals.entryTypesManager))
         );
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
index ac61606744c..4d004e980c3 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
@@ -2,6 +2,8 @@
 
 import java.util.Collection;
 
+import javax.inject.Inject;
+
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
@@ -27,16 +29,16 @@ public class CitationKeyPatternPanel extends TableView<CitationKeyPatternPanelIt
     @FXML public TableColumn<CitationKeyPatternPanelItemModel, String> patternColumn;
     @FXML public TableColumn<CitationKeyPatternPanelItemModel, EntryType> actionsColumn;
 
+    @Inject private PreferencesService preferences;
+
     private CitationKeyPatternPanelViewModel viewModel;
 
     private long lastKeyPressTime;
     private String tableSearchTerm;
 
-    public CitationKeyPatternPanel(PreferencesService preferences, Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern keyPattern) {
+    public CitationKeyPatternPanel() {
         super();
 
-        viewModel = new CitationKeyPatternPanelViewModel(preferences, entryTypeList, keyPattern);
-
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -44,6 +46,8 @@ public CitationKeyPatternPanel(PreferencesService preferences, Collection<BibEnt
 
     @FXML
     private void initialize() {
+        viewModel = new CitationKeyPatternPanelViewModel(preferences);
+
         this.setEditable(true);
 
         entryTypeColumn.setSortable(true);
@@ -80,8 +84,8 @@ private void initialize() {
         this.itemsProperty().bindBidirectional(viewModel.patternListProperty());
     }
 
-    public void setValues() {
-        viewModel.setValues();
+    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern keyPattern) {
+        viewModel.setValues(entryTypeList, keyPattern);
     }
 
     public void resetAll() {
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
index fa3a1978b29..95416561b23 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
@@ -36,17 +36,14 @@ public class CitationKeyPatternPanelViewModel {
 
     private final ListProperty<CitationKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>();
     private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultItemProperty = new SimpleObjectProperty<>();
-    private final AbstractCitationKeyPattern initialKeyPattern;
-    private final Collection<BibEntryType> bibEntryTypeList;
+
     private final PreferencesService preferences;
 
-    public CitationKeyPatternPanelViewModel(PreferencesService preferences, Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern initialKeyPattern) {
+    public CitationKeyPatternPanelViewModel(PreferencesService preferences) {
         this.preferences = preferences;
-        this.bibEntryTypeList = entryTypeList;
-        this.initialKeyPattern = initialKeyPattern;
     }
 
-    public void setValues() {
+    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern initialKeyPattern) {
         String defaultPattern;
         if ((initialKeyPattern.getDefaultValue() == null) || initialKeyPattern.getDefaultValue().isEmpty()) {
             defaultPattern = "";
@@ -58,17 +55,17 @@ public void setValues() {
         patternListProperty.setValue(FXCollections.observableArrayList());
         patternListProperty.add(defaultItemProperty.getValue());
 
-        bibEntryTypeList.stream()
-                        .map(BibEntryType::getType)
-                        .forEach(entryType -> {
-                            String pattern;
-                            if (initialKeyPattern.isDefaultValue(entryType)) {
-                                pattern = "";
-                            } else {
-                                pattern = initialKeyPattern.getPatterns().get(entryType).get(0);
-                            }
-                            patternListProperty.add(new CitationKeyPatternPanelItemModel(entryType, pattern));
-                        });
+        entryTypeList.stream()
+                     .map(BibEntryType::getType)
+                     .forEach(entryType -> {
+                         String pattern;
+                         if (initialKeyPattern.isDefaultValue(entryType)) {
+                             pattern = "";
+                         } else {
+                             pattern = initialKeyPattern.getPatterns().get(entryType).get(0);
+                         }
+                         patternListProperty.add(new CitationKeyPatternPanelItemModel(entryType, pattern));
+                     });
     }
 
     public void setItemToDefaultPattern(CitationKeyPatternPanelItemModel item) {
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml
deleted file mode 100644
index fe006e915c4..00000000000
--- a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialog.fxml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="org.jabref.gui.customizefields.CustomizeGeneralFieldsDialogView">
-    <content>
-        <VBox prefHeight="300.0" prefWidth="650.0">
-            <children>
-                <Label text="%General Fields"/>
-                <Label text="%Create custom fields for each BibTeX entry"/>
-                <TextArea fx:id="fieldsTextArea" minHeight="200.0" minWidth="628.0"/>
-                <Label text="%Format: Tab:field;field;... (e.g. General:url;pdf;note...)"/>
-            </children>
-        </VBox>
-    </content>
-    <ButtonType fx:id="okButton" fx:constant="OK"/>
-    <ButtonType fx:id="resetButton" buttonData="LEFT" text="%Default"/>
-    <ButtonType fx:id="helpButton" text="%Help"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java
deleted file mode 100644
index e132fa01507..00000000000
--- a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogView.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.gui.customizefields;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.TextArea;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class CustomizeGeneralFieldsDialogView extends BaseDialog<Void> {
-
-    @FXML private ButtonType resetButton;
-    @FXML private ButtonType helpButton;
-    @FXML private ButtonType okButton;
-    @FXML private TextArea fieldsTextArea;
-
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
-    private CustomizeGeneralFieldsDialogViewModel viewModel;
-
-    public CustomizeGeneralFieldsDialogView() {
-        this.setTitle(Localization.lang("Set General Fields"));
-        this.setResizable(true);
-        this.getDialogPane().setPrefSize(300, 650);
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        ControlHelper.setAction(helpButton, getDialogPane(), event -> new HelpAction(HelpFile.GENERAL_FIELDS).execute());
-        ControlHelper.setAction(resetButton, getDialogPane(), event -> resetFields());
-        ControlHelper.setAction(okButton, getDialogPane(), event -> saveFieldsAndCloseDialog());
-    }
-
-    @FXML
-    private void initialize() {
-        viewModel = new CustomizeGeneralFieldsDialogViewModel(dialogService, preferences);
-        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsTextProperty());
-    }
-
-    @FXML
-    private void closeDialog() {
-        close();
-    }
-
-    @FXML
-    private void saveFieldsAndCloseDialog() {
-        viewModel.saveFields();
-        closeDialog();
-    }
-
-    private void resetFields() {
-        viewModel.resetFields();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/customizefields/SetupGeneralFieldsAction.java b/src/main/java/org/jabref/gui/customizefields/SetupGeneralFieldsAction.java
deleted file mode 100644
index e3c6cca6d40..00000000000
--- a/src/main/java/org/jabref/gui/customizefields/SetupGeneralFieldsAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jabref.gui.customizefields;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class SetupGeneralFieldsAction extends SimpleCommand {
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new CustomizeGeneralFieldsDialogView());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
deleted file mode 100644
index 9a2749a10ca..00000000000
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialog.fxml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.171"
-            fx:controller="org.jabref.gui.exporter.ExportCustomizationDialogView">
-    <content>
-        <VBox prefHeight="200.0" prefWidth="500.0">
-            <children>
-                <TableView fx:id="exporterTable" prefHeight="150.0" prefWidth="500.0">
-                    <columns>
-                        <TableColumn fx:id="nameColumn" prefWidth="150.0" text="%Export name"/>
-                        <TableColumn fx:id="layoutColumn" prefWidth="250.0" text="%Main layout file"/>
-                        <TableColumn fx:id="extensionColumn" prefWidth="100.0" text="%Extension"/>
-                    </columns>
-                </TableView>
-            </children>
-        </VBox>
-    </content>
-    <ButtonType fx:id="addButton" text="%Add"/>
-    <ButtonType fx:id="modifyButton" text="%Modify"/>
-    <ButtonType fx:id="removeButton" text="%Remove"/>
-    <ButtonType fx:id="closeButton" fx:constant="OK"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java b/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
deleted file mode 100644
index 4d698aabb7c..00000000000
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.jabref.gui.exporter;
-
-import javax.inject.Inject;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-public class ExportCustomizationDialogView extends BaseDialog<Void> {
-
-    @FXML private ButtonType addButton;
-    @FXML private ButtonType modifyButton;
-    @FXML private ButtonType removeButton;
-    @FXML private ButtonType closeButton;
-    @FXML private TableView<ExporterViewModel> exporterTable;
-    @FXML private TableColumn<ExporterViewModel, String> nameColumn;
-    @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
-    @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
-
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
-    @Inject private JournalAbbreviationRepository repository;
-    private ExportCustomizationDialogViewModel viewModel;
-
-    public ExportCustomizationDialogView() {
-        this.setTitle(Localization.lang("Customize Export Formats"));
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        ControlHelper.setAction(addButton, getDialogPane(), event -> viewModel.addExporter());
-        ControlHelper.setAction(modifyButton, getDialogPane(), event -> viewModel.modifyExporter());
-        ControlHelper.setAction(removeButton, getDialogPane(), event -> viewModel.removeExporters());
-        ControlHelper.setAction(closeButton, getDialogPane(), event -> {
-            viewModel.saveToPrefs();
-            close();
-        });
-    }
-
-    @FXML
-    private void initialize() {
-        viewModel = new ExportCustomizationDialogViewModel(preferences, dialogService, repository);
-        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        exporterTable.itemsProperty().bind(viewModel.exportersProperty());
-        EasyBind.bindContent(viewModel.selectedExportersProperty(), exporterTable.getSelectionModel().getSelectedItems());
-        nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
-        layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
-        extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/exporter/ManageCustomExportsAction.java b/src/main/java/org/jabref/gui/exporter/ManageCustomExportsAction.java
deleted file mode 100644
index 9c06dd48f93..00000000000
--- a/src/main/java/org/jabref/gui/exporter/ManageCustomExportsAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jabref.gui.exporter;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class ManageCustomExportsAction extends SimpleCommand {
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialog(new ExportCustomizationDialogView());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml
deleted file mode 100644
index ef7ac89babb..00000000000
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.fxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.171"
-            fx:controller="org.jabref.gui.importer.ImportCustomizationDialog">
-    <content>
-        <TableView fx:id="importerTable">
-            <columns>
-                <TableColumn fx:id="nameColumn" prefWidth="150.0" text="%Import name"/>
-                <TableColumn fx:id="classColumn" prefWidth="100.0" text="%Importer class"/>
-                <TableColumn fx:id="basePathColumn" prefWidth="100.0" text="%Contained in"/>
-            </columns>
-        </TableView>
-    </content>
-    <ButtonType fx:id="addButton" text="%Add"/>
-    <ButtonType fx:id="removeButton" text="%Remove"/>
-    <ButtonType fx:id="closeButton" fx:constant="OK"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/importer/ManageCustomImportsAction.java b/src/main/java/org/jabref/gui/importer/ManageCustomImportsAction.java
deleted file mode 100644
index 9d5a28d34ea..00000000000
--- a/src/main/java/org/jabref/gui/importer/ManageCustomImportsAction.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jabref.gui.importer;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class ManageCustomImportsAction extends SimpleCommand {
-
-    public ManageCustomImportsAction() {
-    }
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialog(new ImportCustomizationDialog());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml
deleted file mode 100644
index f88396face3..00000000000
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.fxml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ProgressIndicator?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="500.0" prefWidth="800.0"
-            xmlns="http://javafx.com/javafx/8.0.65"
-            fx:controller="org.jabref.gui.journals.ManageJournalAbbreviationsView">
-    <content>
-        <TableView fx:id="journalAbbreviationsTable" editable="true" styleClass="abbreviations-table">
-            <columns>
-                <TableColumn fx:id="journalTableNameColumn" prefWidth="400.0" text="%Full journal name"/>
-                <TableColumn fx:id="journalTableAbbreviationColumn" prefWidth="200.0" text="%Abbreviation name"/>
-                <TableColumn fx:id="journalTableShortestUniqueAbbreviationColumn" prefWidth="200.0"
-                             text="%Shortest unique abbreviation"/>
-            </columns>
-            <columnResizePolicy>
-                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-            </columnResizePolicy>
-            <placeholder>
-                <Label fx:id="loadingLabel" maxHeight="30.0" text="%Loading built in lists"/>
-                <ProgressIndicator fx:id="progressIndicator" maxHeight="30.0" opacity="0.4"/>
-            </placeholder>
-        </TableView>
-    </content>
-    <header>
-        <HBox styleClass="custom-header">
-            <Button fx:id="addAbbreviationListButton" mnemonicParsing="false" onAction="#addList" styleClass="icon">
-                <tooltip>
-                    <Tooltip autoHide="true" text="%Add new list"/>
-                </tooltip>
-            </Button>
-            <Button fx:id="openAbbreviationListButton" mnemonicParsing="false" onAction="#openList" styleClass="icon">
-                <tooltip>
-                    <Tooltip autoHide="true" text="%Open existing list"/>
-                </tooltip>
-            </Button>
-            <Button fx:id="removeAbbreviationListButton" mnemonicParsing="false" onAction="#removeList"
-                    styleClass="icon">
-                <tooltip>
-                    <Tooltip autoHide="true" text="%Remove list"/>
-                </tooltip>
-            </Button>
-            <Pane HBox.hgrow="ALWAYS"/>
-            <ComboBox fx:id="journalFilesBox" minWidth="200.0" promptText="%No abbreviation files loaded"
-                      HBox.hgrow="ALWAYS"/>
-            <Pane HBox.hgrow="ALWAYS"/>
-            <Button fx:id="addAbbreviationButton" mnemonicParsing="false" onAction="#addAbbreviation" styleClass="icon">
-                <tooltip>
-                    <Tooltip autoHide="true" text="%Add abbreviation"/>
-                </tooltip>
-            </Button>
-            <Button fx:id="removeAbbreviationButton" mnemonicParsing="false" onAction="#removeAbbreviation"
-                    styleClass="icon">
-                <tooltip>
-                    <Tooltip autoHide="true" text="%Remove abbreviation"/>
-                </tooltip>
-            </Button>
-        </HBox>
-    </header>
-    <ButtonType fx:id="saveButton" text="%Save changes" buttonData="OK_DONE"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java b/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java
deleted file mode 100644
index 07b6b9be911..00000000000
--- a/src/main/java/org/jabref/gui/journals/ManageJournalsAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jabref.gui.journals;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class ManageJournalsAction extends SimpleCommand {
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialog(new ManageJournalAbbreviationsView());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/keyboard/CustomizeKeyBindingAction.java b/src/main/java/org/jabref/gui/keyboard/CustomizeKeyBindingAction.java
deleted file mode 100644
index 2eae884d30b..00000000000
--- a/src/main/java/org/jabref/gui/keyboard/CustomizeKeyBindingAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jabref.gui.keyboard;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class CustomizeKeyBindingAction extends SimpleCommand {
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialog(new KeyBindingsDialogView());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
index 1e2a4c23a8f..05ecd14a34e 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -16,22 +16,21 @@
 
 import org.jabref.logic.util.OS;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class KeyBindingRepository {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(KeyBindingRepository.class);
     /**
      * sorted by localization
      */
     private final SortedMap<KeyBinding, String> bindings;
-    private final int shortcutMask = -1;
 
     public KeyBindingRepository() {
         this(Collections.emptyList(), Collections.emptyList());
     }
 
+    public KeyBindingRepository(SortedMap<KeyBinding, String> bindings) {
+        this.bindings = bindings;
+    }
+
     public KeyBindingRepository(List<String> bindNames, List<String> bindings) {
         this.bindings = new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization));
 
@@ -139,11 +138,8 @@ public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
      * @return true if matching, else false
      */
     public boolean checkKeyCombinationEquality(KeyBinding binding, KeyEvent keyEvent) {
-        Optional<KeyCombination> keyCombination = getKeyCombination(binding);
-        if (!keyCombination.isPresent()) {
-            return false;
-        }
-        return checkKeyCombinationEquality(keyCombination.get(), keyEvent);
+        return getKeyCombination(binding).filter(combination -> checkKeyCombinationEquality(combination, keyEvent))
+                                         .isPresent();
     }
 
     public List<String> getBindNames() {
@@ -153,4 +149,23 @@ public List<String> getBindNames() {
     public List<String> getBindings() {
         return new ArrayList<>(bindings.values());
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        KeyBindingRepository that = (KeyBindingRepository) o;
+
+        return bindings.equals(that.bindings);
+    }
+
+    @Override
+    public int hashCode() {
+        return bindings.hashCode();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml b/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
deleted file mode 100644
index 076e1465146..00000000000
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.fxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.MenuButton?>
-<?import javafx.scene.control.TreeTableColumn?>
-<?import javafx.scene.control.TreeTableView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane xmlns:fx="http://javafx.com/fxml/1" minHeight="450.0" minWidth="375.0" prefHeight="450.0" prefWidth="407.0"
-            xmlns="http://javafx.com/javafx/8.0.65" fx:controller="org.jabref.gui.keyboard.KeyBindingsDialogView">
-    <content>
-        <VBox spacing="4">
-            <TreeTableView fx:id="keyBindingsTable" showRoot="false" styleClass="keybinding-table">
-                <columns>
-                    <TreeTableColumn fx:id="actionColumn" prefWidth="200.0" text="%Action"/>
-                    <TreeTableColumn fx:id="shortcutColumn" prefWidth="100.0" text="%Shortcut"/>
-                    <TreeTableColumn fx:id="resetColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
-                    <TreeTableColumn fx:id="clearColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
-                </columns>
-                <columnResizePolicy>
-                    <TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                </columnResizePolicy>
-            </TreeTableView>
-            <HBox spacing="4" alignment="CENTER_RIGHT">
-                <MenuButton fx:id="presetsButton" text="%Presets"/>
-            </HBox>
-        </VBox>
-    </content>
-    <ButtonType fx:id="resetButton" text="%Reset Bindings" buttonData="LEFT"/>
-    <ButtonType fx:id="saveButton" text="%Save" buttonData="OK_DONE"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index 7d9f56fe727..354d6a5457a 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -15,11 +15,10 @@ public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel
 
     @Inject protected TaskExecutor taskExecutor;
     @Inject protected DialogService dialogService;
+    @Inject protected PreferencesService preferencesService;
 
     protected T viewModel;
 
-    protected PreferencesService preferences;
-
     @Override
     public Node getBuilder() {
         return this;
diff --git a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
index ea6f9da1e9a..06821b7ff2a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences;
 
+import java.util.Collections;
 import java.util.List;
 
 public interface PreferenceTabViewModel {
@@ -28,7 +29,9 @@ public interface PreferenceTabViewModel {
      * If the tab is *not* ready, it should display a message to the user
      * informing about the illegal setting.
      */
-    boolean validateSettings();
+    default boolean validateSettings() {
+        return true;
+    }
 
     /**
      * This method should be called after storing the preferences, to
@@ -36,5 +39,7 @@ public interface PreferenceTabViewModel {
      *
      * @return The messages for the changed properties (e. g. "Changed language: English")
      */
-    List<String> getRestartWarnings();
+    default List<String> getRestartWarnings() {
+        return Collections.emptyList();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index c617544ca8b..1b1e95c675b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -26,7 +26,7 @@
     -fx-background-color: transparent;
 }
 
-#preferencesContainer {
+.preferencesTab {
     -fx-padding: 0.5em;
 }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 409da11c471..4434809a34f 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -17,7 +17,7 @@
             fx:controller="org.jabref.gui.preferences.PreferencesDialogView">
     <content>
         <SplitPane dividerPositions="0.2">
-            <VBox id="sidepane" prefWidth="160.0">
+            <VBox id="sidepane">
                 <CustomTextField fx:id="searchBox" promptText="%Search" VBox.vgrow="NEVER">
                     <VBox.margin>
                         <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
@@ -63,7 +63,7 @@
                     </Button>
                 </HBox>
             </VBox>
-            <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
+            <ScrollPane fx:id="preferencesContainer"/>
         </SplitPane>
     </content>
     <ButtonType fx:id="saveButton" text="%Save" buttonData="OK_DONE"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index ecd5b5f9196..e0aae949844 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -82,6 +82,8 @@ private void initialize() {
                 preferencesContainer.setContent(null);
             } else {
                 preferencesContainer.setContent(tab.getBuilder());
+                ((AbstractPreferenceTabView<?>) tab).prefWidthProperty().bind(preferencesContainer.widthProperty());
+                ((AbstractPreferenceTabView<?>) tab).getStyleClass().add("preferencesTab");
             }
         });
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index f563af54293..19cb6e80139 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -12,6 +12,25 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.preferences.appearance.AppearanceTab;
+import org.jabref.gui.preferences.citationkeypattern.CitationKeyPatternTab;
+import org.jabref.gui.preferences.entryeditor.EntryEditorTab;
+import org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab;
+import org.jabref.gui.preferences.exporter.ExportCustomizationTab;
+import org.jabref.gui.preferences.external.ExternalTab;
+import org.jabref.gui.preferences.file.FileTab;
+import org.jabref.gui.preferences.general.GeneralTab;
+import org.jabref.gui.preferences.groups.GroupsTab;
+import org.jabref.gui.preferences.importer.ImportCustomizationTab;
+import org.jabref.gui.preferences.journals.JournalAbbreviationsTab;
+import org.jabref.gui.preferences.keybindings.KeyBindingsTab;
+import org.jabref.gui.preferences.linkedfiles.LinkedFilesTab;
+import org.jabref.gui.preferences.nameformatter.NameFormatterTab;
+import org.jabref.gui.preferences.network.NetworkTab;
+import org.jabref.gui.preferences.preview.PreviewTab;
+import org.jabref.gui.preferences.protectedterms.ProtectedTermsTab;
+import org.jabref.gui.preferences.table.TableTab;
+import org.jabref.gui.preferences.xmp.XmpPrivacyTab;
 import org.jabref.gui.push.PushToApplicationsManager;
 import org.jabref.gui.push.PushToEmacs;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -45,19 +64,25 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
         this.frame = frame;
 
         preferenceTabs = FXCollections.observableArrayList(
-                new GeneralTabView(preferences),
-                new FileTabView(preferences),
-                new TableTabView(preferences),
-                new PreviewTabView(preferences),
-                new ExternalTabView(preferences, frame.getPushToApplicationsManager()),
-                new GroupsTabView(preferences),
-                new EntryEditorTabView(preferences),
-                new CitationKeyPatternTabView(preferences),
-                new LinkedFilesTabView(preferences),
-                new NameFormatterTabView(preferences),
-                new XmpPrivacyTabView(preferences),
-                new NetworkTabView(preferences),
-                new AppearanceTabView(preferences)
+                new GeneralTab(),
+                new KeyBindingsTab(),
+                new FileTab(),
+                new TableTab(),
+                new PreviewTab(),
+                new ProtectedTermsTab(),
+                new ExternalTab(frame.getPushToApplicationsManager()),
+                new JournalAbbreviationsTab(),
+                new GroupsTab(),
+                new EntryEditorTab(),
+                new CustomEditorFieldsTab(),
+                new CitationKeyPatternTab(),
+                new LinkedFilesTab(),
+                new NameFormatterTab(),
+                new ImportCustomizationTab(),
+                new ExportCustomizationTab(),
+                new XmpPrivacyTab(),
+                new NetworkTab(),
+                new AppearanceTab()
         );
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
index 21f0c851b4c..d038e49622f 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
@@ -9,7 +9,7 @@
  * <p>
  * It needs to extend from Component.
  */
-interface PreferencesTab {
+public interface PreferencesTab {
 
     Node getBuilder();
 
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml
similarity index 85%
rename from src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
rename to src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml
index 5ce4ec3838d..211da3212d4 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml
@@ -11,11 +11,10 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-
 <?import org.jabref.gui.icon.JabRefIconView?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.AppearanceTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.appearance.AppearanceTab">
     <fx:define>
         <ToggleGroup fx:id="theme"/>
     </fx:define>
@@ -36,7 +35,7 @@
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
     <HBox alignment="CENTER_LEFT" spacing="4.0">
         <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
-        <TextField fx:id="customThemePath" prefWidth="350.0" disable="${!customTheme.selected}"/>
+        <TextField fx:id="customThemePath" HBox.hgrow="ALWAYS" disable="${!customTheme.selected}"/>
         <Button onAction="#importTheme" disable="${!customTheme.selected}"
                 styleClass="icon-button,narrow"
                 prefHeight="20.0" prefWidth="20.0">
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java
similarity index 78%
rename from src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
rename to src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java
index 5cc081ab043..a731fbf24db 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.appearance;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -8,27 +8,26 @@
 import javafx.scene.control.Spinner;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class AppearanceTabView extends AbstractPreferenceTabView<AppearanceTabViewModel> implements PreferencesTab {
+public class AppearanceTab extends AbstractPreferenceTabView<AppearanceTabViewModel> implements PreferencesTab {
 
-    @FXML public CheckBox fontOverride;
-    @FXML public Spinner<Integer> fontSize;
-    @FXML public RadioButton themeLight;
-    @FXML public RadioButton themeDark;
-    @FXML public RadioButton customTheme;
-    @FXML public TextField customThemePath;
+    @FXML private CheckBox fontOverride;
+    @FXML private Spinner<Integer> fontSize;
+    @FXML private RadioButton themeLight;
+    @FXML private RadioButton themeDark;
+    @FXML private RadioButton customTheme;
+    @FXML private TextField customThemePath;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public AppearanceTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public AppearanceTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -40,7 +39,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new AppearanceTabViewModel(dialogService, preferences);
+        this.viewModel = new AppearanceTabViewModel(dialogService, preferencesService);
 
         fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
 
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java
index d66b6d5ab3f..e67f7cc0c20 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.appearance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +10,7 @@
 import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.Theme;
 import org.jabref.logic.l10n.Localization;
diff --git a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTab.fxml b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.fxml
similarity index 84%
rename from src/main/java/org/jabref/gui/preferences/CitationKeyPatternTab.fxml
rename to src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.fxml
index c1f334e350a..ffa76c70fbd 100644
--- a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.fxml
@@ -10,9 +10,10 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.CitationKeyPatternTabView">
+<?import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanel?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.citationkeypattern.CitationKeyPatternTab">
     <fx:define>
         <ToggleGroup fx:id="uniqueKeyLetters"/>
     </fx:define>
@@ -38,7 +39,7 @@
     </VBox>
 
     <Label text="%Replace (regular expression)"/>
-    <HBox prefWidth="Infinity" spacing="4.0" alignment="CENTER">
+    <HBox spacing="4.0" alignment="CENTER">
         <TextField fx:id="keyPatternRegex" HBox.hgrow="ALWAYS"/>
         <Label text="%by"/>
         <TextField fx:id="keyPatternReplacement" HBox.hgrow="ALWAYS"/>
@@ -52,14 +53,14 @@
         <TextField fx:id="unwantedCharacters" HBox.hgrow="ALWAYS"/>
     </HBox>
 
-    <HBox prefWidth="650.0">
+    <HBox>
         <Label styleClass="sectionHeader" text="%Key patterns"/>
         <HBox HBox.hgrow="ALWAYS"/>
         <Button fx:id="keyPatternHelp" prefWidth="20.0"/>
     </HBox>
     <Label text="%( Note: Press return to commit changes in the table! )"/>
     <AnchorPane>
-        <HBox fx:id="keyPatternContainer" prefWidth="650.0" prefHeight="180.0"/>
+        <CitationKeyPatternPanel fx:id="bibtexKeyPatternTable" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" prefHeight="180.0"/>
         <Button text="%Reset All" onAction="#resetAllKeyPatterns" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </AnchorPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabView.java b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
similarity index 66%
rename from src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabView.java
rename to src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
index 5bf4474436c..325493c520f 100644
--- a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -1,46 +1,38 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.citationkeypattern;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.HBox;
 
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanel;
 import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class CitationKeyPatternTabView extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel> implements PreferencesTab {
-
-    @FXML public CheckBox overwriteAllow;
-    @FXML public CheckBox overwriteWarning;
-    @FXML public CheckBox generateOnSave;
-    @FXML public RadioButton letterStartA;
-    @FXML public RadioButton letterStartB;
-    @FXML public RadioButton letterAlwaysAdd;
-    @FXML public TextField keyPatternRegex;
-    @FXML public TextField keyPatternReplacement;
-    @FXML public TextField unwantedCharacters;
-    @FXML public HBox keyPatternContainer;
-    @FXML public Button keyPatternHelp;
-
-    private final CitationKeyPatternPanel bibtexKeyPatternTable;
-
-    public CitationKeyPatternTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
-        bibtexKeyPatternTable = new CitationKeyPatternPanel(preferences,
-                Globals.entryTypesManager.getAllTypes(preferences.getGeneralPreferences().getDefaultBibDatabaseMode()),
-                preferences.getGlobalCitationKeyPattern());
-
+public class CitationKeyPatternTab extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel> implements PreferencesTab {
+
+    @FXML private CheckBox overwriteAllow;
+    @FXML private CheckBox overwriteWarning;
+    @FXML private CheckBox generateOnSave;
+    @FXML private RadioButton letterStartA;
+    @FXML private RadioButton letterStartB;
+    @FXML private RadioButton letterAlwaysAdd;
+    @FXML private TextField keyPatternRegex;
+    @FXML private TextField keyPatternReplacement;
+    @FXML private TextField unwantedCharacters;
+    @FXML private Button keyPatternHelp;
+    @FXML private CitationKeyPatternPanel bibtexKeyPatternTable;
+
+    public CitationKeyPatternTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -52,7 +44,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new CitationKeyPatternTabViewModel(dialogService, preferences);
+        this.viewModel = new CitationKeyPatternTabViewModel(dialogService, preferencesService);
 
         overwriteAllow.selectedProperty().bindBidirectional(viewModel.overwriteAllowProperty());
         overwriteWarning.selectedProperty().bindBidirectional(viewModel.overwriteWarningProperty());
@@ -64,10 +56,8 @@ public void initialize() {
         keyPatternReplacement.textProperty().bindBidirectional(viewModel.keyPatternReplacementProperty());
         unwantedCharacters.textProperty().bindBidirectional(viewModel.unwantedCharactersProperty());
 
-        bibtexKeyPatternTable.setPrefWidth(650.0);
         bibtexKeyPatternTable.patternListProperty().bindBidirectional(viewModel.patternListProperty());
         bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
-        keyPatternContainer.getChildren().add(bibtexKeyPatternTable);
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN), keyPatternHelp);
@@ -76,7 +66,9 @@ public void initialize() {
     @Override
     public void setValues() {
         viewModel.setValues();
-        bibtexKeyPatternTable.setValues();
+        bibtexKeyPatternTable.setValues(
+                Globals.entryTypesManager.getAllTypes(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode()),
+                preferencesService.getGlobalCitationKeyPattern());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabViewModel.java b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
similarity index 96%
rename from src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
index 324d4cba644..53eb2a398e3 100644
--- a/src/main/java/org/jabref/gui/preferences/CitationKeyPatternTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
@@ -1,7 +1,4 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
+package org.jabref.gui.preferences.citationkeypattern;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -16,6 +13,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelItemModel;
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelViewModel;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.preferences.PreferencesService;
@@ -114,16 +112,6 @@ public void storeSettings() {
                 initialCitationKeyPatternPreferences.getKeywordDelimiter()));
     }
 
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public BooleanProperty overwriteAllowProperty() {
         return overwriteAllowProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
similarity index 89%
rename from src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
rename to src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 4458fb6ee94..982bec5cc36 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -8,8 +8,9 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.EntryEditorTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.entryeditor.EntryEditorTab">
     <Label styleClass="titleHeader" text="%Entry editor"/>
     <fx:define>
         <ToggleGroup fx:id="nameFormat"/>
@@ -33,8 +34,7 @@
     <VBox spacing="10.0">
         <HBox spacing="4.0">
             <Label text="%Affected fields:" disable="${!enableAutoComplete.selected}"/>
-            <TextField fx:id="autoCompleteFields" prefWidth="250.0" HBox.hgrow="ALWAYS"
-                       disable="${!enableAutoComplete.selected}">
+            <TextField fx:id="autoCompleteFields" HBox.hgrow="ALWAYS" disable="${!enableAutoComplete.selected}">
                 <HBox.margin>
                     <Insets top="-4.0"/>
                 </HBox.margin>
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
similarity index 89%
rename from src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
rename to src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
index 9d6afafe3dd..836387b5a0b 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -1,16 +1,17 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.entryeditor;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class EntryEditorTabView extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
+public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox openOnNewEntry;
     @FXML private CheckBox defaultSource;
@@ -27,8 +28,7 @@ public class EntryEditorTabView extends AbstractPreferenceTabView<EntryEditorTab
     @FXML private RadioButton firstNameModeFull;
     @FXML private RadioButton firstNameModeBoth;
 
-    public EntryEditorTabView(PreferencesService preferences) {
-        this.preferences = preferences;
+    public EntryEditorTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -40,7 +40,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new EntryEditorTabViewModel(dialogService, preferences);
+        this.viewModel = new EntryEditorTabViewModel(dialogService, preferencesService);
 
         openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
         defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 9f6e2b512f0..69bcb004d32 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.entryeditor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +12,7 @@
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.PreferencesService;
@@ -121,11 +122,6 @@ public void storeSettings() {
                 preferencesService.getJournalAbbreviationPreferences()));
     }
 
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
     @Override
     public List<String> getRestartWarnings() {
         return restartWarnings;
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
new file mode 100644
index 00000000000..ffbec77e841
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab">
+
+    <Label styleClass="titleHeader" text="%Custom editor tabs"/>
+
+    <HBox>
+        <Label text="%Create custom fields for each BibTeX entry"/>
+        <HBox HBox.hgrow="ALWAYS"/>
+        <Button fx:id="generalFieldsHelp"/>
+        <Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetToDefaults">
+            <graphic>
+                <JabRefIconView glyph="REFRESH"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Reset to default"/>
+            </tooltip>
+        </Button>
+    </HBox>
+
+    <TextArea fx:id="fieldsTextArea" minHeight="200.0"/>
+
+    <Label text="%Format: Tab:field;field;... (e.g. General:url;pdf;note...)"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
new file mode 100644
index 00000000000..f00fbe24ee8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
@@ -0,0 +1,47 @@
+package org.jabref.gui.preferences.entryeditortabs;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class CustomEditorFieldsTab extends AbstractPreferenceTabView<CustomEditorFieldsTabViewModel> implements PreferencesTab {
+
+    @FXML private Button generalFieldsHelp;
+    @FXML private TextArea fieldsTextArea;
+
+    public CustomEditorFieldsTab() {
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Custom editor tabs");
+    }
+
+    public void initialize() {
+        viewModel = new CustomEditorFieldsTabViewModel(dialogService, preferencesService);
+
+        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
+
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS), generalFieldsHelp);
+    }
+
+    @FXML
+    void resetToDefaults() {
+        viewModel.resetToDefaults();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
similarity index 74%
rename from src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
rename to src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
index cfbd0eda0a2..e1748e6c493 100644
--- a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.customizefields;
+package org.jabref.gui.preferences.entryeditortabs;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -8,27 +8,35 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.PreferencesService;
 
-public class CustomizeGeneralFieldsDialogViewModel {
+public class CustomEditorFieldsTabViewModel implements PreferenceTabViewModel {
+
+    private final StringProperty fieldsProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
-    private final StringProperty fieldsText = new SimpleStringProperty("");
 
-    public CustomizeGeneralFieldsDialogViewModel(DialogService dialogService, PreferencesService preferences) {
+    public CustomEditorFieldsTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
+    }
+
+    @Override
+    public void setValues() {
+        setFields(preferences.getEntryEditorTabList());
+    }
 
-        // Using stored custom values or, if they do not exist, default values
-        setFieldsText(preferences.getEntryEditorTabList());
+    public void resetToDefaults() {
+        setFields(preferences.getDefaultTabNamesAndFields());
     }
 
-    private void setFieldsText(Map<String, Set<Field>> tabNamesAndFields) {
+    private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
         StringBuilder sb = new StringBuilder();
 
         // Fill with customized vars
@@ -38,16 +46,13 @@ private void setFieldsText(Map<String, Set<Field>> tabNamesAndFields) {
             sb.append(FieldFactory.serializeFieldsList(tab.getValue()));
             sb.append('\n');
         }
-        fieldsText.set(sb.toString());
-    }
-
-    public StringProperty fieldsTextProperty() {
-        return fieldsText;
+        fieldsProperty.set(sb.toString());
     }
 
-    public void saveFields() {
+    @Override
+    public void storeSettings() {
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
-        String[] lines = fieldsText.get().split("\n");
+        String[] lines = fieldsProperty.get().split("\n");
 
         for (String line : lines) {
             String[] parts = line.split(":");
@@ -77,8 +82,7 @@ public void saveFields() {
         preferences.storeEntryEditorTabList(customTabsMap);
     }
 
-    public void resetFields() {
-        // Using default values
-        setFieldsText(preferences.getDefaultTabNamesAndFields());
+    public StringProperty fieldsProperty() {
+        return fieldsProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.fxml b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.fxml
new file mode 100644
index 00000000000..3ea05a0cb91
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.exporter.ExportCustomizationTab">
+
+    <Label styleClass="titleHeader" text="%Custom export formats"/>
+
+    <TableView fx:id="exporterTable">
+        <columns>
+            <TableColumn fx:id="nameColumn" text="%Export name"/>
+            <TableColumn fx:id="layoutColumn" text="%Main layout file"/>
+            <TableColumn fx:id="extensionColumn" text="%Extension"/>
+        </columns>
+        <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+    </TableView>
+
+    <HBox alignment="BASELINE_RIGHT" spacing="10.0">
+        <Button onAction="#add" text="%Add" prefWidth="80.0"/>
+        <Button onAction="#modify" text="%Modify" prefWidth="80.0"/>
+        <Button onAction="#remove" text="%Remove" prefWidth="80.0"/>
+    </HBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.java b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.java
new file mode 100644
index 00000000000..d962f35f1b1
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTab.java
@@ -0,0 +1,65 @@
+package org.jabref.gui.preferences.exporter;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+
+import org.jabref.gui.exporter.ExporterViewModel;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+
+public class ExportCustomizationTab extends AbstractPreferenceTabView<ExportCustomizationTabViewModel> implements PreferencesTab {
+
+    @FXML private TableView<ExporterViewModel> exporterTable;
+    @FXML private TableColumn<ExporterViewModel, String> nameColumn;
+    @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
+    @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
+
+    @Inject private JournalAbbreviationRepository repository;
+
+    public ExportCustomizationTab() {
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Custom export formats");
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new ExportCustomizationTabViewModel(preferencesService, dialogService, repository);
+
+        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        exporterTable.itemsProperty().bind(viewModel.exportersProperty());
+        EasyBind.bindContent(viewModel.selectedExportersProperty(), exporterTable.getSelectionModel().getSelectedItems());
+        nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
+        layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
+        extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
+    }
+
+    @FXML
+    private void add() {
+        viewModel.addExporter();
+    }
+
+    @FXML
+    private void modify() {
+        viewModel.modifyExporter();
+    }
+
+    @FXML
+    private void remove() {
+        viewModel.removeExporters();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTabViewModel.java
similarity index 72%
rename from src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
rename to src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTabViewModel.java
index 35208007207..94b6aa9b5d5 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCustomizationDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/exporter/ExportCustomizationTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.exporter;
+package org.jabref.gui.preferences.exporter;
 
 import java.util.List;
 import java.util.Optional;
@@ -8,13 +8,15 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.exporter.CreateModifyExporterDialogView;
+import org.jabref.gui.exporter.ExporterViewModel;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 
-public class ExportCustomizationDialogViewModel extends AbstractViewModel {
+public class ExportCustomizationTabViewModel implements PreferenceTabViewModel {
 
     private final ListProperty<ExporterViewModel> exporters = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ListProperty<ExporterViewModel> selectedExporters = new SimpleListProperty<>(FXCollections.observableArrayList());
@@ -23,20 +25,28 @@ public class ExportCustomizationDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final JournalAbbreviationRepository repository;
 
-    public ExportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService, JournalAbbreviationRepository repository) {
+    public ExportCustomizationTabViewModel(PreferencesService preferences, DialogService dialogService, JournalAbbreviationRepository repository) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.repository = repository;
-        loadExporters();
     }
 
-    private void loadExporters() {
+    @Override
+    public void setValues() {
         List<TemplateExporter> exportersLogic = preferences.getCustomExportFormats(repository);
         for (TemplateExporter exporter : exportersLogic) {
             exporters.add(new ExporterViewModel(exporter));
         }
     }
 
+    @Override
+    public void storeSettings() {
+        List<TemplateExporter> exportersLogic = exporters.stream()
+                                                         .map(ExporterViewModel::getLogic)
+                                                         .collect(Collectors.toList());
+        preferences.storeCustomExportFormats(exportersLogic);
+    }
+
     public void addExporter() {
         CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(null);
         Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
@@ -46,13 +56,12 @@ public void addExporter() {
     }
 
     public void modifyExporter() {
-        CreateModifyExporterDialogView dialog;
-        ExporterViewModel exporterToModify = null;
         if (selectedExporters.isEmpty()) {
             return;
         }
-        exporterToModify = selectedExporters.get(0);
-        dialog = new CreateModifyExporterDialogView(exporterToModify);
+
+        ExporterViewModel exporterToModify = selectedExporters.get(0);
+        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(exporterToModify);
         Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.remove(exporterToModify);
@@ -64,11 +73,6 @@ public void removeExporters() {
         exporters.removeAll(selectedExporters);
     }
 
-    public void saveToPrefs() {
-        List<TemplateExporter> exportersLogic = exporters.stream().map(ExporterViewModel::getLogic).collect(Collectors.toList());
-        preferences.storeCustomExportFormats(exportersLogic);
-    }
-
     public ListProperty<ExporterViewModel> selectedExportersProperty() {
         return selectedExporters;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
similarity index 91%
rename from src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
rename to src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
index 1951cb26a2c..33769554505 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
@@ -11,17 +11,15 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
 <?import org.jabref.gui.icon.JabRefIconView?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.ExternalTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.external.ExternalTab">
     <Label styleClass="titleHeader" text="%External programs"/>
     <Label styleClass="sectionHeader" text="%Sending of emails"/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
         <Label text="%Subject for sending an email with references"/>
-        <TextField fx:id="eMailReferenceSubject" minWidth="150.0"/>
+        <TextField fx:id="eMailReferenceSubject" minWidth="150.0" HBox.hgrow="ALWAYS"/>
     </HBox>
     <CheckBox fx:id="autoOpenAttachedFolders" text="%Automatically open folders of attached files"/>
 
@@ -75,7 +73,7 @@
         </rowConstraints>
 
         <CheckBox fx:id="useCustomTerminal" text="%Use custom terminal emulator"/>
-        <TextField fx:id="customTerminalCommand" prefWidth="350.0" GridPane.columnIndex="1">
+        <TextField fx:id="customTerminalCommand" GridPane.columnIndex="1">
             <tooltip>
                 <Tooltip text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
             </tooltip>
@@ -92,7 +90,7 @@
         </Button>
 
         <CheckBox fx:id="useCustomFileBrowser" text="%Use custom file browser" GridPane.rowIndex="1"/>
-        <TextField fx:id="customFileBrowserCommand" prefWidth="350.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+        <TextField fx:id="customFileBrowserCommand" GridPane.columnIndex="1" GridPane.rowIndex="1">
             <tooltip>
                 <Tooltip text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
             </tooltip>
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
similarity index 90%
rename from src/main/java/org/jabref/gui/preferences/ExternalTabView.java
rename to src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
index de40d009105..0abb78aa862 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.external;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -7,28 +7,26 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.push.PushToApplicationsManager;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class ExternalTabView extends AbstractPreferenceTabView<ExternalTabViewModel> implements PreferencesTab {
+public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel> implements PreferencesTab {
 
     @FXML private TextField eMailReferenceSubject;
     @FXML private CheckBox autoOpenAttachedFolders;
-
     @FXML private ComboBox<PushToApplication> pushToApplicationCombo;
     @FXML private TextField citeCommand;
-
     @FXML private CheckBox useCustomTerminal;
     @FXML private TextField customTerminalCommand;
     @FXML private Button customTerminalBrowse;
-
     @FXML private CheckBox useCustomFileBrowser;
     @FXML private TextField customFileBrowserCommand;
     @FXML private Button customFileBrowserBrowse;
@@ -37,8 +35,7 @@ public class ExternalTabView extends AbstractPreferenceTabView<ExternalTabViewMo
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public ExternalTabView(PreferencesService preferences, PushToApplicationsManager pushToApplicationsManager) {
-        this.preferences = preferences;
+    public ExternalTab(PushToApplicationsManager pushToApplicationsManager) {
         this.pushToApplicationsManager = pushToApplicationsManager;
 
         ViewLoader.view(this)
@@ -52,7 +49,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ExternalTabViewModel(dialogService, preferences, pushToApplicationsManager);
+        this.viewModel = new ExternalTabViewModel(dialogService, preferencesService, pushToApplicationsManager);
 
         new ViewModelListCellFactory<PushToApplication>()
                 .withText(PushToApplication::getDisplayName)
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
index 5d3ad885a40..896fa4e7412 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -1,7 +1,4 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
+package org.jabref.gui.preferences.external;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -17,6 +14,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.EditExternalFileTypesAction;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.push.PushToApplicationSettings;
 import org.jabref.gui.push.PushToApplicationsManager;
@@ -143,11 +141,6 @@ public boolean validateSettings() {
         return true;
     }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public void pushToApplicationSettings() {
         PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
         PushToApplicationSettings settings = selectedApplication.getSettings(selectedApplication, workingPushToApplicationPreferences);
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
similarity index 91%
rename from src/main/java/org/jabref/gui/preferences/FileTab.fxml
rename to src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
index 0615129773b..6d548856b98 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
@@ -9,12 +10,10 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-
 <?import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel?>
-
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.FileTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.file.FileTab">
     <Label text="%File" styleClass="titleHeader"/>
     <fx:define>
         <ToggleGroup fx:id="stringsResolveToggleGroup"/>
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabView.java b/src/main/java/org/jabref/gui/preferences/file/FileTab.java
similarity index 87%
rename from src/main/java/org/jabref/gui/preferences/FileTabView.java
rename to src/main/java/org/jabref/gui/preferences/file/FileTab.java
index 35263c518ac..a6a1ddfcb7c 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTab.java
@@ -1,7 +1,4 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
+package org.jabref.gui.preferences.file;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -15,15 +12,16 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.NewLineSeparator;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class FileTabView extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
+public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox openLastStartup;
     @FXML private TextField noWrapFiles;
@@ -38,17 +36,14 @@ public class FileTabView extends AbstractPreferenceTabView<FileTabViewModel> imp
     @FXML private CheckBox autosaveLocalLibraries;
     @FXML private Button autosaveLocalLibrariesHelp;
 
-    public FileTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public FileTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
     }
 
     public void initialize() {
-        this.viewModel = new FileTabViewModel(preferences);
-
+        this.viewModel = new FileTabViewModel(preferencesService);
         openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
         noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
         resolveStringsBibTex.selectedProperty().bindBidirectional(viewModel.resolveStringsBibTexProperty());
@@ -85,14 +80,4 @@ public void initialize() {
     public String getTabName() {
         return Localization.lang("File");
     }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
similarity index 97%
rename from src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
index e74c0d20020..c5de0f7fd63 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
@@ -1,6 +1,5 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.file;
 
-import java.util.List;
 import java.util.Set;
 
 import javafx.beans.property.BooleanProperty;
@@ -13,6 +12,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.metadata.SaveOrderConfig;
@@ -128,16 +128,6 @@ public void storeSettings() {
         preferences.storeShouldAutosave(autosaveLocalLibraries.getValue());
     }
 
-    @Override
-    public boolean validateSettings() {
-        return false;
-    }
-
-    @Override
-    public List<String> getRestartWarnings() {
-        return null;
-    }
-
     // General
 
     public BooleanProperty openLastStartupProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
similarity index 93%
rename from src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
rename to src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
index 101147a10fa..a15b8206815 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -11,10 +11,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.GeneralTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.general.GeneralTab">
     <Label styleClass="titleHeader" text="%General"/>
     <GridPane hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
similarity index 93%
rename from src/main/java/org/jabref/gui/preferences/GeneralTabView.java
rename to src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index bf9c088ddf4..e6f0c886242 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.general;
 
 import java.nio.charset.Charset;
 
@@ -12,18 +12,19 @@
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
+public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<Charset> defaultEncoding;
@@ -43,9 +44,7 @@ public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewMode
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public GeneralTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public GeneralTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -57,7 +56,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralTabViewModel(dialogService, preferences);
+        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService);
 
         new ViewModelListCellFactory<Language>()
                 .withText(Language::getDisplayName)
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index ceef74d1978..af4488e85ef 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.general;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -15,6 +15,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
@@ -128,10 +129,6 @@ public void storeSettings() {
                 initialTimestampPreferences.getTimestampFormat()));
     }
 
-    public boolean validateSettings() {
-        return true;
-    }
-
     @Override
     public List<String> getRestartWarnings() {
         return restartWarning;
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.fxml
similarity index 85%
rename from src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
rename to src/main/java/org/jabref/gui/preferences/groups/GroupsTab.fxml
index 15f030000ca..74e95b91e59 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.fxml
@@ -7,10 +7,9 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.GroupsTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.groups.GroupsTab">
     <fx:define>
         <ToggleGroup fx:id="groupViewMode"/>
     </fx:define>
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabView.java b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
similarity index 80%
rename from src/main/java/org/jabref/gui/preferences/GroupsTabView.java
rename to src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
index 023e0de06d2..f4dc25aea81 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
@@ -1,16 +1,17 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.groups;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class GroupsTabView extends AbstractPreferenceTabView<GroupsTabViewModel> implements PreferencesTab {
+public class GroupsTab extends AbstractPreferenceTabView<GroupsTabViewModel> implements PreferencesTab {
 
     @FXML private RadioButton groupViewModeIntersection;
     @FXML private RadioButton groupViewModeUnion;
@@ -18,9 +19,7 @@ public class GroupsTabView extends AbstractPreferenceTabView<GroupsTabViewModel>
     @FXML private CheckBox displayGroupCount;
     @FXML private TextField keywordSeparator;
 
-    public GroupsTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public GroupsTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -32,7 +31,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GroupsTabViewModel(dialogService, preferences);
+        this.viewModel = new GroupsTabViewModel(dialogService, preferencesService);
 
         groupViewModeIntersection.selectedProperty().bindBidirectional(viewModel.groupViewModeIntersectionProperty());
         groupViewModeUnion.selectedProperty().bindBidirectional(viewModel.groupViewModeUnionProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
similarity index 92%
rename from src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
index c2cc3fcfd02..b6527090935 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
@@ -1,7 +1,4 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
+package org.jabref.gui.preferences.groups;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -11,6 +8,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.preferences.PreferencesService;
 
 public class GroupsTabViewModel implements PreferenceTabViewModel {
@@ -63,16 +61,6 @@ public void storeSettings() {
         preferences.storeGroupsPreferences(newGroupsPreferences);
     }
 
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public BooleanProperty groupViewModeIntersectionProperty() {
         return groupViewModeIntersectionProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.fxml b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.fxml
new file mode 100644
index 00000000000..7b134c02681
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.importer.ImportCustomizationTab">
+
+    <Label styleClass="titleHeader" text="%Custom import formats"/>
+
+    <TableView fx:id="importerTable">
+        <columns>
+            <TableColumn fx:id="nameColumn" text="%Import name"/>
+            <TableColumn fx:id="classColumn" text="%Importer class"/>
+            <TableColumn fx:id="basePathColumn" text="%Contained in"/>
+        </columns>
+        <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+    </TableView>
+
+    <HBox alignment="BASELINE_RIGHT" spacing="10.0">
+        <Button fx:id="addButton" onAction="#add" text="%Add" prefWidth="80.0"/>
+        <Button onAction="#remove" text="%Remove" prefWidth="80.0"/>
+    </HBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.java
similarity index 56%
rename from src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
rename to src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.java
index 81b0346fa14..562da44d09f 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTab.java
@@ -1,60 +1,44 @@
-package org.jabref.gui.importer;
-
-import javax.inject.Inject;
+package org.jabref.gui.preferences.importer;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.DialogService;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.importer.ImporterViewModel;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 
-public class ImportCustomizationDialog extends BaseDialog<Void> {
+public class ImportCustomizationTab extends AbstractPreferenceTabView<ImportCustomizationTabViewModel> implements PreferencesTab {
 
-    @FXML private ButtonType addButton;
-    @FXML private ButtonType removeButton;
-    @FXML private ButtonType closeButton;
     @FXML private TableView<ImporterViewModel> importerTable;
     @FXML private TableColumn<ImporterViewModel, String> nameColumn;
     @FXML private TableColumn<ImporterViewModel, String> classColumn;
     @FXML private TableColumn<ImporterViewModel, String> basePathColumn;
+    @FXML private Button addButton;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
-    private ImportCustomizationDialogViewModel viewModel;
-
-    public ImportCustomizationDialog() {
-        this.setTitle(Localization.lang("Manage custom imports"));
-
+    public ImportCustomizationTab() {
         ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+                  .root(this)
+                  .load();
+    }
 
-        ((Button) getDialogPane().lookupButton(addButton)).setTooltip(new Tooltip(
-                Localization.lang("Add a (compiled) custom Importer class from a class path.")
-                        + "\n" + Localization.lang("The path need not be on the classpath of JabRef.")));
-        ControlHelper.setAction(addButton, getDialogPane(), event -> viewModel.addImporter());
-        ControlHelper.setAction(removeButton, getDialogPane(), event -> viewModel.removeSelectedImporter());
-        ControlHelper.setAction(closeButton, getDialogPane(), event -> {
-            viewModel.saveToPrefs();
-            close();
-        });
+    @Override
+    public String getTabName() {
+        return Localization.lang("Custom import formats");
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ImportCustomizationDialogViewModel(preferences, dialogService);
+        viewModel = new ImportCustomizationTabViewModel(preferencesService, dialogService);
+
         importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         importerTable.itemsProperty().bind(viewModel.importersProperty());
         EasyBind.bindContent(viewModel.selectedImportersProperty(), importerTable.getSelectionModel().getSelectedItems());
@@ -64,5 +48,19 @@ private void initialize() {
         new ViewModelTableRowFactory<ImporterViewModel>()
                 .withTooltip(importer -> importer.getLogic().getDescription())
                 .install(importerTable);
+
+        addButton.setTooltip(new Tooltip(
+                Localization.lang("Add a (compiled) custom Importer class from a class path.")
+                        + "\n" + Localization.lang("The path need not be on the classpath of JabRef.")));
+    }
+
+    @FXML
+    private void add() {
+        viewModel.addImporter();
+    }
+
+    @FXML
+    private void remove() {
+        viewModel.removeSelectedImporter();
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTabViewModel.java
similarity index 90%
rename from src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java
rename to src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTabViewModel.java
index 215fa3437c2..a0eb6bbb6c3 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importer/ImportCustomizationTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.importer;
+package org.jabref.gui.preferences.importer;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -11,9 +11,10 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
+import org.jabref.gui.importer.ImporterViewModel;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.l10n.Localization;
@@ -24,9 +25,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImportCustomizationDialogViewModel extends AbstractViewModel {
+public class ImportCustomizationTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationDialogViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationTabViewModel.class);
 
     private final ListProperty<ImporterViewModel> importers = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ListProperty<ImporterViewModel> selectedImporters = new SimpleListProperty<>(FXCollections.observableArrayList());
@@ -34,19 +35,30 @@ public class ImportCustomizationDialogViewModel extends AbstractViewModel {
     private final PreferencesService preferences;
     private final DialogService dialogService;
 
-    public ImportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService) {
+    public ImportCustomizationTabViewModel(PreferencesService preferences, DialogService dialogService) {
         this.preferences = preferences;
         this.dialogService = dialogService;
-        loadImporters();
     }
 
-    private void loadImporters() {
+    @Override
+    public void setValues() {
         Set<CustomImporter> importersLogic = preferences.getCustomImportFormats();
         for (CustomImporter importer : importersLogic) {
             importers.add(new ImporterViewModel(importer));
         }
     }
 
+    @Override
+    public void storeSettings() {
+        preferences.storeCustomImportFormats(importers.stream()
+                                                      .map(ImporterViewModel::getLogic)
+                                                      .collect(Collectors.toSet()));
+        Globals.IMPORT_FORMAT_READER.resetImportFormats(
+                preferences.getImportFormatPreferences(),
+                preferences.getXmpPreferences(),
+                Globals.getFileUpdateMonitor());
+    }
+
     /**
      * Converts a path relative to a base-path into a class name.
      *
@@ -125,16 +137,6 @@ public void removeSelectedImporter() {
         importers.removeAll(selectedImporters);
     }
 
-    public void saveToPrefs() {
-        preferences.storeCustomImportFormats(importers.stream()
-                                                        .map(ImporterViewModel::getLogic)
-                                                        .collect(Collectors.toSet()));
-        Globals.IMPORT_FORMAT_READER.resetImportFormats(
-                preferences.getImportFormatPreferences(),
-                preferences.getXmpPreferences(),
-                Globals.getFileUpdateMonitor());
-    }
-
     public ListProperty<ImporterViewModel> selectedImportersProperty() {
         return selectedImporters;
     }
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java
rename to src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
index aaec9870993..26bf67cb1ec 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviationViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.journals;
+package org.jabref.gui.preferences.journals;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java
rename to src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
index 45f4afa35ee..b5ad2e62718 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviationsFileViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.journals;
+package org.jabref.gui.preferences.journals;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.css
similarity index 100%
rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviations.css
rename to src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.css
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml
new file mode 100644
index 00000000000..3f4a342f534
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.journals.JournalAbbreviationsTab">
+
+    <Label styleClass="titleHeader" text="%Journal abbreviations"/>
+
+    <HBox styleClass="custom-header">
+        <Button fx:id="addAbbreviationListButton" onAction="#addList" styleClass="icon">
+            <tooltip>
+                <Tooltip autoHide="true" text="%Add new list"/>
+            </tooltip>
+        </Button>
+        <Button fx:id="openAbbreviationListButton" onAction="#openList" styleClass="icon">
+            <tooltip>
+                <Tooltip autoHide="true" text="%Open existing list"/>
+            </tooltip>
+        </Button>
+        <Button fx:id="removeAbbreviationListButton" onAction="#removeList"
+                styleClass="icon">
+            <tooltip>
+                <Tooltip autoHide="true" text="%Remove list"/>
+            </tooltip>
+        </Button>
+        <Pane HBox.hgrow="ALWAYS"/>
+        <ComboBox fx:id="journalFilesBox" minWidth="200.0" maxWidth="Infinity" promptText="%No abbreviation files loaded"
+                  HBox.hgrow="ALWAYS"/>
+        <Pane HBox.hgrow="ALWAYS"/>
+        <Button fx:id="addAbbreviationButton" onAction="#addAbbreviation" styleClass="icon">
+            <tooltip>
+                <Tooltip autoHide="true" text="%Add abbreviation"/>
+            </tooltip>
+        </Button>
+        <Button fx:id="removeAbbreviationButton" onAction="#removeAbbreviation" styleClass="icon">
+            <tooltip>
+                <Tooltip autoHide="true" text="%Remove abbreviation"/>
+            </tooltip>
+        </Button>
+    </HBox>
+
+    <TableView fx:id="journalAbbreviationsTable" editable="true" styleClass="abbreviations-table">
+        <columns>
+            <TableColumn fx:id="journalTableNameColumn" prefWidth="400.0" text="%Full journal name"/>
+            <TableColumn fx:id="journalTableAbbreviationColumn" prefWidth="200.0" text="%Abbreviation name"/>
+            <TableColumn fx:id="journalTableShortestUniqueAbbreviationColumn" prefWidth="200.0"
+                         text="%Shortest unique abbreviation"/>
+        </columns>
+        <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+        <placeholder>
+            <Label fx:id="loadingLabel" maxHeight="30.0" text="%Loading built in lists"/>
+            <ProgressIndicator fx:id="progressIndicator" maxHeight="30.0" opacity="0.4"/>
+        </placeholder>
+    </TableView>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
similarity index 77%
rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
rename to src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
index deb27d04913..0db240a26e9 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsView.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
@@ -1,10 +1,9 @@
-package org.jabref.gui.journals;
+package org.jabref.gui.preferences.journals;
 
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
@@ -12,16 +11,12 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.TextFieldTableCell;
 
-import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
@@ -30,11 +25,10 @@
  * This class controls the user interface of the journal abbreviations dialog. The UI elements and their layout are
  * defined in the FXML file.
  */
-public class ManageJournalAbbreviationsView extends BaseDialog<Void> {
+public class JournalAbbreviationsTab extends AbstractPreferenceTabView<JournalAbbreviationsTabViewModel> implements PreferencesTab {
 
-    @FXML public Label loadingLabel;
-    @FXML public ProgressIndicator progressIndicator;
-    @FXML private ButtonType saveButton;
+    @FXML private Label loadingLabel;
+    @FXML private ProgressIndicator progressIndicator;
     @FXML private TableView<AbbreviationViewModel> journalAbbreviationsTable;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableNameColumn;
     @FXML private TableColumn<AbbreviationViewModel, String> journalTableAbbreviationColumn;
@@ -45,29 +39,23 @@ public class ManageJournalAbbreviationsView extends BaseDialog<Void> {
     @FXML private Button openAbbreviationListButton;
     @FXML private Button addAbbreviationListButton;
     @FXML private Button removeAbbreviationListButton;
-    @Inject private PreferencesService preferences;
-    @Inject private DialogService dialogService;
+
     @Inject private TaskExecutor taskExecutor;
     @Inject private JournalAbbreviationRepository abbreviationRepository;
-    private ManageJournalAbbreviationsViewModel viewModel;
-
-    public ManageJournalAbbreviationsView() {
-        this.setTitle(Localization.lang("Journal abbreviations"));
-
-        ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(saveButton, getDialogPane(), event -> saveAbbreviationsAndCloseDialog());
+    public JournalAbbreviationsTab() {
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ManageJournalAbbreviationsViewModel(preferences, dialogService, taskExecutor, abbreviationRepository);
+        viewModel = new JournalAbbreviationsTabViewModel(preferencesService, dialogService, taskExecutor, abbreviationRepository);
 
         setButtonStyles();
         setUpTable();
         setBindings();
-
-        viewModel.init();
     }
 
     private void setButtonStyles() {
@@ -136,7 +124,8 @@ private void addAbbreviation() {
 
     @FXML
     private void editAbbreviation() {
-        journalAbbreviationsTable.edit(journalAbbreviationsTable.getSelectionModel().getSelectedIndex(),
+        journalAbbreviationsTable.edit(
+                journalAbbreviationsTable.getSelectionModel().getSelectedIndex(),
                 journalTableNameColumn);
     }
 
@@ -145,20 +134,15 @@ private void removeAbbreviation() {
         viewModel.deleteAbbreviation();
     }
 
-    @FXML
-    private void saveAbbreviationsAndCloseDialog() {
-        viewModel.save();
-
-        // Update journal abbreviation repository
-        Globals.journalAbbreviationRepository = JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences());
-
-        close();
-    }
-
     private void selectNewAbbreviation() {
         int lastRow = viewModel.abbreviationsCountProperty().get() - 1;
         journalAbbreviationsTable.scrollTo(lastRow);
         journalAbbreviationsTable.getSelectionModel().select(lastRow);
         journalAbbreviationsTable.getFocusModel().focus(lastRow);
     }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Journal abbreviations");
+    }
 }
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
similarity index 91%
rename from src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
rename to src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
index 89a42d021cf..32d8c826b9a 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.journals;
+package org.jabref.gui.preferences.journals;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -14,12 +14,14 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.Abbreviation;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
@@ -33,9 +35,9 @@
  * This class provides a model for managing journal abbreviation lists. It provides all necessary methods to create,
  * modify or delete journal abbreviations and files. To visualize the model one can bind the properties to UI elements.
  */
-public class ManageJournalAbbreviationsViewModel extends AbstractViewModel {
+public class JournalAbbreviationsTabViewModel implements PreferenceTabViewModel {
 
-    private final Logger logger = LoggerFactory.getLogger(ManageJournalAbbreviationsViewModel.class);
+    private final Logger logger = LoggerFactory.getLogger(JournalAbbreviationsTabViewModel.class);
     private final SimpleListProperty<AbbreviationsFileViewModel> journalFiles = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final SimpleListProperty<AbbreviationViewModel> abbreviations = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final SimpleIntegerProperty abbreviationsCount = new SimpleIntegerProperty();
@@ -52,8 +54,10 @@ public class ManageJournalAbbreviationsViewModel extends AbstractViewModel {
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private boolean shouldWriteLists;
 
-    public ManageJournalAbbreviationsViewModel(PreferencesService preferences, DialogService dialogService,
-                                               TaskExecutor taskExecutor, JournalAbbreviationRepository journalAbbreviationRepository) {
+    public JournalAbbreviationsTabViewModel(PreferencesService preferences,
+                                            DialogService dialogService,
+                                            TaskExecutor taskExecutor,
+                                            JournalAbbreviationRepository journalAbbreviationRepository) {
         this.preferences = Objects.requireNonNull(preferences);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
@@ -99,42 +103,53 @@ public ManageJournalAbbreviationsViewModel(PreferencesService preferences, Dialo
         });
     }
 
-    public SimpleBooleanProperty isLoadingProperty() {
-        return isLoading;
+    @Override
+    public void setValues() {
+        journalFiles.clear();
+
+        createFileObjects();
+        selectLastJournalFile();
+        addBuiltInList();
+    }
+
+    /**
+     * Read all saved file paths and read their abbreviations.
+     */
+    public void createFileObjects() {
+        List<String> externalFiles = abbreviationsPreferences.getExternalJournalLists();
+        externalFiles.forEach(name -> openFile(Path.of(name)));
+    }
+
+    /**
+     * This will set the {@code currentFile} property to the {@link AbbreviationsFileViewModel} object that was added to
+     * the {@code journalFiles} list property lastly. If there are no files in the list property this method will do
+     * nothing as the {@code currentFile} property is already {@code null}.
+     */
+    public void selectLastJournalFile() {
+        if (!journalFiles.isEmpty()) {
+            currentFile.set(journalFilesProperty().get(journalFilesProperty().size() - 1));
+        }
     }
 
     /**
      * This will load the built in abbreviation files and add it to the list of journal abbreviation files.
      */
-    void addBuiltInList() {
+    public void addBuiltInList() {
         BackgroundTask
                 .wrap(journalAbbreviationRepository::getAllLoaded)
                 .onRunning(() -> isLoading.setValue(true))
                 .onSuccess(result -> {
                     isLoading.setValue(false);
-                    addList(Localization.lang("JabRef built in list"), result);
+                    List<AbbreviationViewModel> builtInViewModels = result.stream()
+                                                                          .map(AbbreviationViewModel::new)
+                                                                          .collect(Collectors.toList());
+                    journalFiles.add(new AbbreviationsFileViewModel(builtInViewModels, Localization.lang("JabRef built in list")));
                     selectLastJournalFile();
                 })
                 .onFailure(dialogService::showErrorDialogAndWait)
                 .executeWith(taskExecutor);
     }
 
-    private void addList(String name, List<Abbreviation> abbreviations) {
-        List<AbbreviationViewModel> builtInListViewModel = abbreviations.stream()
-                                                                        .map(AbbreviationViewModel::new)
-                                                                        .collect(Collectors.toList());
-        AbbreviationsFileViewModel fileViewModel = new AbbreviationsFileViewModel(builtInListViewModel, name);
-        journalFiles.add(fileViewModel);
-    }
-
-    /**
-     * Read all saved file paths and read their abbreviations.
-     */
-    public void createFileObjects() {
-        List<String> externalFiles = abbreviationsPreferences.getExternalJournalLists();
-        externalFiles.forEach(name -> openFile(Path.of(name)));
-    }
-
     /**
      * This method shall be used to add a new journal abbreviation file to the set of journal abbreviation files. It
      * basically just calls the {@link #openFile(Path)}} method.
@@ -219,6 +234,13 @@ public void addAbbreviation(String name, String abbreviation) {
         addAbbreviation(name, abbreviation, "");
     }
 
+    public void addAbbreviation() {
+        addAbbreviation(
+                Localization.lang("Name"),
+                Localization.lang("Abbreviation"),
+                Localization.lang("Shortest unique abbreviation"));
+    }
+
     /**
      * Method to change the currentAbbreviation property to a new abbreviation.
      *
@@ -317,23 +339,13 @@ private void saveExternalFilesList() {
         abbreviationsPreferences.setExternalJournalLists(extFiles);
     }
 
-    /**
-     * This will set the {@code currentFile} property to the {@link AbbreviationsFileViewModel} object that was added to
-     * the {@code journalFiles} list property lastly. If there are no files in the list property this method will do
-     * nothing as the {@code currentFile} property is already {@code null}.
-     */
-    public void selectLastJournalFile() {
-        if (!journalFiles.isEmpty()) {
-            currentFile.set(journalFilesProperty().get(journalFilesProperty().size() - 1));
-        }
-    }
-
     /**
      * This method first saves all external files to its internal list, then writes all abbreviations to their files and
      * finally updates the abbreviations auto complete. It basically calls {@link #saveExternalFilesList()}, {@link
      * #saveJournalAbbreviationFiles() }}.
      */
-    public void save() {
+    @Override
+    public void storeSettings() {
         BackgroundTask.wrap(() -> {
             saveExternalFilesList();
 
@@ -344,6 +356,13 @@ public void save() {
 
             preferences.storeJournalAbbreviationPreferences(abbreviationsPreferences);
         }).executeWith(taskExecutor);
+
+        // Update journal abbreviation repository
+        Globals.journalAbbreviationRepository = JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences());
+    }
+
+    public SimpleBooleanProperty isLoadingProperty() {
+        return isLoading;
     }
 
     public SimpleListProperty<AbbreviationsFileViewModel> journalFilesProperty() {
@@ -377,15 +396,4 @@ public SimpleBooleanProperty isAbbreviationEditableAndRemovable() {
     public SimpleBooleanProperty isFileRemovableProperty() {
         return isFileRemovable;
     }
-
-    public void addAbbreviation() {
-        addAbbreviation(Localization.lang("Name"), Localization.lang("Abbreviation"),
-                Localization.lang("Shortest unique abbreviation"));
-    }
-
-    public void init() {
-        createFileObjects();
-        selectLastJournalFile();
-        addBuiltInList();
-    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
similarity index 96%
rename from src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java
rename to src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
index 92ff3bb95f6..bf84b49303d 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.keyboard;
+package org.jabref.gui.preferences.keybindings;
 
 import java.util.Optional;
 
@@ -11,6 +11,9 @@
 
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
+import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.keyboard.KeyBindingCategory;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 
 import com.google.common.base.CaseFormat;
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.css b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
similarity index 100%
rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialog.css
rename to src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
new file mode 100644
index 00000000000..ee292c83fcc
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuButton?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.control.TreeTableColumn?>
+<?import javafx.scene.control.TreeTableView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.keybindings.KeyBindingsTab">
+
+    <Label styleClass="titleHeader" text="%Key bindings"/>
+
+    <TreeTableView fx:id="keyBindingsTable" showRoot="false" styleClass="keybinding-table">
+        <columns>
+            <TreeTableColumn fx:id="actionColumn" prefWidth="200.0" text="%Action"/>
+            <TreeTableColumn fx:id="shortcutColumn" prefWidth="100.0" text="%Shortcut"/>
+            <TreeTableColumn fx:id="resetColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
+            <TreeTableColumn fx:id="clearColumn" maxWidth="25.0" prefWidth="25.0" minWidth="25.0"/>
+        </columns>
+        <columnResizePolicy>
+            <TreeTableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+    </TreeTableView>
+
+    <HBox spacing="4" alignment="CENTER_RIGHT">
+        <MenuButton fx:id="presetsButton" text="%Presets"/>
+        <Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetBindings">
+            <graphic>
+                <JabRefIconView glyph="REFRESH"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Reset Bindings"/>
+            </tooltip>
+        </Button>
+    </HBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
similarity index 70%
rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
rename to src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
index da62dd47d78..eaa7f68ac5e 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -1,9 +1,8 @@
-package org.jabref.gui.keyboard;
+package org.jabref.gui.preferences.keybindings;
 
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SelectionMode;
@@ -12,23 +11,20 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.JabRefIcon;
-import org.jabref.gui.keyboard.presets.KeyBindingPreset;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.gui.preferences.keybindings.presets.KeyBindingPreset;
 import org.jabref.gui.util.RecursiveTreeItem;
 import org.jabref.gui.util.ViewModelTreeTableCellFactory;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 
-public class KeyBindingsDialogView extends BaseDialog<Void> {
+public class KeyBindingsTab extends AbstractPreferenceTabView<KeyBindingsTabViewModel> implements PreferencesTab {
 
-    @FXML private ButtonType resetButton;
-    @FXML private ButtonType saveButton;
     @FXML private TreeTableView<KeyBindingViewModel> keyBindingsTable;
     @FXML private TreeTableColumn<KeyBindingViewModel, String> actionColumn;
     @FXML private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
@@ -37,25 +33,21 @@ public class KeyBindingsDialogView extends BaseDialog<Void> {
     @FXML private MenuButton presetsButton;
 
     @Inject private KeyBindingRepository keyBindingRepository;
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
-    private KeyBindingsDialogViewModel viewModel;
-
-    public KeyBindingsDialogView() {
-        this.setTitle(Localization.lang("Key bindings"));
-        this.getDialogPane().setPrefSize(375, 475);
 
+    public KeyBindingsTab() {
         ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+                  .root(this)
+                  .load();
+    }
 
-        ControlHelper.setAction(resetButton, getDialogPane(), event -> setDefaultBindings());
-        ControlHelper.setAction(saveButton, getDialogPane(), event -> saveKeyBindingsAndCloseDialog());
+    @Override
+    public String getTabName() {
+        return Localization.lang("Key bindings");
     }
 
     @FXML
     private void initialize() {
-        viewModel = new KeyBindingsDialogViewModel(keyBindingRepository, dialogService, preferences);
+        viewModel = new KeyBindingsTabViewModel(keyBindingRepository, dialogService, preferencesService);
 
         keyBindingsTable.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         viewModel.selectedKeyBindingProperty().bind(
@@ -89,18 +81,7 @@ private MenuItem createMenuItem(KeyBindingPreset preset) {
     }
 
     @FXML
-    private void closeDialog() {
-        close();
-    }
-
-    @FXML
-    private void saveKeyBindingsAndCloseDialog() {
-        viewModel.saveKeyBindings();
-        closeDialog();
-    }
-
-    @FXML
-    private void setDefaultBindings() {
+    private void resetBindings() {
         viewModel.resetToDefault();
     }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
similarity index 76%
rename from src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
rename to src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
index e88c9c7e8ba..e5cd3ab63a2 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
@@ -1,5 +1,7 @@
-package org.jabref.gui.keyboard;
+package org.jabref.gui.preferences.keybindings;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -13,17 +15,20 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.KeyEvent;
 
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.keyboard.presets.BashKeyBindingPreset;
-import org.jabref.gui.keyboard.presets.KeyBindingPreset;
+import org.jabref.gui.keyboard.KeyBindingCategory;
+import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.gui.preferences.keybindings.presets.BashKeyBindingPreset;
+import org.jabref.gui.preferences.keybindings.presets.KeyBindingPreset;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-public class KeyBindingsDialogViewModel extends AbstractViewModel {
+public class KeyBindingsTabViewModel implements PreferenceTabViewModel {
 
     private final KeyBindingRepository keyBindingRepository;
+    private final KeyBindingRepository initialKeyBindingRepository;
     private final PreferencesService preferences;
     private final OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding = OptionalObjectProperty.empty();
     private final ObjectProperty<KeyBindingViewModel> rootKeyBinding = new SimpleObjectProperty<>();
@@ -31,26 +36,22 @@ public class KeyBindingsDialogViewModel extends AbstractViewModel {
 
     private final DialogService dialogService;
 
-    public KeyBindingsDialogViewModel(KeyBindingRepository keyBindingRepository, DialogService dialogService, PreferencesService preferences) {
+    private final List<String> restartWarning = new ArrayList<>();
+
+    public KeyBindingsTabViewModel(KeyBindingRepository keyBindingRepository, DialogService dialogService, PreferencesService preferences) {
         this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
+        this.initialKeyBindingRepository = new KeyBindingRepository(keyBindingRepository.getKeyBindings());
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
-        populateTable();
-        keyBindingPresets.add(new BashKeyBindingPreset());
-    }
 
-    public OptionalObjectProperty<KeyBindingViewModel> selectedKeyBindingProperty() {
-        return selectedKeyBinding;
-    }
-
-    public ObjectProperty<KeyBindingViewModel> rootKeyBindingProperty() {
-        return rootKeyBinding;
+        keyBindingPresets.add(new BashKeyBindingPreset());
     }
 
     /**
      * Read all keybindings from the keybinding repository and create table keybinding models for them
      */
-    private void populateTable() {
+    @Override
+    public void setValues() {
         KeyBindingViewModel root = new KeyBindingViewModel(keyBindingRepository, KeyBindingCategory.FILE);
         for (KeyBindingCategory category : KeyBindingCategory.values()) {
             KeyBindingViewModel categoryItem = new KeyBindingViewModel(keyBindingRepository, category);
@@ -81,13 +82,12 @@ public void setNewBindingForCurrent(KeyEvent event) {
         }
     }
 
-    public void saveKeyBindings() {
+    public void storeSettings() {
         preferences.storeKeyBindingRepository(keyBindingRepository);
 
-        String title = Localization.lang("Key bindings changed");
-        String content = Localization.lang("Your new key bindings have been stored.") + '\n'
-                + Localization.lang("You must restart JabRef for the new key bindings to work properly.");
-        dialogService.showInformationDialogAndWait(title, content);
+        if (!keyBindingRepository.equals(initialKeyBindingRepository)) {
+            restartWarning.add(Localization.lang("Key bindings changed"));
+        }
     }
 
     public void resetToDefault() {
@@ -98,7 +98,7 @@ public void resetToDefault() {
                 ButtonType.CANCEL).ifPresent(response -> {
             if (response == resetButtonType) {
                 keyBindingRepository.resetToDefault();
-                populateTable();
+                setValues();
             }
         });
     }
@@ -109,10 +109,23 @@ public void loadPreset(KeyBindingPreset preset) {
         }
 
         preset.getKeyBindings().forEach(keyBindingRepository::put);
-        populateTable();
+        setValues();
     }
 
     public ListProperty<KeyBindingPreset> keyBindingPresets() {
         return keyBindingPresets;
     }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return restartWarning;
+    }
+
+    public OptionalObjectProperty<KeyBindingViewModel> selectedKeyBindingProperty() {
+        return selectedKeyBinding;
+    }
+
+    public ObjectProperty<KeyBindingViewModel> rootKeyBindingProperty() {
+        return rootKeyBinding;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java b/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
similarity index 96%
rename from src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java
rename to src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
index 15528af1023..eceaa0d577f 100644
--- a/src/main/java/org/jabref/gui/keyboard/presets/BashKeyBindingPreset.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/presets/BashKeyBindingPreset.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.keyboard.presets;
+package org.jabref.gui.preferences.keybindings.presets;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java b/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
similarity index 75%
rename from src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java
rename to src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
index abea89b1c16..4eae173e8de 100644
--- a/src/main/java/org/jabref/gui/keyboard/presets/KeyBindingPreset.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/presets/KeyBindingPreset.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.keyboard.presets;
+package org.jabref.gui.preferences.keybindings.presets;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/jabref/gui/preferences/LinkedFilesTab.fxml b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
similarity index 81%
rename from src/main/java/org/jabref/gui/preferences/LinkedFilesTab.fxml
rename to src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
index 7c48373aa22..c5948e935ea 100644
--- a/src/main/java/org/jabref/gui/preferences/LinkedFilesTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
@@ -13,10 +13,10 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.LinkedFilesTabView">
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.linkedfiles.LinkedFilesTab">
     <fx:define>
         <ToggleGroup fx:id="autolinkToggleGroup"/>
     </fx:define>
@@ -25,7 +25,16 @@
     <HBox alignment="CENTER_LEFT" spacing="10.0">
         <Label text="%Main file directory"/>
         <TextField fx:id="mainFileDirectory" HBox.hgrow="ALWAYS"/>
-        <Button onAction="#mainFileDirBrowse" text="%Browse"/>
+        <Button onAction="#mainFileDirBrowse"
+                styleClass="icon-button,narrow"
+                prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
+            <graphic>
+                <JabRefIconView glyph="OPEN"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Browse"/>
+            </tooltip>
+        </Button>
     </HBox>
     <CheckBox fx:id="useBibLocationAsPrimary" text="%Search and store files relative to library file location">
         <tooltip>
@@ -50,7 +59,7 @@
     <Label styleClass="sectionHeader" text="%Linked file name conventions"/>
     <GridPane hgap="4.0" vgap="4.0">
         <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES"/>
+            <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
             <ColumnConstraints hgrow="SOMETIMES"/>
         </columnConstraints>
         <rowConstraints>
diff --git a/src/main/java/org/jabref/gui/preferences/LinkedFilesTabView.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
similarity index 91%
rename from src/main/java/org/jabref/gui/preferences/LinkedFilesTabView.java
rename to src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
index a8b1fa4340b..bec1e469142 100644
--- a/src/main/java/org/jabref/gui/preferences/LinkedFilesTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.linkedfiles;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -12,15 +12,16 @@
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class LinkedFilesTabView extends AbstractPreferenceTabView<LinkedFilesTabViewModel> implements PreferencesTab {
+public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabViewModel> implements PreferencesTab {
 
     @FXML private TextField mainFileDirectory;
     @FXML private CheckBox useBibLocationAsPrimary;
@@ -37,9 +38,7 @@ public class LinkedFilesTabView extends AbstractPreferenceTabView<LinkedFilesTab
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public LinkedFilesTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public LinkedFilesTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -51,7 +50,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new LinkedFilesTabViewModel(dialogService, preferences);
+        this.viewModel = new LinkedFilesTabViewModel(dialogService, preferencesService);
 
         mainFileDirectory.textProperty().bindBidirectional(viewModel.mainFileDirectoryProperty());
         useBibLocationAsPrimary.selectedProperty().bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/LinkedFilesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
similarity index 97%
rename from src/main/java/org/jabref/gui/preferences/LinkedFilesTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
index e5a887cd585..ab8c512fb25 100644
--- a/src/main/java/org/jabref/gui/preferences/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -1,9 +1,7 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.linkedfiles;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -14,6 +12,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.AutoLinkPreferences;
@@ -132,11 +131,6 @@ public boolean validateSettings() {
         return true;
     }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public void mainFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
                 new DirectoryDialogConfiguration.Builder().withInitialDirectory(Path.of(mainFileDirectoryProperty.getValue())).build();
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterItemModel.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
similarity index 96%
rename from src/main/java/org/jabref/gui/preferences/NameFormatterItemModel.java
rename to src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
index fed11596137..91a3761b8e2 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterItemModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.nameformatter;
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.fxml
similarity index 91%
rename from src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml
rename to src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.fxml
index 68313f837d2..065fa80fae7 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.fxml
@@ -9,8 +9,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.NameFormatterTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.nameformatter.NameFormatterTab">
     <Label styleClass="titleHeader" text="%Special name formatters"/>
     <HBox spacing="4.0">
         <VBox prefHeight="300.0" spacing="4.0" HBox.hgrow="ALWAYS">
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
similarity index 93%
rename from src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
rename to src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
index d2499990894..997abc78d9b 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.nameformatter;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -14,14 +14,15 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class NameFormatterTabView extends AbstractPreferenceTabView<NameFormatterTabViewModel> implements PreferencesTab {
+public class NameFormatterTab extends AbstractPreferenceTabView<NameFormatterTabViewModel> implements PreferencesTab {
 
     @FXML private TableView<NameFormatterItemModel> formatterList;
     @FXML private TableColumn<NameFormatterItemModel, String> formatterNameColumn;
@@ -31,9 +32,7 @@ public class NameFormatterTabView extends AbstractPreferenceTabView<NameFormatte
     @FXML private TextField addFormatterString;
     @FXML private Button formatterHelp;
 
-    public NameFormatterTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public NameFormatterTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -45,7 +44,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NameFormatterTabViewModel(dialogService, preferences);
+        this.viewModel = new NameFormatterTabViewModel(dialogService, preferencesService);
 
         formatterNameColumn.setSortable(true);
         formatterNameColumn.setReorderable(false);
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
similarity index 94%
rename from src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
index 92f88e438a4..d0463324446 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.nameformatter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +10,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
@@ -78,16 +79,6 @@ public void removeFormatter(NameFormatterItemModel formatter) {
         formatterListProperty.remove(formatter);
     }
 
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public ListProperty<NameFormatterItemModel> formatterListProperty() {
         return formatterListProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
similarity index 92%
rename from src/main/java/org/jabref/gui/preferences/NetworkTab.fxml
rename to src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 148f7a50873..1e22e4a34f5 100644
--- a/src/main/java/org/jabref/gui/preferences/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -10,9 +10,9 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.NetworkTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.network.NetworkTab">
     <Label styleClass="titleHeader" text="%Network"/>
     <Label styleClass="sectionHeader" text="%Remote operation"/>
     <Label fx:id="remoteLabel"
@@ -25,7 +25,7 @@
     </HBox>
 
     <Label styleClass="sectionHeader" text="%Proxy configuration"/>
-    <GridPane maxHeight="-Infinity" maxWidth="-Infinity" hgap="10.0" vgap="10.0">
+    <GridPane hgap="10.0" vgap="10.0">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES"/>
             <ColumnConstraints hgrow="SOMETIMES"/>
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTabView.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
similarity index 93%
rename from src/main/java/org/jabref/gui/preferences/NetworkTabView.java
rename to src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
index e484bb357bd..6d2d0d344aa 100644
--- a/src/main/java/org/jabref/gui/preferences/NetworkTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.network;
 
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
@@ -14,16 +14,17 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
-public class NetworkTabView extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
+public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
     @FXML private Label remoteLabel;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
@@ -47,9 +48,7 @@ public class NetworkTabView extends AbstractPreferenceTabView<NetworkTabViewMode
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public NetworkTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public NetworkTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -61,9 +60,9 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NetworkTabViewModel(dialogService, preferences);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
 
-        remoteLabel.setVisible(preferences.getGeneralPreferences().shouldShowAdvancedHints());
+        remoteLabel.setVisible(preferencesService.getGeneralPreferences().shouldShowAdvancedHints());
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index f8ae087b058..23b3b87bcd9 100644
--- a/src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.network;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;
@@ -12,6 +12,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.remote.JabRefMessageHandler;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ProxyPreferences;
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.fxml
similarity index 92%
rename from src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
rename to src/main/java/org/jabref/gui/preferences/preview/PreviewTab.fxml
index 72b84744789..ec1d439fb10 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.fxml
@@ -13,8 +13,9 @@
 <?import org.jabref.gui.icon.JabRefIconView?>
 <?import org.fxmisc.flowless.VirtualizedScrollPane?>
 <?import org.fxmisc.richtext.CodeArea?>
-<fx:root prefWidth="650.0" spacing="4.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.212"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreviewTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.preview.PreviewTab">
     <Label text="%Current Preview" styleClass="titleHeader"/>
     <CheckBox fx:id="showAsTabCheckBox" text="%Show preview as a tab in entry editor"/>
     <HBox spacing="4.0">
@@ -59,7 +60,7 @@
     </HBox>
 
     <AnchorPane>
-        <TabPane prefHeight="250.0" prefWidth="650.0" tabClosingPolicy="UNAVAILABLE">
+        <TabPane prefHeight="250.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" tabClosingPolicy="UNAVAILABLE">
             <Tab text="%Preview" fx:id="previewTab"/>
             <Tab text="%Edit">
                 <VirtualizedScrollPane>
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
similarity index 96%
rename from src/main/java/org/jabref/gui/preferences/PreviewTabView.java
rename to src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index 50cb774c6fd..07304555ba7 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.preview;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +26,8 @@
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -33,7 +35,6 @@
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
@@ -41,7 +42,7 @@
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 
-public class PreviewTabView extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
+public class PreviewTab extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox showAsTabCheckBox;
     @FXML private ListView<PreviewLayout> availableListView;
@@ -54,6 +55,7 @@ public class PreviewTabView extends AbstractPreferenceTabView<PreviewTabViewMode
     @FXML private Button resetDefaultButton;
     @FXML private Tab previewTab;
     @FXML private CodeArea editArea;
+
     @Inject private StateManager stateManager;
 
     private final ContextMenu contextMenu = new ContextMenu();
@@ -63,9 +65,7 @@ public class PreviewTabView extends AbstractPreferenceTabView<PreviewTabViewMode
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public PreviewTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public PreviewTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -99,7 +99,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new PreviewTabViewModel(dialogService, preferences, taskExecutor, stateManager);
+        this.viewModel = new PreviewTabViewModel(dialogService, preferencesService, taskExecutor, stateManager);
 
         lastKeyPressTime = System.currentTimeMillis();
 
@@ -145,11 +145,11 @@ public void initialize() {
         sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
         sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
-        previewTab.setContent(new PreviewViewer(new BibDatabaseContext(), dialogService, Globals.stateManager));
+        previewTab.setContent(new PreviewViewer(new BibDatabaseContext(), dialogService, stateManager));
         ((PreviewViewer) previewTab.getContent()).setEntry(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.layoutProperty(), value -> ((PreviewViewer) previewTab.getContent()).setLayout(value));
         previewTab.getContent().visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
-        ((PreviewViewer) previewTab.getContent()).setTheme(preferences.getTheme());
+        ((PreviewViewer) previewTab.getContent()).setTheme(preferencesService.getTheme());
 
         editArea.clear();
         editArea.setParagraphGraphicFactory(LineNumberFactory.get(editArea));
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
similarity index 98%
rename from src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
index 1d879c5258f..2b85bcfc05b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.preview;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,6 +28,7 @@
 import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.NoSelectionModel;
@@ -52,9 +53,9 @@
 /**
  * This class is Preferences -> Entry Preview tab model
  * <p>
- *     {@link PreviewTabView} is the controller of Entry Preview tab
+ *     {@link PreviewTab} is the controller of Entry Preview tab
  * </p>
- * @see PreviewTabView
+ * @see PreviewTab
  * */
 public class PreviewTabViewModel implements PreferenceTabViewModel {
 
@@ -243,11 +244,6 @@ public boolean validateSettings() {
         return true;
     }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public void addToChosen() {
         List<PreviewLayout> selected = new ArrayList<>(availableSelectionModelProperty.getValue().getSelectedItems());
         availableSelectionModelProperty.getValue().clearSelection();
diff --git a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
similarity index 69%
rename from src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
rename to src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
index 9f2103f640a..739c0248319 100644
--- a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
@@ -1,4 +1,7 @@
-package org.jabref.gui.protectedterms;
+package org.jabref.gui.preferences.protectedterms;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -12,7 +15,7 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.protectedterms.ProtectedTermsLoader;
+import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.util.StandardFileType;
 
 public class NewProtectedTermsFileDialog extends BaseDialog<Void> {
@@ -20,7 +23,7 @@ public class NewProtectedTermsFileDialog extends BaseDialog<Void> {
     private final TextField newFile = new TextField();
     private final DialogService dialogService;
 
-    public NewProtectedTermsFileDialog(ProtectedTermsLoader termsLoader, DialogService dialogService) {
+    public NewProtectedTermsFileDialog(List<ProtectedTermsList> termsLists, DialogService dialogService) {
         this.dialogService = dialogService;
 
         this.setTitle(Localization.lang("New protected terms file"));
@@ -32,10 +35,8 @@ public NewProtectedTermsFileDialog(ProtectedTermsLoader termsLoader, DialogServi
                 .build();
 
         Button browse = new Button(Localization.lang("Browse"));
-        browse.setOnAction(event -> {
-            this.dialogService.showFileSaveDialog(fileDialogConfiguration)
-                              .ifPresent(file -> newFile.setText(file.toAbsolutePath().toString()));
-        });
+        browse.setOnAction(event -> this.dialogService.showFileSaveDialog(fileDialogConfiguration)
+                                                      .ifPresent(file -> newFile.setText(file.toAbsolutePath().toString())));
 
         TextField newDescription = new TextField();
         VBox container = new VBox(10,
@@ -51,7 +52,10 @@ public NewProtectedTermsFileDialog(ProtectedTermsLoader termsLoader, DialogServi
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
-                termsLoader.addNewProtectedTermsList(newDescription.getText(), newFile.getText(), true);
+                ProtectedTermsList newList = new ProtectedTermsList(newDescription.getText(), new ArrayList<>(), newFile.getText(), false);
+                newList.setEnabled(true);
+                newList.createAndWriteHeading(newDescription.getText());
+                termsLists.add(newList);
             }
             return null;
         });
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.fxml b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.fxml
new file mode 100644
index 00000000000..0a098fc02c7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.protectedterms.ProtectedTermsTab">
+
+    <Label styleClass="titleHeader" text="%Protected terms files"/>
+
+    <TableView fx:id="filesTable" editable="true" VBox.vgrow="ALWAYS">
+        <columns>
+            <TableColumn fx:id="filesTableEnabledColumn" text="%Enabled" minWidth="80" maxWidth="60"/>
+            <TableColumn fx:id="filesTableDescriptionColumn" text="%Description"/>
+            <TableColumn fx:id="filesTableFileColumn" text="%File"/>
+            <TableColumn fx:id="filesTableEditColumn" maxWidth="25.0" minWidth="25.0" reorderable="false"/>
+            <TableColumn fx:id="filesTableDeleteColumn" maxWidth="25.0" minWidth="25.0" reorderable="false"/>
+        </columns>
+        <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+    </TableView>
+    <HBox spacing="10.0">
+        <Button text="%Add protected terms file" onAction="#addFile"/>
+        <Button text="%New protected terms file" onAction="#createNewFile"/>
+    </HBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
similarity index 81%
rename from src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java
rename to src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
index 74cff7197ae..3ab8e036e71 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -1,33 +1,30 @@
-package org.jabref.gui.protectedterms;
+package org.jabref.gui.preferences.protectedterms;
 
 import javax.inject.Inject;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.CheckBoxTableCell;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.ViewModelTableRowFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
 /**
  * Dialog for managing term list files.
  */
-public class ManageProtectedTermsDialog extends BaseDialog<Void> {
-
+public class ProtectedTermsTab extends AbstractPreferenceTabView<ProtectedTermsTabViewModel> implements PreferencesTab {
     @FXML private TableView<ProtectedTermsList> filesTable;
     @FXML private TableColumn<ProtectedTermsList, Boolean> filesTableEnabledColumn;
     @FXML private TableColumn<ProtectedTermsList, String> filesTableDescriptionColumn;
@@ -36,30 +33,23 @@ public class ManageProtectedTermsDialog extends BaseDialog<Void> {
     @FXML private TableColumn<ProtectedTermsList, Boolean> filesTableDeleteColumn;
 
     @Inject private ProtectedTermsLoader termsLoader;
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
-    private ManageProtectedTermsViewModel viewModel;
-
-    public ManageProtectedTermsDialog() {
-        this.setTitle(Localization.lang("Manage protected terms files"));
 
+    public ProtectedTermsTab() {
         ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+                  .root(this)
+                  .load();
+    }
 
-        setResultConverter(button -> {
-            if (button.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
-                viewModel.save();
-            }
-            return null;
-        });
+    @Override
+    public String getTabName() {
+        return Localization.lang("Protected terms files");
     }
 
     @FXML
     public void initialize() {
-        viewModel = new ManageProtectedTermsViewModel(termsLoader, dialogService, preferences);
+        viewModel = new ProtectedTermsTabViewModel(termsLoader, dialogService, preferencesService);
 
-        filesTable.setItems(viewModel.getTermsFiles());
+        filesTable.itemsProperty().bind(viewModel.termsFilesProperty());
         new ViewModelTableRowFactory<ProtectedTermsList>()
                 .withContextMenu(this::createContextMenu)
                 .install(filesTable);
diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsViewModel.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
similarity index 61%
rename from src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsViewModel.java
rename to src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
index 0a36a7cbf0c..5415ea6a011 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -1,17 +1,21 @@
-package org.jabref.gui.protectedterms;
+package org.jabref.gui.preferences.protectedterms;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.protectedterms.ProtectedTermsList;
@@ -25,32 +29,34 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ManageProtectedTermsViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ManageProtectedTermsViewModel.class);
+public class ProtectedTermsTabViewModel implements PreferenceTabViewModel {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsTabViewModel.class);
 
     private final ProtectedTermsLoader termsLoader;
-    private final ObservableList<ProtectedTermsList> termsFiles;
+    private final ListProperty<ProtectedTermsList> termsFilesProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final PreferencesService preferences;
     private final DialogService dialogService;
 
-    public ManageProtectedTermsViewModel(ProtectedTermsLoader termsLoader, DialogService dialogService, PreferencesService preferences) {
+    public ProtectedTermsTabViewModel(ProtectedTermsLoader termsLoader,
+                                      DialogService dialogService,
+                                      PreferencesService preferences) {
         this.termsLoader = termsLoader;
         this.dialogService = dialogService;
-        this.termsFiles = FXCollections.observableArrayList(termsLoader.getProtectedTermsLists());
         this.preferences = preferences;
     }
 
-    public ObservableList<ProtectedTermsList> getTermsFiles() {
-        return termsFiles;
+    @Override
+    public void setValues() {
+        termsFilesProperty.setValue(FXCollections.observableArrayList(termsLoader.getProtectedTermsLists()));
     }
 
-    public void save() {
+    public void storeSettings() {
         List<String> enabledExternalList = new ArrayList<>();
         List<String> disabledExternalList = new ArrayList<>();
         List<String> enabledInternalList = new ArrayList<>();
         List<String> disabledInternalList = new ArrayList<>();
 
-        for (ProtectedTermsList list : termsLoader.getProtectedTermsLists()) {
+        for (ProtectedTermsList list : termsFilesProperty.getValue()) {
             if (list.isInternalList()) {
                 if (list.isEnabled()) {
                     enabledInternalList.add(list.getLocation());
@@ -66,11 +72,14 @@ public void save() {
             }
         }
 
-        preferences.storeProtectedTermsPreferences(new ProtectedTermsPreferences(
+        ProtectedTermsPreferences newPreferences = new ProtectedTermsPreferences(
                 enabledInternalList,
                 enabledExternalList,
                 disabledInternalList,
-                disabledExternalList));
+                disabledExternalList);
+
+        preferences.storeProtectedTermsPreferences(newPreferences);
+        termsLoader.update(newPreferences);
     }
 
     public void addFile() {
@@ -81,7 +90,14 @@ public void addFile() {
                 .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> termsLoader.addProtectedTermsListFromFile(file.toAbsolutePath().toString(), true));
+                     .ifPresent(file -> {
+                         String fileName = file.toAbsolutePath().toString();
+                         try {
+                             termsFilesProperty.add(ProtectedTermsLoader.readProtectedTermsListFromFile(new File(fileName), true));
+                         } catch (FileNotFoundException e) {
+                             LOGGER.warn("Cannot find protected terms file " + fileName, e);
+                         }
+                     });
     }
 
     public void removeFile(ProtectedTermsList list) {
@@ -89,14 +105,16 @@ public void removeFile(ProtectedTermsList list) {
                 Localization.lang("Are you sure you want to remove the protected terms file?"),
                 Localization.lang("Remove protected terms file"),
                 Localization.lang("Cancel"))) {
-            if (!termsLoader.removeProtectedTermsList(list)) {
+
+            list.setEnabled(false);
+            if (!termsFilesProperty.remove(list)) {
                 LOGGER.info("Problem removing protected terms file");
             }
         }
     }
 
     public void createNewFile() {
-        dialogService.showCustomDialogAndWait(new NewProtectedTermsFileDialog(termsLoader, dialogService));
+        dialogService.showCustomDialogAndWait(new NewProtectedTermsFileDialog(termsFilesProperty, dialogService));
     }
 
     public void edit(ProtectedTermsList file) {
@@ -120,7 +138,21 @@ public void displayContent(ProtectedTermsList list) {
         );
     }
 
-    public void reloadFile(ProtectedTermsList file) {
-        termsLoader.reloadProtectedTermsList(file);
+    public void reloadFile(ProtectedTermsList oldList) {
+        try {
+            ProtectedTermsList newList = ProtectedTermsLoader.readProtectedTermsListFromFile(new File(oldList.getLocation()), oldList.isEnabled());
+            int index = termsFilesProperty.indexOf(oldList);
+            if (index >= 0) {
+                termsFilesProperty.set(index, newList);
+            } else {
+                LOGGER.warn("Problem reloading protected terms file {}.", oldList.getLocation());
+            }
+        } catch (IOException e) {
+            LOGGER.warn("Problem reloading protected terms file {}.", oldList.getLocation(), e);
+        }
+    }
+
+    public ListProperty<ProtectedTermsList> termsFilesProperty() {
+        return termsFilesProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/TableTab.fxml b/src/main/java/org/jabref/gui/preferences/table/TableTab.fxml
similarity index 93%
rename from src/main/java/org/jabref/gui/preferences/TableTab.fxml
rename to src/main/java/org/jabref/gui/preferences/table/TableTab.fxml
index d04196d0831..c65b263263f 100644
--- a/src/main/java/org/jabref/gui/preferences/TableTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTab.fxml
@@ -13,8 +13,9 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.TableTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.table.TableTab">
     <fx:define>
         <ToggleGroup fx:id="specialFieldsStoreMode"/>
         <ToggleGroup fx:id="urlDoiShownFirst"/>
@@ -24,8 +25,8 @@
     <Label styleClass="titleHeader" text="%Entry table"/>
     <Label styleClass="sectionHeader" text="%Columns"/>
     <HBox spacing="4.0">
-        <VBox spacing="4.0" HBox.hgrow="SOMETIMES">
-            <TableView fx:id="columnsList" editable="true" prefHeight="300.0" prefWidth="220.0">
+        <VBox spacing="4.0" HBox.hgrow="SOMETIMES" prefWidth="220.0">
+            <TableView fx:id="columnsList" prefHeight="300.0">
                 <columns>
                     <TableColumn fx:id="nameColumn" prefWidth="160.0" text="%Name"/>
                     <TableColumn fx:id="actionsColumn" maxWidth="40.0" minWidth="40.0" resizable="false"/>
@@ -36,7 +37,7 @@
             </TableView>
             <ComboBox fx:id="addColumnName" editable="true" maxWidth="Infinity"/>
         </VBox>
-        <VBox alignment="CENTER">
+        <VBox alignment="CENTER" HBox.hgrow="NEVER">
             <Button prefHeight="20.0" prefWidth="20.0"
                     styleClass="icon-button,narrow" onAction="#updateToCurrentColumnOrder">
                 <graphic>
@@ -76,7 +77,7 @@
                 </tooltip>
             </Button>
         </VBox>
-        <VBox spacing="10.0">
+        <VBox spacing="10.0" HBox.hgrow="SOMETIMES">
             <padding>
                 <Insets left="20.0"/>
             </padding>
diff --git a/src/main/java/org/jabref/gui/preferences/TableTabView.java b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
similarity index 95%
rename from src/main/java/org/jabref/gui/preferences/TableTabView.java
rename to src/main/java/org/jabref/gui/preferences/table/TableTab.java
index 309ae7da5dd..4ce286ccd4d 100644
--- a/src/main/java/org/jabref/gui/preferences/TableTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.table;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -16,17 +16,18 @@
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.maintable.MainTableColumnModel;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class TableTabView extends AbstractPreferenceTabView<TableTabViewModel> implements PreferencesTab {
+public class TableTab extends AbstractPreferenceTabView<TableTabViewModel> implements PreferencesTab {
 
     @FXML private TableView<MainTableColumnModel> columnsList;
     @FXML private TableColumn<MainTableColumnModel, String> nameColumn;
@@ -49,9 +50,7 @@ public class TableTabView extends AbstractPreferenceTabView<TableTabViewModel> i
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public TableTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public TableTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -63,12 +62,12 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new TableTabViewModel(dialogService, preferences);
+        this.viewModel = new TableTabViewModel(dialogService, preferencesService);
 
         setupTable();
         setupBindings();
 
-        ActionFactory actionFactory = new ActionFactory(preferences.getKeyBindingRepository());
+        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
         actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS), specialFieldsHelp);
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/TableTabViewModel.java b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
similarity index 99%
rename from src/main/java/org/jabref/gui/preferences/TableTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
index a2f464b4b2b..1ab98f3905b 100644
--- a/src/main/java/org/jabref/gui/preferences/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.table;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -21,6 +21,7 @@
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.gui.maintable.MainTableNameFormatPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.logic.l10n.Localization;
@@ -298,11 +299,6 @@ public boolean validateSettings() {
         return true;
     }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return restartWarnings;
-    }
-
     public ListProperty<MainTableColumnModel> columnsListProperty() {
         return this.columnsListProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTab.fxml b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.fxml
similarity index 78%
rename from src/main/java/org/jabref/gui/preferences/XmpPrivacyTab.fxml
rename to src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.fxml
index 8c503e453cb..0dcf73c33d9 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.fxml
@@ -10,25 +10,26 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
-         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.XmpPrivacyTabView">
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.xmp.XmpPrivacyTab">
     <Label styleClass="titleHeader" text="%XMP export privacy settings"/>
     <CheckBox fx:id="enableXmpFilter" text="%Do not write the following fields to XMP Metadata"/>
     <HBox alignment="BOTTOM_LEFT" spacing="4.0">
-        <VBox spacing="4.0" prefWidth="200.0" prefHeight="300.0">
+        <VBox spacing="4.0">
             <TableView fx:id="filterList" prefHeight="300.0" prefWidth="200.0">
                 <columns>
                     <TableColumn fx:id="fieldColumn" minWidth="100.0"
                                  text="%Field name"/>
-                    <TableColumn fx:id="actionsColumn" editable="false" minWidth="30.0" prefWidth="30.0"
-                                 maxWidth="39"
+                    <TableColumn fx:id="actionsColumn" editable="false"
+                                 minWidth="30.0" prefWidth="30.0" maxWidth="39"
                                  resizable="false" sortable="false"/>
                 </columns>
                 <columnResizePolicy>
                     <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
                 </columnResizePolicy>
             </TableView>
-            <ComboBox fx:id="addFieldName" prefWidth="Infinity" VBox.vgrow="ALWAYS"/>
+            <ComboBox fx:id="addFieldName" prefWidth="200.0" VBox.vgrow="ALWAYS"/>
         </VBox>
         <Button fx:id="addField" styleClass="icon-button,narrow" onAction="#addField"
                 prefHeight="25.0" prefWidth="25.0">
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
similarity index 92%
rename from src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
rename to src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
index 07b0ee2474a..f0998bb9b32 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.xmp;
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -11,6 +11,8 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.FieldsUtil;
 import org.jabref.gui.util.IconValidationDecorator;
@@ -18,12 +20,11 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class XmpPrivacyTabView extends AbstractPreferenceTabView<XmpPrivacyTabViewModel> implements PreferencesTab {
+public class XmpPrivacyTab extends AbstractPreferenceTabView<XmpPrivacyTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox enableXmpFilter;
     @FXML private TableView<Field> filterList;
@@ -34,9 +35,7 @@ public class XmpPrivacyTabView extends AbstractPreferenceTabView<XmpPrivacyTabVi
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public XmpPrivacyTabView(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public XmpPrivacyTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -48,7 +47,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new XmpPrivacyTabViewModel(dialogService, preferences);
+        this.viewModel = new XmpPrivacyTabViewModel(dialogService, preferencesService);
 
         enableXmpFilter.selectedProperty().bindBidirectional(viewModel.xmpFilterEnabledProperty());
         filterList.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
similarity index 95%
rename from src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
index a54f8aa8053..ba72edd4dcf 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
@@ -1,8 +1,6 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.xmp;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -13,6 +11,7 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.entry.field.Field;
@@ -101,11 +100,6 @@ public boolean validateSettings() {
         return true;
     }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return new ArrayList<>();
-    }
-
     public BooleanProperty xmpFilterEnabledProperty() {
         return xmpFilterEnabledProperty;
     }
diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsAction.java b/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsAction.java
deleted file mode 100644
index 22ea1cbed9c..00000000000
--- a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jabref.gui.protectedterms;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.SimpleCommand;
-
-import com.airhacks.afterburner.injection.Injector;
-
-public class ManageProtectedTermsAction extends SimpleCommand {
-
-    @Override
-    public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new ManageProtectedTermsDialog());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml b/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml
deleted file mode 100644
index efa00814817..00000000000
--- a/src/main/java/org/jabref/gui/protectedterms/ManageProtectedTermsDialog.fxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane xmlns:fx="http://javafx.com/fxml"
-            xmlns="http://javafx.com/javafx"
-            fx:controller="org.jabref.gui.protectedterms.ManageProtectedTermsDialog"
-            prefHeight="400.0" prefWidth="600.0">
-    <content>
-        <VBox spacing="10">
-            <TableView fx:id="filesTable" editable="true" VBox.vgrow="ALWAYS">
-                <columns>
-                    <TableColumn fx:id="filesTableEnabledColumn" text="%Enabled" minWidth="80" maxWidth="80"/>
-                    <TableColumn fx:id="filesTableDescriptionColumn" text="%Description"/>
-                    <TableColumn fx:id="filesTableFileColumn" text="%File"/>
-                    <TableColumn fx:id="filesTableEditColumn" maxWidth="40" minWidth="40.0"/>
-                    <TableColumn fx:id="filesTableDeleteColumn" maxWidth="40" minWidth="40.0"/>
-                </columns>
-                <columnResizePolicy>
-                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                </columnResizePolicy>
-            </TableView>
-            <HBox>
-                <Button text="%Add protected terms file" onAction="#addFile"/>
-                <Button text="%New protected terms file" onAction="#createNewFile"/>
-            </HBox>
-        </VBox>
-    </content>
-    <ButtonType buttonData="OK_DONE" text="%Save"/>
-    <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index e343995123a..b08ea3bfd5d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -363,8 +363,6 @@ Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Further information
 
 General=General
 
-General\ Fields=General Fields
-
 Generate=Generate
 
 Generate\ citation\ key=Generate citation key
@@ -766,8 +764,6 @@ Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Select the
 Set\ field=Set field
 Set\ fields=Set fields
 
-Set\ General\ Fields=Set General Fields
-
 Settings=Settings
 
 Shortcut=Shortcut
@@ -912,10 +908,6 @@ XMP\ export\ privacy\ settings=XMP export privacy settings
 XMP\ metadata=XMP metadata
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=You must restart JabRef for this to come into effect.
 
-You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=You must restart JabRef for the new key bindings to work properly.
-
-Your\ new\ key\ bindings\ have\ been\ stored.=Your new key bindings have been stored.
-
 The\ following\ fetchers\ are\ available\:=The following fetchers are available:
 Could\ not\ find\ fetcher\ '%0'=Could not find fetcher '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Running query '%0' with fetcher '%1'.
@@ -1546,7 +1538,7 @@ Countries\ and\ territories\ in\ English=Countries and territories in English
 Electrical\ engineering\ terms=Electrical engineering terms
 Enabled=Enabled
 Internal\ list=Internal list
-Manage\ protected\ terms\ files=Manage protected terms files
+Protected\ terms\ files=Protected terms files
 Months\ and\ weekdays\ in\ English=Months and weekdays in English
 The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=The text after the last line starting with # will be used
 Add\ protected\ terms\ file=Add protected terms file
@@ -2243,6 +2235,10 @@ Reveal\ in\ file\ explorer=Reveal in file explorer
 
 Autolink\ files=Autolink files
 
+Custom\ editor\ tabs=Custom editor tabs
+Custom\ export\ formats=Custom export formats
+Custom\ import\ formats=Custom import formats
+
 No\ list\ enabled=No list enabled
 Protect\ selection=Protect selection
 
diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelMixedAbbreviationsTabTest.java
similarity index 97%
rename from src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java
rename to src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelMixedAbbreviationsTabTest.java
index 8d6c11a54a9..9c906027888 100644
--- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelMixedAbbreviationsTest.java
+++ b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelMixedAbbreviationsTabTest.java
@@ -13,6 +13,9 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.journals.AbbreviationViewModel;
+import org.jabref.gui.preferences.journals.AbbreviationsFileViewModel;
+import org.jabref.gui.preferences.journals.JournalAbbreviationsTabViewModel;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.Abbreviation;
@@ -36,9 +39,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class ManageJournalAbbreviationsViewModelMixedAbbreviationsTest {
+class JournalAbbreviationsViewModelMixedAbbreviationsTabTest {
 
-    private ManageJournalAbbreviationsViewModel viewModel;
+    private JournalAbbreviationsTabViewModel viewModel;
     private Path emptyTestFile;
     private Path testFile1Entries;
     private Path testFile3Entries;
@@ -56,7 +59,7 @@ void setUpViewModel(@TempDir Path tempFolder) throws Exception {
 
         dialogService = mock(DialogService.class);
         TaskExecutor taskExecutor = new CurrentThreadTaskExecutor();
-        viewModel = new ManageJournalAbbreviationsViewModel(preferences, dialogService, taskExecutor, repository);
+        viewModel = new JournalAbbreviationsTabViewModel(preferences, dialogService, taskExecutor, repository);
         emptyTestFile = createTestFile(tempFolder, "emptyTestFile.csv", "");
         testFile1Entries = createTestFile(tempFolder, "testFile1Entries.csv", "Test Entry;TE" + NEWLINE + "");
         testFile3Entries = createTestFile(tempFolder, "testFile3Entries.csv", "Abbreviations;Abb;A" + NEWLINE + "Test Entry;TE" + NEWLINE + "MoreEntries;ME;M" + NEWLINE + "");
@@ -449,7 +452,7 @@ private void addFourTestFileToViewModelAndPreferences() {
         viewModel.addNewFile();
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile5EntriesWithDuplicate));
         viewModel.addNewFile();
-        viewModel.save();
+        viewModel.storeSettings();
     }
 
     /**
diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTabTest.java
similarity index 97%
rename from src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java
rename to src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTabTest.java
index 7d6d6ba7bd6..7c355f55cdc 100644
--- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest.java
+++ b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTabTest.java
@@ -13,6 +13,9 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.journals.AbbreviationViewModel;
+import org.jabref.gui.preferences.journals.AbbreviationsFileViewModel;
+import org.jabref.gui.preferences.journals.JournalAbbreviationsTabViewModel;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.JabRefException;
@@ -37,9 +40,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class ManageJournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTest {
+class JournalAbbreviationsViewModelNoShortestUniqueAbbreviationsTabTest {
 
-    private ManageJournalAbbreviationsViewModel viewModel;
+    private JournalAbbreviationsTabViewModel viewModel;
     private Path emptyTestFile;
     private Path testFile1Entries;
     private Path testFile3Entries;
@@ -57,7 +60,7 @@ void setUpViewModel(@TempDir Path tempFolder) throws Exception {
 
         dialogService = mock(DialogService.class);
         TaskExecutor taskExecutor = new CurrentThreadTaskExecutor();
-        viewModel = new ManageJournalAbbreviationsViewModel(preferences, dialogService, taskExecutor, repository);
+        viewModel = new JournalAbbreviationsTabViewModel(preferences, dialogService, taskExecutor, repository);
         emptyTestFile = createTestFile(tempFolder, "emptyTestFile.csv", "");
         testFile1Entries = createTestFile(tempFolder, "testFile1Entries.csv", "Test Entry;TE" + NEWLINE + "");
         testFile3Entries = createTestFile(tempFolder, "testFile3Entries.csv", "Abbreviations;Abb" + NEWLINE + "Test Entry;TE" + NEWLINE + "MoreEntries;ME" + NEWLINE + "");
@@ -449,7 +452,7 @@ private void addFourTestFileToViewModelAndPreferences() throws Exception {
         viewModel.addNewFile();
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile5EntriesWithDuplicate));
         viewModel.addNewFile();
-        viewModel.save();
+        viewModel.storeSettings();
     }
 
     /**
diff --git a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTabTest.java
similarity index 97%
rename from src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java
rename to src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTabTest.java
index e3a0ecf875c..f0811c06f45 100644
--- a/src/test/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest.java
+++ b/src/test/java/org/jabref/gui/journals/JournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTabTest.java
@@ -13,6 +13,9 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.journals.AbbreviationViewModel;
+import org.jabref.gui.preferences.journals.AbbreviationsFileViewModel;
+import org.jabref.gui.preferences.journals.JournalAbbreviationsTabViewModel;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.JabRefException;
@@ -37,9 +40,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-class ManageJournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTest {
+class JournalAbbreviationsViewModelWithShortestUniqueAbbreviationsTabTest {
 
-    private ManageJournalAbbreviationsViewModel viewModel;
+    private JournalAbbreviationsTabViewModel viewModel;
     private Path emptyTestFile;
     private Path testFile1Entries;
     private Path testFile3Entries;
@@ -57,7 +60,7 @@ void setUpViewModel(@TempDir Path tempFolder) throws Exception {
 
         dialogService = mock(DialogService.class);
         TaskExecutor taskExecutor = new CurrentThreadTaskExecutor();
-        viewModel = new ManageJournalAbbreviationsViewModel(preferences, dialogService, taskExecutor, repository);
+        viewModel = new JournalAbbreviationsTabViewModel(preferences, dialogService, taskExecutor, repository);
         emptyTestFile = createTestFile(tempFolder, "emptyTestFile.csv", "");
         testFile1Entries = createTestFile(tempFolder, "testFile1Entries.csv", "Test Entry;TE;T" + NEWLINE + "");
         testFile3Entries = createTestFile(tempFolder, "testFile3Entries.csv", "Abbreviations;Abb;A" + NEWLINE + "Test Entry;TE;T" + NEWLINE + "MoreEntries;ME;M" + NEWLINE + "");
@@ -449,7 +452,7 @@ private void addFourTestFileToViewModelAndPreferences() throws Exception {
         viewModel.addNewFile();
         when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile5EntriesWithDuplicate));
         viewModel.addNewFile();
-        viewModel.save();
+        viewModel.storeSettings();
     }
 
     /**
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
similarity index 92%
rename from src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
rename to src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
index 748a6554157..2eb8da4ea63 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
@@ -7,6 +7,8 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.preferences.keybindings.KeyBindingViewModel;
+import org.jabref.gui.preferences.keybindings.KeyBindingsTabViewModel;
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.PreferencesService;
 
@@ -23,15 +25,15 @@
 /**
  * Test class for the keybindings dialog view model
  */
-class KeyBindingsDialogViewModelTest {
+class KeyBindingsTabModelTest {
 
-    private KeyBindingsDialogViewModel model;
+    private KeyBindingsTabViewModel model;
     private KeyBindingRepository keyBindingRepository;
 
     @BeforeEach
     void setUp() {
         keyBindingRepository = new KeyBindingRepository();
-        model = new KeyBindingsDialogViewModel(keyBindingRepository, mock(DialogService.class), mock(PreferencesService.class));
+        model = new KeyBindingsTabViewModel(keyBindingRepository, mock(DialogService.class), mock(PreferencesService.class));
     }
 
     @Test
@@ -43,7 +45,7 @@ void testInvalidKeyBindingIsNotSaved() {
         model.setNewBindingForCurrent(shortcutKeyEvent);
         KeyCombination combination = KeyCombination.keyCombination(keyBindingRepository.get(KeyBinding.COPY).get());
         assertFalse(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
-        model.saveKeyBindings();
+        model.storeSettings();
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent));
     }
 
@@ -61,7 +63,7 @@ void testSpecialKeysValidKeyBindingIsSaved() {
 
         assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
 
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.IMPORT_INTO_NEW_DATABASE,
                                                                     shortcutKeyEvent));
@@ -100,7 +102,7 @@ void testSaveNewKeyBindingsToPreferences() {
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
@@ -114,7 +116,7 @@ void testSaveNewSpecialKeysKeyBindingsToPreferences() {
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
@@ -129,12 +131,12 @@ void testSetAllKeyBindingsToDefault() {
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         model.setNewBindingForCurrent(shortcutKeyEvent);
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         keyBindingRepository.resetToDefault();
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
@@ -164,12 +166,12 @@ void testSetSingleKeyBindingToDefault() {
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         model.setNewBindingForCurrent(shortcutKeyEvent);
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
 
         viewModel.resetToDefault();
-        model.saveKeyBindings();
+        model.storeSettings();
 
         assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
     }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index e4b246e9bfb..b40e43b03a3 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -25,6 +25,9 @@
 
 import javafx.fxml.FXMLLoader;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import org.mockito.Answers;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
 public class LocalizationParser {
@@ -188,6 +191,9 @@ private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path
     private static List<LocalizationEntry> getLanguageKeysInFxmlFile(Path path, LocalizationBundleForTest type) {
         List<String> result = new ArrayList<>();
 
+        // Afterburner ViewLoader forces a controller factory, but we do not need any controller
+        MockedStatic<ViewLoader> viewLoader = Mockito.mockStatic(ViewLoader.class, Answers.RETURNS_DEEP_STUBS);
+
         // Record which keys are requested; we pretend that we have all keys
         ResourceBundle registerUsageResourceBundle = new ResourceBundle() {
 
@@ -212,11 +218,14 @@ public boolean containsKey(String key) {
             FXMLLoader loader = new FXMLLoader(path.toUri().toURL(), registerUsageResourceBundle);
             // We don't want to initialize controller
             loader.setControllerFactory(Mockito::mock);
+
             // We need to load in "static mode" because otherwise fxml files with fx:root doesn't work
             setStaticLoad(loader);
             loader.load();
         } catch (IOException exception) {
             throw new RuntimeException(exception);
+        } finally {
+            viewLoader.close();
         }
 
         return result.stream()