diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index c913bb5ad9e..5236268d894 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -1015,6 +1015,11 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-fill: -jr-warn;
 }
 
+.warning-message {
+    -fx-fill: -jr-error;
+    -fx-text-fill: -jr-error;
+}
+
 .error-icon {
     -fx-text-fill: -jr-error;
     -fx-fill: -jr-error;
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 6e9dca496b1..39e0ff48d0b 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -321,7 +321,8 @@ public enum JabRefIcons implements JabRefIcon {
         LATEX_FILE_DIRECTORY(MaterialDesignIcon.FOLDER_OUTLINE),
         LATEX_FILE(MaterialDesignIcon.FILE_OUTLINE),
         LATEX_COMMENT(MaterialDesignIcon.COMMENT_TEXT_OUTLINE),
-        LATEX_LINE(MaterialDesignIcon.FORMAT_LINE_SPACING);
+        LATEX_LINE(MaterialDesignIcon.FORMAT_LINE_SPACING),
+        PASSWORD_REVEALED(MaterialDesignIcon.EYE);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
new file mode 100644
index 00000000000..b957082890b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -0,0 +1,37 @@
+package org.jabref.gui.preferences;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import javafx.scene.Node;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.preferences.JabRefPreferences;
+
+public abstract class AbstractPreferenceTabView extends VBox implements PreferencesTab {
+
+    @Inject protected TaskExecutor taskExecutor;
+    @Inject protected DialogService dialogService;
+
+    protected PreferenceTabViewModel viewModel;
+
+    protected JabRefPreferences preferences;
+
+    @Override
+    public Node getBuilder() { return this; }
+
+    @Override
+    public void setValues() { viewModel.setValues(); }
+
+    @Override
+    public void storeSettings() { viewModel.storeSettings(); }
+
+    @Override
+    public boolean validateSettings() { return viewModel.validateSettings(); }
+
+    @Override
+    public List<String> getRestartWarnings() { return viewModel.getRestartWarnings(); }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
new file mode 100644
index 00000000000..ae24bdd63bd
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?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.AdvancedTabView">
+    <children>
+        <Label styleClass="titleHeader" text="%Advanced" />
+        <Label styleClass="sectionHeader" text="%Remote operation" />
+        <Label fx:id="remoteLabel" text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time." textOverrun="CLIP" wrapText="true" />
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <CheckBox fx:id="remoteServer" text="%Listen for remote operation on port" />
+                <TextField fx:id="remotePort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+                <Button fx:id="remoteHelp" prefWidth="20.0" />
+            </children>
+        </HBox>
+
+        <Label styleClass="sectionHeader" text="%Search IEEEXplore" />
+        <CheckBox fx:id="useIEEELatexAbbreviations" text="%Use IEEE LaTeX abbreviations" />
+
+        <Label styleClass="sectionHeader" text="%Import conversions" />
+        <CheckBox fx:id="useCaseKeeper" text="%Add {} to specified title words on search to keep the correct case" />
+        <CheckBox fx:id="useUnitFormatter" text="%Format units by adding non-breaking separators and keeping the correct case on search" />
+
+        <Label styleClass="sectionHeader" text="%Network" />
+        <GridPane maxHeight="-Infinity" maxWidth="-Infinity" hgap="10.0" vgap="10.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            </rowConstraints>
+            <children>
+                <CheckBox fx:id="proxyUse" text="%Use custom proxy configuration" GridPane.columnSpan="3" GridPane.rowIndex="0" />
+                <Label fx:id="proxyHostnameLabel" text="%Hostname" GridPane.rowIndex="1" />
+                <TextField fx:id="proxyHostname" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                <Label fx:id="proxyPortLabel" text="%Port" GridPane.rowIndex="2" />
+                <TextField fx:id="proxyPort" maxWidth="100.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                <CheckBox fx:id="proxyUseAuthentication" text="%Proxy requires authentication" GridPane.columnSpan="3" GridPane.rowIndex="3" />
+                <Label fx:id="proxyUsernameLabel" text="%Username" GridPane.rowIndex="4" />
+                <TextField fx:id="proxyUsername" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                <Label fx:id="proxyPasswordLabel" text="%Password" GridPane.rowIndex="5" />
+                <CustomPasswordField fx:id="proxyPassword" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+                <Label fx:id="proxyAttentionLabel" styleClass="warning-message"
+                       text="%Attention: Password is stored in plain text!" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+            </children>
+        </GridPane>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java b/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
deleted file mode 100644
index b1889a16786..00000000000
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.util.Optional;
-
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.Separator;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.text.Text;
-
-import org.jabref.Globals;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.remote.JabRefMessageHandler;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.remote.RemotePreferences;
-import org.jabref.logic.remote.RemoteUtil;
-import org.jabref.preferences.JabRefPreferences;
-
-class AdvancedTab extends Pane implements PrefsTab {
-
-    private final JabRefPreferences preferences;
-    private final CheckBox useRemoteServer;
-    private final CheckBox useIEEEAbrv;
-    private final TextField remoteServerPort;
-    private final CheckBox useCaseKeeperOnSearch;
-    private final CheckBox useUnitFormatterOnSearch;
-    private final GridPane builder = new GridPane();
-
-    private final RemotePreferences remotePreferences;
-    private final DialogService dialogService;
-
-    public AdvancedTab(DialogService dialogService, JabRefPreferences prefs) {
-        this.dialogService = dialogService;
-        preferences = prefs;
-        remotePreferences = prefs.getRemotePreferences();
-        builder.setVgap(7);
-
-        useRemoteServer = new CheckBox(Localization.lang("Listen for remote operation on port") + ':');
-        useIEEEAbrv = new CheckBox(Localization.lang("Use IEEE LaTeX abbreviations"));
-        remoteServerPort = new TextField();
-        useCaseKeeperOnSearch = new CheckBox(Localization.lang("Add {} to specified title words on search to keep the correct case"));
-        useUnitFormatterOnSearch = new CheckBox(Localization.lang("Format units by adding non-breaking separators and keeping the correct case on search"));
-
-        Label remoteOperation = new Label(Localization.lang("Remote operation"));
-        remoteOperation.getStyleClass().add("sectionHeader");
-        builder.add(remoteOperation, 2, 1);
-        if (Globals.prefs.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS)) {
-            Text textRemote = new Text(Localization.lang("This feature lets new files be opened or imported into an already running instance of JabRef " +
-                    "instead of opening a new instance. For instance, this is useful when you open a file in JabRef " +
-                    "from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time."));
-            textRemote.setWrappingWidth(600);
-            builder.add(textRemote, 2, 4);
-        }
-
-        HBox p = new HBox();
-        p.setSpacing(8);
-        p.setAlignment(Pos.CENTER_LEFT);
-        ActionFactory factory = new ActionFactory(preferences.getKeyBindingRepository());
-        Button help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE));
-        help.setMaxWidth(Double.MAX_VALUE);
-        p.getChildren().setAll(useRemoteServer, remoteServerPort, help);
-        builder.add(p, 2, 6);
-
-        builder.add(new Separator(), 2, 11);
-        Label explore = new Label(Localization.lang("Search %0", "IEEEXplore"));
-        explore.getStyleClass().add("sectionHeader");
-        builder.add(explore, 2, 12);
-        builder.add(useIEEEAbrv, 2, 14);
-
-        builder.add(new Separator(), 2, 19);
-        Label importConversions = new Label(Localization.lang("Import conversions"));
-        importConversions.getStyleClass().add("sectionHeader");
-        builder.add(importConversions, 2, 20);
-
-        builder.add(useCaseKeeperOnSearch, 2, 21);
-        builder.add(useUnitFormatterOnSearch, 2, 23);
-
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        useRemoteServer.setSelected(remotePreferences.useRemoteServer());
-        remoteServerPort.setText(String.valueOf(remotePreferences.getPort()));
-        useIEEEAbrv.setSelected(Globals.prefs.getJournalAbbreviationPreferences().useIEEEAbbreviations());
-        useCaseKeeperOnSearch.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH));
-        useUnitFormatterOnSearch.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH));
-    }
-
-    @Override
-    public void storeSettings() {
-        JournalAbbreviationPreferences journalAbbreviationPreferences = Globals.prefs.getJournalAbbreviationPreferences();
-        if (journalAbbreviationPreferences.useIEEEAbbreviations() != useIEEEAbrv.isSelected()) {
-            journalAbbreviationPreferences.setUseIEEEAbbreviations(useIEEEAbrv.isSelected());
-            Globals.prefs.storeJournalAbbreviationPreferences(journalAbbreviationPreferences);
-            Globals.journalAbbreviationLoader.update(journalAbbreviationPreferences);
-        }
-        storeRemoteSettings();
-
-        preferences.putBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH, useCaseKeeperOnSearch.isSelected());
-        preferences.putBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH, useUnitFormatterOnSearch.isSelected());
-    }
-
-    private void storeRemoteSettings() {
-        getPortAsInt().ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-
-                if (remotePreferences.useRemoteServer()) {
-
-                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showWarningDialogAndWait(Localization.lang("Remote server port"),
-                            Localization.lang("Remote server port")
-                                    .concat(" ")
-                                    .concat(Localization.lang("You must restart JabRef for this to come into effect."))));
-
-                }
-            }
-        });
-
-        remotePreferences.setUseRemoteServer(useRemoteServer.isSelected());
-        if (remotePreferences.useRemoteServer()) {
-            Globals.REMOTE_LISTENER.openAndStart(new JabRefMessageHandler(), remotePreferences.getPort());
-        } else {
-            Globals.REMOTE_LISTENER.stop();
-        }
-        preferences.setRemotePreferences(remotePreferences);
-    }
-
-    private Optional<Integer> getPortAsInt() {
-        try {
-            return Optional.of(Integer.parseInt(remoteServerPort.getText()));
-        } catch (NumberFormatException ex) {
-            return Optional.empty();
-        }
-    }
-
-    @Override
-    public boolean validateSettings() {
-        try {
-            int portNumber = Integer.parseInt(remoteServerPort.getText());
-            if (RemoteUtil.isUserPort(portNumber)) {
-                return true;
-            } else {
-                throw new NumberFormatException();
-            }
-        } catch (NumberFormatException ex) {
-
-            DefaultTaskExecutor.runInJavaFXThread(()-> dialogService.showErrorDialogAndWait(Localization.lang("Remote server port"),
-                    Localization.lang("You must enter an integer value in the interval 1025-65535 in the text field for")
-                            + " '" + Localization.lang("Remote server port") + '\''));
-
-            return false;
-        }
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Advanced");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
new file mode 100644
index 00000000000..3e2ce55a038
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
@@ -0,0 +1,131 @@
+package org.jabref.gui.preferences;
+
+import javafx.application.Platform;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+
+import org.jabref.Globals;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.controlsfx.control.textfield.CustomPasswordField;
+
+public class AdvancedTabView extends AbstractPreferenceTabView implements PreferencesTab {
+    @FXML private Label remoteLabel;
+    @FXML private CheckBox remoteServer;
+    @FXML private TextField remotePort;
+    @FXML private Button remoteHelp;
+
+    @FXML private CheckBox useIEEELatexAbbreviations;
+    @FXML private CheckBox useCaseKeeper;
+    @FXML private CheckBox useUnitFormatter;
+
+    @FXML private CheckBox proxyUse;
+    @FXML private Label proxyHostnameLabel;
+    @FXML private TextField proxyHostname;
+    @FXML private Label proxyPortLabel;
+    @FXML private TextField proxyPort;
+    @FXML private CheckBox proxyUseAuthentication;
+    @FXML private Label proxyUsernameLabel;
+    @FXML private TextField proxyUsername;
+    @FXML private Label proxyPasswordLabel;
+    @FXML private CustomPasswordField proxyPassword;
+    @FXML private Label proxyAttentionLabel;
+
+    private String proxyPasswordText = "";
+    private int proxyPasswordCaretPosition = 0;
+
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+
+    public AdvancedTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Advanced"); }
+
+    public void initialize() {
+        AdvancedTabViewModel advancedTabViewModel = new AdvancedTabViewModel(dialogService, preferences);
+        this.viewModel = advancedTabViewModel;
+
+        remoteLabel.setVisible(preferences.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS));
+        remoteServer.selectedProperty().bindBidirectional(advancedTabViewModel.remoteServerProperty());
+        remotePort.textProperty().bindBidirectional(advancedTabViewModel.remotePortProperty());
+        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
+
+        useIEEELatexAbbreviations.selectedProperty().bindBidirectional(advancedTabViewModel.useIEEELatexAbbreviationsProperty());
+
+        useCaseKeeper.selectedProperty().bindBidirectional(advancedTabViewModel.useCaseKeeperProperty());
+        useUnitFormatter.selectedProperty().bindBidirectional(advancedTabViewModel.useUnitFormatterProperty());
+
+        proxyUse.selectedProperty().bindBidirectional(advancedTabViewModel.proxyUseProperty());
+        proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyHostname.textProperty().bindBidirectional(advancedTabViewModel.proxyHostnameProperty());
+        proxyHostname.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyPortLabel.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyPort.textProperty().bindBidirectional(advancedTabViewModel.proxyPortProperty());
+        proxyPort.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyUseAuthentication.selectedProperty().bindBidirectional(advancedTabViewModel.proxyUseAuthenticationProperty());
+        proxyUseAuthentication.disableProperty().bind(proxyUse.selectedProperty().not());
+
+        BooleanBinding proxyCustomAndAuthentication = proxyUse.selectedProperty().and(proxyUseAuthentication.selectedProperty());
+        proxyUsernameLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
+        proxyUsername.textProperty().bindBidirectional(advancedTabViewModel.proxyUsernameProperty());
+        proxyUsername.disableProperty().bind(proxyCustomAndAuthentication.not());
+        proxyPasswordLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
+        proxyPassword.textProperty().bindBidirectional(advancedTabViewModel.proxyPasswordProperty());
+        proxyPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
+        proxyAttentionLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
+
+        proxyPassword.setRight(IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode());
+        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_PRESSED, this::proxyPasswordReveal);
+        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
+        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
+
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE), remoteHelp);
+
+        validationVisualizer.setDecoration(new IconValidationDecorator());
+        Platform.runLater(() -> {
+            validationVisualizer.initVisualization(advancedTabViewModel.remotePortValidationStatus(), remotePort);
+            validationVisualizer.initVisualization(advancedTabViewModel.proxyHostnameValidationStatus(), proxyHostname);
+            validationVisualizer.initVisualization(advancedTabViewModel.proxyPortValidationStatus(), proxyPort);
+            validationVisualizer.initVisualization(advancedTabViewModel.proxyUsernameValidationStatus(), proxyUsername);
+            validationVisualizer.initVisualization(advancedTabViewModel.proxyPasswordValidationStatus(), proxyPassword);
+        });
+    }
+
+    private void proxyPasswordReveal(MouseEvent event) {
+        proxyPasswordText = proxyPassword.getText();
+        proxyPasswordCaretPosition = proxyPassword.getCaretPosition();
+        proxyPassword.clear();
+        proxyPassword.setPromptText(proxyPasswordText);
+    }
+
+    private void proxyPasswordMask(MouseEvent event) {
+        if (!proxyPasswordText.equals("")) {
+            proxyPassword.setText(proxyPasswordText);
+            proxyPassword.positionCaret(proxyPasswordCaretPosition);
+            proxyPassword.setPromptText("");
+            proxyPasswordText = "";
+            proxyPasswordCaretPosition = 0;
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
new file mode 100644
index 00000000000..aeecbd871c4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
@@ -0,0 +1,253 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.remote.JabRefMessageHandler;
+import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.ProxyPreferences;
+import org.jabref.logic.net.ProxyRegisterer;
+import org.jabref.logic.remote.RemotePreferences;
+import org.jabref.logic.remote.RemoteUtil;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+
+public class AdvancedTabViewModel implements PreferenceTabViewModel {
+    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
+    private final StringProperty remotePortProperty = new SimpleStringProperty("");
+    private final BooleanProperty useIEEELatexAbbreviationsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty useCaseKeeperProperty = new SimpleBooleanProperty();
+    private final BooleanProperty useUnitFormatterProperty = new SimpleBooleanProperty();
+    private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
+    private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
+    private final StringProperty proxyPortProperty = new SimpleStringProperty("");
+    private final BooleanProperty proxyUseAuthenticationProperty = new SimpleBooleanProperty();
+    private final StringProperty proxyUsernameProperty = new SimpleStringProperty("");
+    private final StringProperty proxyPasswordProperty = new SimpleStringProperty("");
+
+    private FunctionBasedValidator remotePortValidator;
+    private FunctionBasedValidator proxyHostnameValidator;
+    private FunctionBasedValidator proxyPortValidator;
+    private FunctionBasedValidator proxyUsernameValidator;
+    private FunctionBasedValidator proxyPasswordValidator;
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+    private final RemotePreferences remotePreferences;
+    private final ProxyPreferences proxyPreferences;
+
+    private List<String> restartWarning = new ArrayList<>();
+
+    public AdvancedTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.remotePreferences = preferences.getRemotePreferences();
+        this.proxyPreferences = preferences.getProxyPreferences();
+
+        setValues();
+
+        remotePortValidator = new FunctionBasedValidator<>(
+                remotePortProperty,
+                input -> {
+                    try {
+                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
+                        return RemoteUtil.isUserPort(portNumber);
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                },
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Advanced"),
+                        Localization.lang("Remote operation"),
+                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+
+        proxyHostnameValidator = new FunctionBasedValidator<>(
+                proxyHostnameProperty,
+                input -> !StringUtil.isNullOrEmpty(input),
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Advanced"),
+                        Localization.lang("Network"),
+                        Localization.lang("Please specify a hostname"))));
+
+        proxyPortValidator = new FunctionBasedValidator<>(
+                proxyPortProperty,
+                input -> getPortAsInt(input).isPresent(),
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Advanced"),
+                        Localization.lang("Network"),
+                        Localization.lang("Please specify a port"))));
+
+        proxyUsernameValidator = new FunctionBasedValidator<>(
+                proxyUsernameProperty,
+                input -> !StringUtil.isNullOrEmpty(input),
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Advanced"),
+                        Localization.lang("Network"),
+                        Localization.lang("Please specify a username"))));
+
+        proxyPasswordValidator = new FunctionBasedValidator<>(
+                proxyPasswordProperty,
+                input -> input.length() > 0,
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("Advanced"),
+                        Localization.lang("Network"),
+                        Localization.lang("Please specify a password"))));
+    }
+
+    public void setValues() {
+        remoteServerProperty.setValue(remotePreferences.useRemoteServer());
+        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+
+        useIEEELatexAbbreviationsProperty.setValue(preferences.getJournalAbbreviationPreferences().useIEEEAbbreviations());
+
+        useCaseKeeperProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH));
+        useUnitFormatterProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH));
+
+        proxyUseProperty.setValue(proxyPreferences.isUseProxy());
+        proxyHostnameProperty.setValue(proxyPreferences.getHostname());
+        proxyPortProperty.setValue(proxyPreferences.getPort());
+        proxyUseAuthenticationProperty.setValue(proxyPreferences.isUseAuthentication());
+        proxyUsernameProperty.setValue(proxyPreferences.getUsername());
+        proxyPasswordProperty.setValue(proxyPreferences.getPassword());
+    }
+
+    public void storeSettings() {
+        storeRemoteSettings();
+
+        JournalAbbreviationPreferences journalAbbreviationPreferences = preferences.getJournalAbbreviationPreferences();
+        if (journalAbbreviationPreferences.useIEEEAbbreviations() != useIEEELatexAbbreviationsProperty.getValue()) {
+            journalAbbreviationPreferences.setUseIEEEAbbreviations(useIEEELatexAbbreviationsProperty.getValue());
+            preferences.storeJournalAbbreviationPreferences(journalAbbreviationPreferences);
+            Globals.journalAbbreviationLoader.update(journalAbbreviationPreferences);
+        }
+
+        preferences.putBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH, useCaseKeeperProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH, useUnitFormatterProperty.getValue());
+
+        storeProxySettings();
+    }
+
+    private void storeRemoteSettings() {
+        RemotePreferences newRemotePreferences = new RemotePreferences(
+                remotePreferences.getPort(),
+                remoteServerProperty.getValue()
+        );
+
+        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
+            if (remotePreferences.isDifferentPort(newPort)) {
+                newRemotePreferences.setPort(newPort);
+
+                if (newRemotePreferences.useRemoteServer()) {
+                    restartWarning.add(Localization.lang("Remote server port") + ": " + newPort);
+                }
+            }
+        });
+
+        if (newRemotePreferences.useRemoteServer()) {
+            Globals.REMOTE_LISTENER.openAndStart(new JabRefMessageHandler(), remotePreferences.getPort());
+        } else {
+            Globals.REMOTE_LISTENER.stop();
+        }
+
+        preferences.setRemotePreferences(newRemotePreferences);
+    }
+
+    private void storeProxySettings() {
+        ProxyPreferences newProxyPreferences = new ProxyPreferences(
+                proxyUseProperty.getValue(),
+                proxyHostnameProperty.getValue().trim(),
+                proxyPortProperty.getValue().trim(),
+                proxyUseAuthenticationProperty.getValue(),
+                proxyUsernameProperty.getValue().trim(),
+                proxyPasswordProperty.getValue()
+        );
+
+        if (!newProxyPreferences.equals(proxyPreferences)) {
+            ProxyRegisterer.register(newProxyPreferences);
+        }
+        preferences.storeProxyPreferences(newProxyPreferences);
+    }
+
+    private Optional<Integer> getPortAsInt(String value) {
+        try {
+            return Optional.of(Integer.parseInt(value));
+        } catch (NumberFormatException ex) {
+            return Optional.empty();
+        }
+    }
+
+    public ValidationStatus remotePortValidationStatus() { return remotePortValidator.getValidationStatus(); }
+
+    public ValidationStatus proxyHostnameValidationStatus() { return proxyHostnameValidator.getValidationStatus(); }
+
+    public ValidationStatus proxyPortValidationStatus() { return proxyPortValidator.getValidationStatus(); }
+
+    public ValidationStatus proxyUsernameValidationStatus() { return proxyUsernameValidator.getValidationStatus(); }
+
+    public ValidationStatus proxyPasswordValidationStatus() { return proxyPasswordValidator.getValidationStatus(); }
+
+    public boolean validateSettings() {
+        CompositeValidator validator = new CompositeValidator();
+
+        if (remoteServerProperty.getValue()) {
+            validator.addValidators(remotePortValidator);
+        }
+
+        if (proxyUseProperty.getValue()) {
+            validator.addValidators(proxyHostnameValidator);
+            validator.addValidators(proxyPortValidator);
+
+            if (proxyUseAuthenticationProperty.getValue()) {
+                validator.addValidators(proxyUsernameValidator);
+                validator.addValidators(proxyPasswordValidator);
+            }
+        }
+
+        ValidationStatus validationStatus = validator.getValidationStatus();
+        if (!validationStatus.isValid()) {
+            validationStatus.getHighestMessage().ifPresent(message ->
+                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() { return restartWarning; }
+
+    public BooleanProperty remoteServerProperty() { return remoteServerProperty; }
+
+    public StringProperty remotePortProperty() { return remotePortProperty; }
+
+    public BooleanProperty useIEEELatexAbbreviationsProperty() { return useIEEELatexAbbreviationsProperty; }
+
+    public BooleanProperty useCaseKeeperProperty() { return useCaseKeeperProperty; }
+
+    public BooleanProperty useUnitFormatterProperty() { return useUnitFormatterProperty; }
+
+    public BooleanProperty proxyUseProperty() { return proxyUseProperty; }
+
+    public StringProperty proxyHostnameProperty() { return proxyHostnameProperty; }
+
+    public StringProperty proxyPortProperty() { return proxyPortProperty; }
+
+    public BooleanProperty proxyUseAuthenticationProperty() { return proxyUseAuthenticationProperty; }
+
+    public StringProperty proxyUsernameProperty() { return proxyUsernameProperty; }
+
+    public StringProperty proxyPasswordProperty() { return proxyPasswordProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
index ae697887ca7..4f48c40b390 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
@@ -18,7 +21,7 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
-class AppearancePrefsTab extends Pane implements PrefsTab {
+class AppearancePrefsTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
     private final CheckBox fontTweaksLAF;
@@ -127,4 +130,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Appearance");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
index 2cf6495d54d..834e879fffe 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternPrefTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
@@ -17,7 +20,7 @@
 /**
  * The Preferences panel for key generation.
  */
-class BibtexKeyPatternPrefTab extends BibtexKeyPatternPanel implements PrefsTab {
+class BibtexKeyPatternPrefTab extends BibtexKeyPatternPanel implements PreferencesTab {
 
     private final JabRefPreferences prefs;
     private final GridPane builder = new GridPane();
@@ -137,4 +140,7 @@ public void setValues() {
     public String getTabName() {
         return Localization.lang("BibTeX key generator");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
index 143f9871bd1..aa3770d25f8 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
@@ -20,7 +23,7 @@
 import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
 import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_FULL;
 
-class EntryEditorPrefsTab extends Pane implements PrefsTab {
+class EntryEditorPrefsTab extends Pane implements PreferencesTab {
 
     private final CheckBox autoOpenForm;
     private final CheckBox defSource;
@@ -305,4 +308,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Entry editor");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
index 000f2bd8053..c4a802e679c 100644
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.scene.Node;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
@@ -12,7 +15,7 @@
 /**
  * Preference tab for file sorting options.
  */
-class ExportSortingPrefsTab extends Pane implements PrefsTab {
+class ExportSortingPrefsTab extends Pane implements PreferencesTab {
 
     private final SaveOrderConfigDisplayView exportOrderPanel;
     private final GridPane builder = new GridPane();
@@ -48,4 +51,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Export sorting");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
index 3876eace1bd..51b9eecd5e5 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
@@ -26,125 +26,104 @@
         <Label styleClass="titleHeader" text="%External programs"/>
         <Label styleClass="sectionHeader" text="%Sending of emails"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
-
             <children>
                 <Label text="%Subject for sending an email with references"/>
-                <TextField fx:id="eMailReferenceSubject"/>
+                <TextField fx:id="eMailReferenceSubject" minWidth="150.0" />
             </children>
         </HBox>
-        <CheckBox fx:id="autoOpenAttachedFolders"
-                  text="%Automatically open folders of attached files"/>
+        <CheckBox fx:id="autoOpenAttachedFolders" text="%Automatically open folders of attached files"/>
+
         <Label styleClass="sectionHeader" text="%Push applications"/>
         <HBox>
-            <GridPane alignment="CENTER_LEFT">
+            <GridPane alignment="CENTER_LEFT" hgap="10.0">
                 <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="200.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="10.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="140.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0" />
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="150.0" />
                 </columnConstraints>
                 <rowConstraints>
-                    <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                    <RowConstraints minHeight="-Infinity" prefHeight="10.0" vgrow="SOMETIMES"/>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                    <RowConstraints minHeight="4.0" vgrow="SOMETIMES" />
+                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                    <RowConstraints minHeight="16.0" vgrow="SOMETIMES" />
+                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
                 </rowConstraints>
                 <children>
                     <Label text="%Application to push entries to"/>
-                    <ComboBox fx:id="pushToApplicationCombo" minWidth="-Infinity" prefWidth="200.0"
-                              GridPane.columnIndex="2"/>
-                    <Button onAction="#pushToApplicationSettings" prefWidth="140.0"
-                            text="%Application settings" GridPane.columnIndex="4"/>
-                    <Label text="%Cite command" GridPane.rowIndex="1"/>
-                    <TextField fx:id="citeCommand" minWidth="-Infinity" prefWidth="200.0" GridPane.columnIndex="2"
-                               GridPane.rowIndex="1"/>
-                    <Button onAction="#manageExternalFileTypes" prefWidth="200.0"
-                            text="%Manage external file types" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+                    <ComboBox fx:id="pushToApplicationCombo" prefWidth="200.0" GridPane.columnIndex="1"/>
+                    <Button onAction="#pushToApplicationSettings" prefWidth="150.0" text="%Application settings" GridPane.columnIndex="2"/>
+                    <Label text="%Cite command" GridPane.rowIndex="2"/>
+                    <TextField fx:id="citeCommand" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                    <Button onAction="#manageExternalFileTypes" prefWidth="200.0" text="%Manage external file types" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
                 </children>
             </GridPane>
         </HBox>
+
         <Label styleClass="sectionHeader" text="%Open console"/>
-        <VBox spacing="8.0">
+        <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="350.0"/>
+                <ColumnConstraints hgrow="SOMETIMES"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+            </rowConstraints>
             <children>
-                <RadioButton fx:id="useTerminalDefault" text="%Use default terminal emulator"
-                             toggleGroup="$openConsole"/>
-                <HBox alignment="CENTER_LEFT" spacing="10.0">
-                    <children>
-                        <RadioButton fx:id="useTerminalSpecial" lineSpacing="10.0"
-                                     prefWidth="200.0" text="%Execute command" toggleGroup="$openConsole"/>
-                        <TextField fx:id="useTerminalCommand" prefWidth="350.0" disable="${!useTerminalSpecial.selected}">
-                            <tooltip>
-                                <Tooltip
-                                        text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
-                            </tooltip>
-                        </TextField>
-                        <Button fx:id="" text="%Browse" onAction="#useTerminalCommandBrowse" disable="${!useTerminalSpecial.selected}"/>
-                    </children>
-                </HBox>
+                <RadioButton fx:id="useTerminalDefault" text="%Use default terminal emulator" toggleGroup="$openConsole"/>
+                <RadioButton fx:id="useTerminalSpecial" text="%Execute command" GridPane.rowIndex="1" toggleGroup="$openConsole"/>
+                <TextField fx:id="useTerminalCommand" prefWidth="350.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                    <tooltip>
+                        <Tooltip text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
+                    </tooltip>
+                </TextField>
+                <Button fx:id="useTerminalBrowse" text="%Browse" onAction="#useTerminalCommandBrowse" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
             </children>
-        </VBox>
+        </GridPane>
+
         <Label styleClass="sectionHeader" text="%Open PDF"/>
-        <HBox>
-            <GridPane alignment="CENTER_LEFT">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="350.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" percentWidth="0.0" prefWidth="10.0"/>
-                    <ColumnConstraints hgrow="SOMETIMES"/>
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                </rowConstraints>
-                <children>
-                    <RadioButton fx:id="usePDFAcrobat" text="%Adobe Acrobat Reader"
-                                 toggleGroup="$openPDF"/>
-                    <TextField fx:id="usePDFAcrobatCommand" prefWidth="350.0" GridPane.columnIndex="2" disable="${!usePDFAcrobat.selected}"/>
-                    <Button onAction="#usePDFAcrobatCommandBrowse" text="%Browse"
-                            GridPane.columnIndex="4" disable="${!usePDFAcrobat.selected}"/>
-                    <RadioButton fx:id="usePDFSumatra" text="%Sumatra Reader" toggleGroup="$openPDF"
-                                 GridPane.rowIndex="1"/>
-                    <TextField fx:id="usePDFSumatraCommand" prefWidth="350.0" GridPane.columnIndex="2"
-                               GridPane.rowIndex="1" disable="${!usePDFSumatra.selected}"/>
-                    <Button onAction="#usePDFSumatraCommandBrowse" text="%Browse"
-                            GridPane.columnIndex="4" GridPane.rowIndex="1" disable="${!usePDFSumatra.selected}"/>
-                </children>
-            </GridPane>
-        </HBox>
+        <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="350.0"/>
+                <ColumnConstraints hgrow="SOMETIMES"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+            </rowConstraints>
+            <children>
+                <RadioButton fx:id="usePDFAcrobat" text="%Adobe Acrobat Reader" toggleGroup="$openPDF"/>
+                <TextField fx:id="usePDFAcrobatCommand" prefWidth="350.0" GridPane.columnIndex="1"/>
+                <Button fx:id="usePDFAcrobatBrowse" onAction="#usePDFAcrobatCommandBrowse" text="%Browse" GridPane.columnIndex="2"/>
+                <RadioButton fx:id="usePDFSumatra" text="%Sumatra Reader" toggleGroup="$openPDF" GridPane.rowIndex="1"/>
+                <TextField fx:id="usePDFSumatraCommand" prefWidth="350.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                <Button fx:id="usePDFSumatraBrowse" onAction="#usePDFSumatraCommandBrowse" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
+            </children>
+        </GridPane>
+
         <Label styleClass="sectionHeader" text="%Open File Browser"/>
-        <HBox>
+        <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="350.0"/>
+                <ColumnConstraints hgrow="SOMETIMES"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
+            </rowConstraints>
             <children>
-                <GridPane alignment="CENTER_LEFT">
-                    <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="350.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" percentWidth="0.0" prefWidth="10.0"/>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                    </rowConstraints>
-                    <children>
-                        <RadioButton fx:id="useFileBrowserDefault" text="%Use default file browser"
-                                     toggleGroup="$openFileBrowser"/>
-                        <RadioButton fx:id="useFileBrowserSpecial" text="%Execute command"
-                                     toggleGroup="$openFileBrowser" GridPane.rowIndex="1"/>
-                        <TextField fx:id="useFileBrowserSpecialCommand" prefWidth="350.0"
-                                   GridPane.columnIndex="2" GridPane.rowIndex="1" disable="${!useFileBrowserSpecial.selected}">
-                            <tooltip>
-                                <Tooltip
-                                        text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
-                            </tooltip>
-                        </TextField>
-                        <Button onAction="#useFileBrowserSpecialCommandBrowse" text="%Browse"
-                                GridPane.columnIndex="4" GridPane.rowIndex="1" disable="${!useFileBrowserSpecial.selected}"/>
-                    </children>
-                </GridPane>
+                <RadioButton fx:id="useFileBrowserDefault" text="%Use default file browser" toggleGroup="$openFileBrowser"/>
+                <RadioButton fx:id="useFileBrowserSpecial" text="%Execute command" toggleGroup="$openFileBrowser" GridPane.rowIndex="1"/>
+                <TextField fx:id="useFileBrowserSpecialCommand" prefWidth="350.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                    <tooltip>
+                        <Tooltip text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
+                    </tooltip>
+                </TextField>
+                <Button fx:id="useFileBrowserSpecialBrowse" onAction="#useFileBrowserSpecialCommandBrowse" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
             </children>
-        </HBox>
+        </GridPane>
     </children>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
index 87415f8f9e7..4df5dc1ba5b 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
@@ -1,16 +1,12 @@
 package org.jabref.gui.preferences;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
-import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
 
-import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -19,7 +15,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class ExternalTabView extends VBox implements PrefsTab {
+public class ExternalTabView extends AbstractPreferenceTabView implements PreferencesTab {
 
     @FXML private TextField eMailReferenceSubject;
     @FXML private CheckBox autoOpenAttachedFolders;
@@ -30,22 +26,22 @@ public class ExternalTabView extends VBox implements PrefsTab {
     @FXML private RadioButton useTerminalDefault;
     @FXML private RadioButton useTerminalSpecial;
     @FXML private TextField useTerminalCommand;
+    @FXML private Button useTerminalBrowse;
 
     @FXML private RadioButton usePDFAcrobat;
     @FXML private TextField usePDFAcrobatCommand;
+    @FXML private Button usePDFAcrobatBrowse;
     @FXML private RadioButton usePDFSumatra;
     @FXML private TextField usePDFSumatraCommand;
+    @FXML private Button usePDFSumatraBrowse;
 
     @FXML private RadioButton useFileBrowserDefault;
     @FXML private RadioButton useFileBrowserSpecial;
     @FXML private TextField useFileBrowserSpecialCommand;
+    @FXML private Button useFileBrowserSpecialBrowse;
 
-    @Inject private DialogService dialogService;
-    private final JabRefPreferences preferences;
     private final JabRefFrame frame;
 
-    private ExternalTabViewModel viewModel;
-
     public ExternalTabView(JabRefPreferences preferences, JabRefFrame frame) {
         this.preferences = preferences;
         this.frame = frame;
@@ -55,87 +51,71 @@ public ExternalTabView(JabRefPreferences preferences, JabRefFrame frame) {
                   .load();
     }
 
+    @Override
+    public String getTabName() { return Localization.lang("External programs"); }
+
     public void initialize() {
-        viewModel = new ExternalTabViewModel(dialogService, preferences, frame);
+        ExternalTabViewModel externalTabViewModel = new ExternalTabViewModel(dialogService, preferences, frame);
+        this.viewModel = externalTabViewModel;
 
         new ViewModelListCellFactory<PushToApplication>()
-                .withText(application -> application.getApplicationName())
-                .withIcon(application -> application.getIcon())
+                .withText(PushToApplication::getApplicationName)
+                .withIcon(PushToApplication::getIcon)
                 .install(pushToApplicationCombo);
 
-        eMailReferenceSubject.textProperty().bindBidirectional(viewModel.eMailReferenceSubjectProperty());
-        autoOpenAttachedFolders.selectedProperty().bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
-
-        pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
-        pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
-        citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
-
-        useTerminalDefault.selectedProperty().bindBidirectional(viewModel.useTerminalDefaultProperty());
-        useTerminalSpecial.selectedProperty().bindBidirectional(viewModel.useTerminalSpecialProperty());
-        useTerminalCommand.textProperty().bindBidirectional(viewModel.useTerminalCommandProperty());
-
-        usePDFAcrobat.selectedProperty().bindBidirectional(viewModel.usePDFAcrobatProperty());
-        usePDFAcrobatCommand.textProperty().bindBidirectional(viewModel.usePDFAcrobatCommandProperty());
-        usePDFSumatra.selectedProperty().bindBidirectional(viewModel.usePDFSumatraProperty());
-        usePDFSumatraCommand.textProperty().bindBidirectional(viewModel.usePDFSumatraCommandProperty());
-
-        useFileBrowserDefault.selectedProperty().bindBidirectional(viewModel.useFileBrowserDefaultProperty());
-        useFileBrowserSpecial.selectedProperty().bindBidirectional(viewModel.useFileBrowserSpecialProperty());
-        useFileBrowserSpecialCommand.textProperty().bindBidirectional(viewModel.useFileBrowserSpecialCommandProperty());
+        eMailReferenceSubject.textProperty().bindBidirectional(externalTabViewModel.eMailReferenceSubjectProperty());
+        autoOpenAttachedFolders.selectedProperty().bindBidirectional(externalTabViewModel.autoOpenAttachedFoldersProperty());
+
+        pushToApplicationCombo.itemsProperty().bind(externalTabViewModel.pushToApplicationsListProperty());
+        pushToApplicationCombo.valueProperty().bindBidirectional(externalTabViewModel.selectedPushToApplication());
+        citeCommand.textProperty().bindBidirectional(externalTabViewModel.citeCommandProperty());
+
+        useTerminalDefault.selectedProperty().bindBidirectional(externalTabViewModel.useTerminalDefaultProperty());
+        useTerminalSpecial.selectedProperty().bindBidirectional(externalTabViewModel.useTerminalSpecialProperty());
+        useTerminalCommand.textProperty().bindBidirectional(externalTabViewModel.useTerminalCommandProperty());
+        useTerminalCommand.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
+        useTerminalBrowse.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
+
+        usePDFAcrobat.selectedProperty().bindBidirectional(externalTabViewModel.usePDFAcrobatProperty());
+        usePDFAcrobatCommand.textProperty().bindBidirectional(externalTabViewModel.usePDFAcrobatCommandProperty());
+        usePDFAcrobatCommand.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
+        usePDFAcrobatBrowse.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
+
+        usePDFSumatra.selectedProperty().bindBidirectional(externalTabViewModel.usePDFSumatraProperty());
+        usePDFSumatraCommand.textProperty().bindBidirectional(externalTabViewModel.usePDFSumatraCommandProperty());
+        usePDFSumatraCommand.disableProperty().bind(usePDFSumatra.selectedProperty().not());
+        usePDFSumatraBrowse.disableProperty().bind(usePDFSumatra.selectedProperty().not());
+
+        useFileBrowserDefault.selectedProperty().bindBidirectional(externalTabViewModel.useFileBrowserDefaultProperty());
+        useFileBrowserSpecial.selectedProperty().bindBidirectional(externalTabViewModel.useFileBrowserSpecialProperty());
+        useFileBrowserSpecialCommand.textProperty().bindBidirectional(externalTabViewModel.useFileBrowserSpecialCommandProperty());
+        useFileBrowserSpecialCommand.disableProperty().bind(useFileBrowserSpecial.selectedProperty().not());
+        useFileBrowserSpecialBrowse.disableProperty().bind(useFileBrowserSpecial.selectedProperty().not());
     }
 
     @FXML
-    void pushToApplicationSettings() {
-        viewModel.pushToApplicationSettings();
-    }
+    void pushToApplicationSettings() { ((ExternalTabViewModel) viewModel).pushToApplicationSettings(); }
 
     @FXML
     void manageExternalFileTypes() {
-        viewModel.manageExternalFileTypes();
+        ((ExternalTabViewModel) viewModel).manageExternalFileTypes();
     }
 
     @FXML
     void useTerminalCommandBrowse() {
-        viewModel.useTerminalCommandBrowse();
+        ((ExternalTabViewModel) viewModel).useTerminalCommandBrowse();
     }
 
     @FXML
     void usePDFAcrobatCommandBrowse() {
-        viewModel.usePDFAcrobatCommandBrowse();
+        ((ExternalTabViewModel) viewModel).usePDFAcrobatCommandBrowse();
     }
 
     @FXML
     void usePDFSumatraCommandBrowse() {
-        viewModel.usePDFSumatraCommandBrowse();
+        ((ExternalTabViewModel) viewModel).usePDFSumatraCommandBrowse();
     }
 
     @FXML
-    void useFileBrowserSpecialCommandBrowse() {
-        viewModel.useFileBrowserSpecialCommandBrowse();
-    }
-
-    @Override
-    public Node getBuilder() {
-        return this;
-    }
-
-    @Override
-    public void setValues() {
-
-    }
-
-    @Override
-    public void storeSettings() {
-        viewModel.storeSettings();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return viewModel.validateSettings();
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("External programs");
-    }
+    void useFileBrowserSpecialCommandBrowse() { ((ExternalTabViewModel) viewModel).useFileBrowserSpecialCommandBrowse(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
index 9791c4f656e..03834fc88c8 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -121,6 +124,9 @@ public boolean validateSettings() {
         return true;
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
+
     public void pushToApplicationSettings() {
         PushToApplicationsManager manager = frame.getPushToApplicationsManager();
         PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
index 3eec679c4f4..6596a8cee14 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
@@ -19,7 +19,8 @@
         <ToggleGroup fx:id="autolinkToggleGroup"/>
     </fx:define>
     <children>
-        <Label styleClass="sectionHeader" text="%General"/>
+        <Label styleClass="titleHeader" text="%File"/>
+
         <CheckBox fx:id="openLastStartup" text="%Open last edited libraries at startup"/>
         <CheckBox fx:id="backupOldFile" text="%Backup old file when saving"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
@@ -28,13 +29,11 @@
                 <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
             </children>
         </HBox>
-        <RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only"
-                     toggleGroup="$stringsResolveToggleGroup"/>
+        <RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only" toggleGroup="$stringsResolveToggleGroup"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
-                <RadioButton fx:id="resolveStringsAll" alignment="TOP_LEFT" maxWidth="Infinity"
-                             text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"/>
-                <TextField fx:id="resolveStringsExcept" disable="${!resolveStringsAll.selected}" HBox.hgrow="ALWAYS"/>
+                <RadioButton fx:id="resolveStringsAll" text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"/>
+                <TextField fx:id="resolveStringsExcept" HBox.hgrow="ALWAYS"/>
             </children>
         </HBox>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
@@ -44,6 +43,7 @@
             </children>
         </HBox>
         <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
+
         <Label styleClass="sectionHeader" text="%External file links"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
@@ -58,21 +58,18 @@
                         text="%When downloading files, or moving linked files to the file directory, prefer the BIB file location rather than the file directory set above"/>
             </tooltip>
         </CheckBox>
-        <RadioButton fx:id="autolinkFileStartsBibtex" text="%Autolink files with names starting with the BibTeX key"
-                     toggleGroup="$autolinkToggleGroup"/>
-        <RadioButton fx:id="autolinkFileExactBibtex" text="%Autolink only files that match the BibTeX key"
-                     toggleGroup="$autolinkToggleGroup"/>
+        <RadioButton fx:id="autolinkFileStartsBibtex" text="%Autolink files with names starting with the BibTeX key" toggleGroup="$autolinkToggleGroup"/>
+        <RadioButton fx:id="autolinkFileExactBibtex" text="%Autolink only files that match the BibTeX key" toggleGroup="$autolinkToggleGroup"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
-                <RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search"
-                             toggleGroup="$autolinkToggleGroup"/>
-                <TextField fx:id="autolinkRegexKey" disable="${!autolinkUseRegex.selected}" HBox.hgrow="ALWAYS"/>
+                <RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search" toggleGroup="$autolinkToggleGroup"/>
+                <TextField fx:id="autolinkRegexKey" HBox.hgrow="ALWAYS"/>
                 <Button fx:id="autolinkRegexHelp"/>
             </children>
         </HBox>
-        <CheckBox fx:id="searchFilesOnOpen"
-                  text="%When opening file link, search for matching file if no link is defined"/>
+        <CheckBox fx:id="searchFilesOnOpen" text="%When opening file link, search for matching file if no link is defined"/>
         <CheckBox fx:id="openBrowseOnCreate" text="%Automatically open browse dialog when creating new file link"/>
+
         <Label styleClass="sectionHeader" text="%Autosave"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabView.java b/src/main/java/org/jabref/gui/preferences/FileTabView.java
index c980e561518..6da2335affb 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTabView.java
@@ -1,19 +1,14 @@
 package org.jabref.gui.preferences;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -26,7 +21,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class FileTabView extends VBox implements PrefsTab {
+public class FileTabView extends AbstractPreferenceTabView implements PreferencesTab {
 
     @FXML private CheckBox openLastStartup;
     @FXML private CheckBox backupOldFile;
@@ -50,78 +45,55 @@ public class FileTabView extends VBox implements PrefsTab {
     @FXML private CheckBox autosaveLocalLibraries;
     @FXML private Button autosaveLocalLibrariesHelp;
 
-    @Inject private DialogService dialogService;
-    private final JabRefPreferences preferences;
-
-    private FileTabViewModel viewModel;
-
     private ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public FileTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
+
         ViewLoader.view(this)
-                .root(this)
-                .load();
+                  .root(this)
+                  .load();
     }
 
+    @Override
+    public String getTabName() { return Localization.lang("File"); }
+
     public void initialize() {
-        viewModel = new FileTabViewModel(dialogService, preferences);
-
-        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
-        backupOldFile.selectedProperty().bindBidirectional(viewModel.backupOldFileProperty());
-        noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
-        resolveStringsBibTex.selectedProperty().bindBidirectional(viewModel.resolveStringsBibTexProperty());
-        resolveStringsAll.selectedProperty().bindBidirectional(viewModel.resolveStringsAllProperty());
-        resolveStringsExcept.textProperty().bindBidirectional(viewModel.resolvStringsExceptProperty());
-        newLineSeparator.itemsProperty().bind(viewModel.newLineSeparatorListProperty());
-        newLineSeparator.valueProperty().bindBidirectional(viewModel.selectedNewLineSeparatorProperty());
-        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
-
-        mainFileDir.textProperty().bindBidirectional(viewModel.mainFileDirProperty());
-        useBibLocationAsPrimary.selectedProperty().bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
-        autolinkFileStartsBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileStartsBibtexProperty());
-        autolinkFileExactBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileExactBibtexProperty());
-        autolinkUseRegex.selectedProperty().bindBidirectional(viewModel.autolinkUseRegexProperty());
-        autolinkRegexKey.textProperty().bindBidirectional(viewModel.autolinkRegexKeyProperty());
-        searchFilesOnOpen.selectedProperty().bindBidirectional(viewModel.searchFilesOnOpenProperty());
-        openBrowseOnCreate.selectedProperty().bindBidirectional(viewModel.openBrowseOnCreateProperty());
-
-        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
+        FileTabViewModel fileTabViewModel = new FileTabViewModel(dialogService, preferences);
+        this.viewModel = fileTabViewModel;
+
+        openLastStartup.selectedProperty().bindBidirectional(fileTabViewModel.openLastStartupProperty());
+        backupOldFile.selectedProperty().bindBidirectional(fileTabViewModel.backupOldFileProperty());
+        noWrapFiles.textProperty().bindBidirectional(fileTabViewModel.noWrapFilesProperty());
+        resolveStringsBibTex.selectedProperty().bindBidirectional(fileTabViewModel.resolveStringsBibTexProperty());
+        resolveStringsAll.selectedProperty().bindBidirectional(fileTabViewModel.resolveStringsAllProperty());
+        resolveStringsExcept.textProperty().bindBidirectional(fileTabViewModel.resolvStringsExceptProperty());
+        resolveStringsExcept.disableProperty().bind(resolveStringsAll.selectedProperty().not());
+        newLineSeparator.itemsProperty().bind(fileTabViewModel.newLineSeparatorListProperty());
+        newLineSeparator.valueProperty().bindBidirectional(fileTabViewModel.selectedNewLineSeparatorProperty());
+        alwaysReformatBib.selectedProperty().bindBidirectional(fileTabViewModel.alwaysReformatBibProperty());
+
+        mainFileDir.textProperty().bindBidirectional(fileTabViewModel.mainFileDirProperty());
+        useBibLocationAsPrimary.selectedProperty().bindBidirectional(fileTabViewModel.useBibLocationAsPrimaryProperty());
+        autolinkFileStartsBibtex.selectedProperty().bindBidirectional(fileTabViewModel.autolinkFileStartsBibtexProperty());
+        autolinkFileExactBibtex.selectedProperty().bindBidirectional(fileTabViewModel.autolinkFileExactBibtexProperty());
+        autolinkUseRegex.selectedProperty().bindBidirectional(fileTabViewModel.autolinkUseRegexProperty());
+        autolinkRegexKey.textProperty().bindBidirectional(fileTabViewModel.autolinkRegexKeyProperty());
+        autolinkRegexKey.disableProperty().bind(autolinkUseRegex.selectedProperty().not());
+        searchFilesOnOpen.selectedProperty().bindBidirectional(fileTabViewModel.searchFilesOnOpenProperty());
+        openBrowseOnCreate.selectedProperty().bindBidirectional(fileTabViewModel.openBrowseOnCreateProperty());
+
+        autosaveLocalLibraries.selectedProperty().bindBidirectional(fileTabViewModel.autosaveLocalLibrariesProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH), autolinkRegexHelp);
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE), autosaveLocalLibrariesHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDir));
-    }
-
-    @Override
-    public Node getBuilder() {
-        return this;
-    }
-
-    @Override
-    public void setValues() {
-        // Done by bindings
-    }
-
-    @Override
-    public void storeSettings() {
-        viewModel.storeSettings();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return viewModel.validateSettings();
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("File");
+        Platform.runLater(() -> validationVisualizer.initVisualization(fileTabViewModel.mainFileDirValidationStatus(), mainFileDir));
     }
 
     public void mainFileDirBrowse() {
-        viewModel.mainFileDirBrowse();
+        ((FileTabViewModel) viewModel).mainFileDirBrowse();
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
index 1c5c2ea2659..990f65e8526 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
@@ -3,6 +3,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -59,7 +61,7 @@ public FileTabViewModel(DialogService dialogService, JabRefPreferences preferenc
         this.preferences = preferences;
         setValues();
 
-        mainFileDirValidator = new FunctionBasedValidator(
+        mainFileDirValidator = new FunctionBasedValidator<>(
                 mainFileDirProperty,
                 input -> {
                     Path path = Paths.get(mainFileDirProperty.getValue());
@@ -140,6 +142,9 @@ public boolean validateSettings() {
         return true;
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
+
     public void mainFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
                 new DirectoryDialogConfiguration.Builder().withInitialDirectory(Paths.get(mainFileDirProperty.getValue())).build();
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index 2329d548776..38dc07ecd0b 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -12,48 +12,44 @@
 <?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 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">
     <children>
-        <Label styleClass="sectionHeader" text="%General"/>
-        <GridPane>
+        <Label styleClass="titleHeader" text="%General"/>
+        <GridPane hgap="10.0" vgap="4.0">
             <columnConstraints>
                 <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
                 <ColumnConstraints hgrow="SOMETIMES"/>
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="10.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="10.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
             </rowConstraints>
             <children>
                 <Label text="%Language"/>
                 <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
-                <Label text="%Default encoding" GridPane.rowIndex="2"/>
-                <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                <Label text="%Default bibliography mode" GridPane.rowIndex="4"/>
-                <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+                <Label text="%Default encoding" GridPane.rowIndex="1"/>
+                <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                <Label text="%Default bibliography mode" GridPane.rowIndex="2"/>
+                <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
             </children>
         </GridPane>
-        <CheckBox fx:id="inspectionWarningDuplicate"
-                  text="%Warn about unresolved duplicates when closing inspection window"/>
+        <CheckBox fx:id="inspectionWarningDuplicate" text="%Warn about unresolved duplicates when closing inspection window"/>
         <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
         <CheckBox fx:id="enforceLegalKeys" text="%Enforce legal characters in BibTeX keys"/>
         <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
-        <CheckBox fx:id="memoryStickMode"
-                  text="%Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"/>
+        <CheckBox fx:id="memoryStickMode" text="%Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"/>
         <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef."/>
-        <CheckBox fx:id="showAdvancedHints"
-                  text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>
+        <CheckBox fx:id="showAdvancedHints" text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>
 
         <Label styleClass="sectionHeader" text="%Entry owner"/>
         <HBox alignment="CENTER_LEFT" spacing="10.0">
             <children>
                 <CheckBox fx:id="markOwner" text="%Mark new entries with owner name"/>
-                <TextField fx:id="markOwnerName" disable="${!markOwner.selected}" HBox.hgrow="ALWAYS"/>
-                <CheckBox fx:id="markOwnerOverwrite" disable="${!markOwner.selected}" text="%Overwrite">
+                <TextField fx:id="markOwnerName" HBox.hgrow="ALWAYS"/>
+                <CheckBox fx:id="markOwnerOverwrite" text="%Overwrite">
                     <tooltip>
                         <Tooltip text="%If a pasted or imported entry already has the field set, overwrite."/>
                     </tooltip>
@@ -66,35 +62,28 @@
         <CheckBox fx:id="markTimestamp" text="%Mark new entries with addition date"/>
         <HBox spacing="10.0">
             <children>
-                <GridPane>
+                <GridPane hgap="10.0" vgap="4.0">
                     <columnConstraints>
                         <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
                         <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
                         <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
                         <ColumnConstraints hgrow="SOMETIMES"/>
                     </columnConstraints>
                     <rowConstraints>
                         <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-                        <RowConstraints prefHeight="10.0" vgrow="SOMETIMES"/>
                         <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
                     </rowConstraints>
                     <children>
-                        <Label disable="${!markTimestamp.selected}" text="%Date format"/>
-                        <TextField fx:id="markTimeStampFormat" disable="${!markTimestamp.selected}" prefWidth="200.0"
-                                   GridPane.columnIndex="2"/>
-                        <CheckBox fx:id="markTimeStampOverwrite" disable="${!markTimestamp.selected}" text="%Overwrite"
-                                  GridPane.columnIndex="4">
+                        <Label fx:id="markTimeStampFormatLabel" text="%Date format"/>
+                        <TextField fx:id="markTimeStampFormat" prefWidth="200.0" GridPane.columnIndex="1"/>
+                        <CheckBox fx:id="markTimeStampOverwrite" text="%Overwrite" GridPane.columnIndex="2">
                             <tooltip>
                                 <Tooltip text="%If a pasted or imported entry already has the field set, overwrite."/>
                             </tooltip>
                         </CheckBox>
-                        <Button fx:id="markTimeStampHelp" prefWidth="20.0" GridPane.columnIndex="6"/>
-                        <Label disable="${!markTimestamp.selected}" text="%Field name" GridPane.rowIndex="2"/>
-                        <TextField fx:id="markTimeStampFieldName" disable="${!markTimestamp.selected}" prefWidth="200.0"
-                                   GridPane.columnIndex="2" GridPane.rowIndex="2"/>
+                        <Button fx:id="markTimeStampHelp" prefWidth="20.0" GridPane.columnIndex="3"/>
+                        <Label fx:id="markTimeStampFieldNameLabel" text="%Field name" GridPane.rowIndex="1"/>
+                        <TextField fx:id="markTimeStampFieldName" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
                     </children>
                 </GridPane>
             </children>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index e657235caa1..95797c83428 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -2,19 +2,15 @@
 
 import java.nio.charset.Charset;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -28,7 +24,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class GeneralTabView extends VBox implements PrefsTab {
+public class GeneralTabView extends AbstractPreferenceTabView implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<Charset> defaultEncoding;
@@ -46,85 +42,69 @@ public class GeneralTabView extends VBox implements PrefsTab {
     @FXML private Button markOwnerHelp;
     @FXML private CheckBox markTimestamp;
     @FXML private TextField markTimeStampFormat;
+    @FXML private Label markTimeStampFormatLabel;
     @FXML private CheckBox markTimeStampOverwrite;
     @FXML private TextField markTimeStampFieldName;
+    @FXML private Label markTimeStampFieldNameLabel;
     @FXML private Button markTimeStampHelp;
     @FXML private CheckBox updateTimeStamp;
 
-    @Inject private DialogService dialogService;
-    private final JabRefPreferences preferences;
-
-    private GeneralTabViewModel viewModel;
-
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public GeneralTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
+
         ViewLoader.view(this)
-                .root(this)
-                .load();
+                  .root(this)
+                  .load();
     }
 
-    public void initialize() {
-        viewModel = new GeneralTabViewModel(dialogService, preferences);
-
-        language.itemsProperty().bind(viewModel.languagesListProperty());
-        language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
-
-        defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
-        defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
-
-        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
-
-        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
-        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
-        enforceLegalKeys.selectedProperty().bindBidirectional(viewModel.enforceLegalKeysProperty());
-        allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
-        memoryStickMode.selectedProperty().bindBidirectional(viewModel.memoryStickModeProperty());
-        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
-        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
-
-        markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
-        markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
-        markOwnerOverwrite.selectedProperty().bindBidirectional(viewModel.markOwnerOverwriteProperty());
+    @Override
+    public String getTabName() { return Localization.lang("General"); }
 
-        markTimestamp.selectedProperty().bindBidirectional(viewModel.markTimestampProperty());
-        markTimeStampFormat.textProperty().bindBidirectional(viewModel.markTimeStampFormatProperty());
-        markTimeStampOverwrite.selectedProperty().bindBidirectional(viewModel.markTimeStampOverwriteProperty());
-        markTimeStampFieldName.textProperty().bindBidirectional(viewModel.markTimeStampFieldNameProperty());
-        updateTimeStamp.selectedProperty().bindBidirectional(viewModel.updateTimeStampProperty());
+    public void initialize() {
+        GeneralTabViewModel generalTabViewModel = new GeneralTabViewModel(dialogService, preferences);
+        this.viewModel = generalTabViewModel;
+
+        language.itemsProperty().bind(generalTabViewModel.languagesListProperty());
+        language.valueProperty().bindBidirectional(generalTabViewModel.selectedLanguageProperty());
+
+        defaultEncoding.itemsProperty().bind(generalTabViewModel.encodingsListProperty());
+        defaultEncoding.valueProperty().bindBidirectional(generalTabViewModel.selectedEncodingProperty());
+
+        biblatexMode.itemsProperty().bind(generalTabViewModel.biblatexModeListProperty());
+        biblatexMode.valueProperty().bindBidirectional(generalTabViewModel.selectedBiblatexModeProperty());
+
+        inspectionWarningDuplicate.selectedProperty().bindBidirectional(generalTabViewModel.inspectionWarningDuplicateProperty());
+        confirmDelete.selectedProperty().bindBidirectional(generalTabViewModel.confirmDeleteProperty());
+        enforceLegalKeys.selectedProperty().bindBidirectional(generalTabViewModel.enforceLegalKeysProperty());
+        allowIntegerEdition.selectedProperty().bindBidirectional(generalTabViewModel.allowIntegerEditionProperty());
+        memoryStickMode.selectedProperty().bindBidirectional(generalTabViewModel.memoryStickModeProperty());
+        collectTelemetry.selectedProperty().bindBidirectional(generalTabViewModel.collectTelemetryProperty());
+        showAdvancedHints.selectedProperty().bindBidirectional(generalTabViewModel.showAdvancedHintsProperty());
+
+        markOwner.selectedProperty().bindBidirectional(generalTabViewModel.markOwnerProperty());
+        markOwnerName.textProperty().bindBidirectional(generalTabViewModel.markOwnerNameProperty());
+        markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
+        markOwnerOverwrite.selectedProperty().bindBidirectional(generalTabViewModel.markOwnerOverwriteProperty());
+        markOwnerOverwrite.disableProperty().bind(markOwner.selectedProperty().not());
+
+        markTimestamp.selectedProperty().bindBidirectional(generalTabViewModel.markTimestampProperty());
+        markTimeStampFormatLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
+        markTimeStampFormat.textProperty().bindBidirectional(generalTabViewModel.markTimeStampFormatProperty());
+        markTimeStampFormat.disableProperty().bind(markTimestamp.selectedProperty().not());
+        markTimeStampOverwrite.selectedProperty().bindBidirectional(generalTabViewModel.markTimeStampOverwriteProperty());
+        markTimeStampOverwrite.disableProperty().bind(markTimestamp.selectedProperty().not());
+        markTimeStampFieldNameLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
+        markTimeStampFieldName.textProperty().bindBidirectional(generalTabViewModel.markTimeStampFieldNameProperty());
+        markTimeStampFieldName.disableProperty().bind(markTimestamp.selectedProperty().not());
+        updateTimeStamp.selectedProperty().bindBidirectional(generalTabViewModel.updateTimeStampProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER), markOwnerHelp);
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.TIMESTAMP), markTimeStampHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.markTimeStampFormatValidationStatus(), markTimeStampFormat));
-    }
-
-    @Override
-    public Node getBuilder() {
-        return this;
-    }
-
-    @Override
-    public void setValues() {
-        // ToDo: Remove this after conversion of all tabs
-    }
-
-    @Override
-    public void storeSettings() {
-        viewModel.storeSettings();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return viewModel.validateSettings();
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("General");
+        Platform.runLater(() -> validationVisualizer.initVisualization(generalTabViewModel.markTimeStampFormatValidationStatus(), markTimeStampFormat));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
index 31c7025c489..5475452278f 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -2,6 +2,8 @@
 
 import java.nio.charset.Charset;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -53,12 +55,15 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
 
+    private List<String> restartWarning = new ArrayList<>();
+
+    @SuppressWarnings("ReturnValueIgnored")
     public GeneralTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         setValues();
 
-        markTimeStampFormatValidator = new FunctionBasedValidator(
+        markTimeStampFormatValidator = new FunctionBasedValidator<>(
                 markTimeStampFormatProperty,
                 input -> {
                     try {
@@ -112,15 +117,13 @@ public void setValues() {
     }
 
     public void storeSettings() {
-        if (selectedLanguageProperty.getValue() != preferences.getLanguage()) {
-            preferences.setLanguage(selectedLanguageProperty.getValue());
-            Localization.setLanguage(selectedLanguageProperty.getValue());
-
-            dialogService.showWarningDialogAndWait(Localization.lang("Changed language settings"),
-                    Localization.lang("You have changed the language setting.")
-                            .concat(" ")
-                            .concat(Localization.lang("You must restart JabRef for this to come into effect.")));
+        Language newLanguage = selectedLanguageProperty.getValue();
+        if (newLanguage != preferences.getLanguage()) {
+            preferences.setLanguage(newLanguage);
+            Localization.setLanguage(newLanguage);
+            restartWarning.add(Localization.lang("Changed language") + ": " + newLanguage.getDisplayName());
         }
+
         preferences.setDefaultEncoding(selectedEncodingProperty.getValue());
         preferences.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, selectedBiblatexModeProperty.getValue() == BibDatabaseMode.BIBLATEX);
 
@@ -153,14 +156,18 @@ public ValidationStatus markTimeStampFormatValidationStatus() {
     }
 
     public boolean validateSettings() {
-        ValidationStatus status = markTimeStampFormatValidationStatus();
-        if (!status.isValid()) {
-            dialogService.showErrorDialogAndWait(status.getHighestMessage().get().getMessage());
+        ValidationStatus validationStatus = markTimeStampFormatValidationStatus();
+        if (!validationStatus.isValid()) {
+            validationStatus.getHighestMessage().ifPresent(message ->
+                    dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return restartWarning; }
+
     // General
 
     public ListProperty<Language> languagesListProperty() { return this.languagesListProperty; }
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java b/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
deleted file mode 100644
index a39c1e159a6..00000000000
--- a/src/main/java/org/jabref/gui/preferences/GroupsPrefsTab.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.jabref.gui.preferences;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.Node;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Separator;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
-
-import org.jabref.gui.groups.GroupViewMode;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-class GroupsPrefsTab extends Pane implements PrefsTab {
-
-    private final CheckBox hideNonHits = new CheckBox(Localization.lang("Hide non-hits"));
-    private final CheckBox grayOut = new CheckBox(Localization.lang("Gray out non-hits"));
-    private final CheckBox autoAssignGroup = new CheckBox(Localization.lang("Automatically assign new entry to selected groups"));
-    private final RadioButton multiSelectionModeIntersection = new RadioButton(Localization.lang("Intersection"));
-    private final RadioButton multiSelectionModeUnion = new RadioButton(Localization.lang("Union"));
-
-    private final TextField groupingField = new TextField();
-    private final TextField keywordSeparator = new TextField();
-    private final GridPane builder = new GridPane();
-    private final JabRefPreferences prefs;
-
-    public GroupsPrefsTab(JabRefPreferences prefs) {
-        this.prefs = prefs;
-        builder.setVgap(7);
-
-        keywordSeparator.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                keywordSeparator.selectAll();
-            }
-        });
-
-        multiSelectionModeIntersection.setText(Localization.lang("Display only entries belonging to all selected groups."));
-        multiSelectionModeUnion.setText(Localization.lang("Display all entries belonging to one or more of the selected groups."));
-
-        // View title
-        Label view = new Label(Localization.lang("View"));
-        view.getStyleClass().add("sectionHeader");
-        builder.add(view, 1, 1);
-
-        // View configuration
-        builder.add(hideNonHits, 1, 3);
-        builder.add(grayOut, 1, 4);
-        final ToggleGroup selectionModeGroup = new ToggleGroup();
-        builder.add(multiSelectionModeIntersection, 1, 5);
-        builder.add(multiSelectionModeUnion, 1, 6);
-        multiSelectionModeIntersection.setToggleGroup(selectionModeGroup);
-        multiSelectionModeUnion.setToggleGroup(selectionModeGroup);
-        builder.add(autoAssignGroup, 1, 7);
-
-        builder.add(new Separator(), 1, 11);
-
-        // Dynamic groups title
-        Label dynamicGroups = new Label(Localization.lang("Dynamic groups"));
-        dynamicGroups.getStyleClass().add("sectionHeader");
-        builder.add(dynamicGroups, 1, 13);
-
-        // Dynamic groups configuration
-        Label defaultGrouping = new Label(Localization.lang("Default grouping field") + ":");
-        builder.add(defaultGrouping, 1, 15);
-        builder.add(groupingField, 2, 15);
-        Label label = new Label(Localization.lang("When adding/removing keywords, separate them by") + ":");
-        builder.add(label, 1, 17);
-        builder.add(keywordSeparator, 2, 17);
-    }
-
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        grayOut.setSelected(prefs.getBoolean(JabRefPreferences.GRAY_OUT_NON_HITS));
-        groupingField.setText(prefs.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
-        keywordSeparator.setText(prefs.get(JabRefPreferences.KEYWORD_SEPARATOR));
-        autoAssignGroup.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_ASSIGN_GROUP));
-
-        GroupViewMode mode = prefs.getGroupViewMode();
-        if (mode == GroupViewMode.INTERSECTION) {
-            multiSelectionModeIntersection.setSelected(true);
-        }
-        if (mode == GroupViewMode.UNION) {
-            multiSelectionModeUnion.setSelected(true);
-        }
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.putBoolean(JabRefPreferences.GRAY_OUT_NON_HITS, grayOut.isSelected());
-        prefs.put(JabRefPreferences.GROUPS_DEFAULT_FIELD, groupingField.getText().trim());
-        prefs.putBoolean(JabRefPreferences.AUTO_ASSIGN_GROUP, autoAssignGroup.isSelected());
-        prefs.put(JabRefPreferences.KEYWORD_SEPARATOR, keywordSeparator.getText());
-
-        if (multiSelectionModeIntersection.isSelected()) {
-            prefs.setGroupViewMode(GroupViewMode.INTERSECTION);
-        }
-        if (multiSelectionModeUnion.isSelected()) {
-            prefs.setGroupViewMode(GroupViewMode.UNION);
-        }
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Groups");
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
new file mode 100644
index 00000000000..063aca5dfb1
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.ToggleGroup?>
+
+<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:define>
+        <ToggleGroup fx:id="groupViewMode"/>
+    </fx:define>
+    <children>
+        <Label styleClass="titleHeader" text="%Groups" />
+
+        <Label styleClass="sectionHeader" text="%View" />
+        <CheckBox fx:id="grayNonHits" text="%Gray out non-hits" />
+        <RadioButton fx:id="groupViewModeIntersection" text="%Display only entries belonging to all selected groups" toggleGroup="$groupViewMode" />
+        <RadioButton fx:id="groupViewModeUnion" text="%Display all entries belonging to one or more of the selected groups" toggleGroup="$groupViewMode" />
+        <CheckBox fx:id="autoAssignGroup" text="%Automatically assign new entry to selected groups" />
+
+        <Label styleClass="sectionHeader" text="%Dynamic groups" />
+        <GridPane hgap="10.0" vgap="4.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" />
+                <ColumnConstraints hgrow="SOMETIMES" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            </rowConstraints>
+            <children>
+                <Label text="%Default grouping field" />
+                <TextField fx:id="defaultGroupingField" prefWidth="200.0" GridPane.columnIndex="1" />
+                <Label text="%Keyword seperator" GridPane.rowIndex="1" />
+                <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            </children>
+        </GridPane>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabView.java b/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
new file mode 100644
index 00000000000..c3bdaa9a0b0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
@@ -0,0 +1,44 @@
+package org.jabref.gui.preferences;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class GroupsTabView extends AbstractPreferenceTabView implements PreferencesTab {
+
+    @FXML private CheckBox grayNonHits;
+    @FXML private RadioButton groupViewModeIntersection;
+    @FXML private RadioButton groupViewModeUnion;
+    @FXML private CheckBox autoAssignGroup;
+    @FXML private TextField defaultGroupingField;
+    @FXML private TextField keywordSeparator;
+
+    public GroupsTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Groups"); }
+
+    public void initialize() {
+        GroupsTabViewModel groupsTabViewModel = new GroupsTabViewModel(dialogService, preferences);
+        this.viewModel = groupsTabViewModel;
+
+        grayNonHits.selectedProperty().bindBidirectional(groupsTabViewModel.grayNonHitsProperty());
+        groupViewModeIntersection.selectedProperty().bindBidirectional(groupsTabViewModel.groupViewModeIntersectionProperty());
+        groupViewModeUnion.selectedProperty().bindBidirectional(groupsTabViewModel.groupViewModeUnionProperty());
+        autoAssignGroup.selectedProperty().bindBidirectional(groupsTabViewModel.autoAssignGroupProperty());
+        defaultGroupingField.textProperty().bindBidirectional(groupsTabViewModel.defaultGroupingFieldProperty());
+        keywordSeparator.textProperty().bindBidirectional(groupsTabViewModel.keywordSeparatorProperty());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
new file mode 100644
index 00000000000..bc7a55209d7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
@@ -0,0 +1,83 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.groups.GroupViewMode;
+import org.jabref.preferences.JabRefPreferences;
+
+public class GroupsTabViewModel implements PreferenceTabViewModel {
+
+    private final BooleanProperty grayNonHitsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeIntersectionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeUnionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoAssignGroupProperty = new SimpleBooleanProperty();
+    private final StringProperty defaultGroupingFieldProperty = new SimpleStringProperty("");
+    private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public GroupsTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        setValues();
+    }
+
+    @Override
+    public void setValues() {
+        grayNonHitsProperty.setValue(preferences.getBoolean(JabRefPreferences.GRAY_OUT_NON_HITS));
+        switch (preferences.getGroupViewMode()) {
+            case INTERSECTION:
+                groupViewModeIntersectionProperty.setValue(true);
+                groupViewModeUnionProperty.setValue(false);
+                break;
+            case UNION:
+                groupViewModeIntersectionProperty.setValue(false);
+                groupViewModeUnionProperty.setValue(true);
+                break;
+        }
+        autoAssignGroupProperty.setValue(preferences.getBoolean(JabRefPreferences.AUTO_ASSIGN_GROUP));
+
+        defaultGroupingFieldProperty.setValue(preferences.get(JabRefPreferences.GROUPS_DEFAULT_FIELD));
+        keywordSeparatorProperty.setValue(preferences.get(JabRefPreferences.KEYWORD_SEPARATOR));
+    }
+
+    @Override
+    public void storeSettings() {
+        preferences.putBoolean(JabRefPreferences.GRAY_OUT_NON_HITS, grayNonHitsProperty.getValue());
+        if (groupViewModeIntersectionProperty.getValue()) {
+            preferences.setGroupViewMode(GroupViewMode.INTERSECTION);
+        } else if (groupViewModeUnionProperty.getValue()) {
+            preferences.setGroupViewMode(GroupViewMode.UNION);
+        }
+        preferences.putBoolean(JabRefPreferences.AUTO_ASSIGN_GROUP, autoAssignGroupProperty.getValue());
+
+        preferences.put(JabRefPreferences.GROUPS_DEFAULT_FIELD, defaultGroupingFieldProperty.getValue().trim());
+        preferences.put(JabRefPreferences.KEYWORD_SEPARATOR, keywordSeparatorProperty.getValue());
+    }
+
+    @Override
+    public boolean validateSettings() { return true; }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
+
+    public BooleanProperty grayNonHitsProperty() { return grayNonHitsProperty; }
+
+    public BooleanProperty groupViewModeIntersectionProperty() { return groupViewModeIntersectionProperty; }
+
+    public BooleanProperty groupViewModeUnionProperty() { return groupViewModeUnionProperty; }
+
+    public BooleanProperty autoAssignGroupProperty() { return autoAssignGroupProperty; }
+
+    public StringProperty defaultGroupingFieldProperty() { return defaultGroupingFieldProperty; }
+
+    public StringProperty keywordSeparatorProperty() { return keywordSeparatorProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
index 1ad522dd4a7..2ee1662d1ca 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 import javafx.collections.FXCollections;
@@ -12,7 +14,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-public class ImportSettingsTab implements PrefsTab {
+public class ImportSettingsTab implements PreferencesTab {
 
     public static final String[] DEFAULT_FILENAMEPATTERNS = new String[] {"[bibtexkey]",
                                                                           "[bibtexkey] - [title]"};
@@ -82,4 +84,6 @@ public String getTabName() {
         return Localization.lang("Import");
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
index bfc0de4fbfd..94d7e84c12b 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.java
@@ -30,7 +30,7 @@
 import org.jabref.logic.layout.format.NameFormatter;
 import org.jabref.preferences.JabRefPreferences;
 
-public class NameFormatterTab extends Pane implements PrefsTab {
+public class NameFormatterTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
@@ -227,4 +227,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Name formatter");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/NetworkTab.java
deleted file mode 100644
index 30b343140ca..00000000000
--- a/src/main/java/org/jabref/gui/preferences/NetworkTab.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.jabref.gui.preferences;
-
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.PasswordField;
-import javafx.scene.control.Separator;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.paint.Paint;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.net.ProxyPreferences;
-import org.jabref.logic.net.ProxyRegisterer;
-import org.jabref.preferences.JabRefPreferences;
-
-public class NetworkTab extends Pane implements PrefsTab {
-
-    private final CheckBox useProxyCheckBox;
-    private final TextField hostnameTextField;
-    private final TextField portTextField;
-    private final CheckBox useAuthenticationCheckBox;
-    private final TextField usernameTextField;
-    private final PasswordField passwordTextField;
-    private final JabRefPreferences preferences;
-    private ProxyPreferences oldProxyPreferences;
-    private final DialogService dialogService;
-    private final GridPane builder = new GridPane();
-
-    public NetworkTab(DialogService dialogService, JabRefPreferences preferences) {
-        this.dialogService = dialogService;
-        this.preferences = preferences;
-        builder.setVgap(8);
-
-        useProxyCheckBox = new CheckBox(Localization.lang("Use custom proxy configuration"));
-        hostnameTextField = new TextField();
-        hostnameTextField.setDisable(true);
-        portTextField = new TextField();
-        portTextField.setDisable(true);
-
-        useAuthenticationCheckBox = new CheckBox(Localization.lang("Proxy requires authentication"));
-        useAuthenticationCheckBox.setDisable(true);
-
-        usernameTextField = new TextField();
-        usernameTextField.setDisable(true);
-        passwordTextField = new PasswordField();
-        passwordTextField.setDisable(true);
-        Label passwordWarningLabel = new Label(Localization.lang("Attention: Password is stored in plain text!"));
-        passwordWarningLabel.setDisable(true);
-        passwordWarningLabel.setTextFill(Paint.valueOf("Red"));
-
-        // Listener on useProxyCheckBox to enable and disable the proxy related settings;
-        useProxyCheckBox.setOnAction(event -> {
-            hostnameTextField.setDisable(!useProxyCheckBox.isSelected());
-            portTextField.setDisable(!useProxyCheckBox.isSelected());
-            useAuthenticationCheckBox.setDisable(!useProxyCheckBox.isSelected());
-        });
-
-        useAuthenticationCheckBox.setOnAction(event -> {
-            usernameTextField.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
-            passwordTextField.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
-            passwordWarningLabel.setDisable(!useProxyCheckBox.isSelected() || !useAuthenticationCheckBox.isSelected());
-        });
-
-        Label network = new Label(Localization.lang("Network"));
-        network.getStyleClass().add("sectionHeader");
-        builder.add(network, 1, 1);
-        builder.add(useProxyCheckBox, 1, 4);
-
-        // Hostname configuration
-        HBox hostnameBox = new HBox();
-        hostnameBox.setSpacing(10);
-        hostnameBox.setAlignment(Pos.CENTER_LEFT);
-        Label hostname = new Label(Localization.lang("Hostname") + ':');
-        hostnameBox.getChildren().setAll(hostname, hostnameTextField);
-        builder.add(hostnameBox, 1, 5);
-
-        // Port configuration
-        HBox portBox = new HBox();
-        portBox.setSpacing(50);
-        portBox.setAlignment(Pos.CENTER_LEFT);
-        Label port = new Label(Localization.lang("Port") + ':');
-        portBox.getChildren().setAll(port, portTextField, useAuthenticationCheckBox);
-        builder.add(portBox, 1, 7);
-
-        builder.add(new Separator(), 1, 12);
-
-        // Username configuration
-        HBox usernameBox = new HBox();
-        usernameBox.setSpacing(10);
-        usernameBox.setAlignment(Pos.CENTER_LEFT);
-        Label username = new Label(Localization.lang("Username") + ':');
-        usernameBox.getChildren().setAll(username, usernameTextField);
-        builder.add(usernameBox, 1, 15);
-
-        // Password configuration
-        HBox passwordBox = new HBox();
-        passwordBox.setSpacing(15);
-        passwordBox.setAlignment(Pos.CENTER_LEFT);
-        Label password = new Label(Localization.lang("Password") + ':');
-        passwordBox.getChildren().setAll(password, passwordTextField, passwordWarningLabel);
-        builder.add(passwordBox, 1, 16);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        ProxyPreferences proxyPreferences = preferences.getProxyPreferences();
-        useProxyCheckBox.setSelected(proxyPreferences.isUseProxy());
-        hostnameTextField.setText(proxyPreferences.getHostname());
-        portTextField.setText(proxyPreferences.getPort());
-
-        useAuthenticationCheckBox.setSelected(proxyPreferences.isUseAuthentication());
-        usernameTextField.setText(proxyPreferences.getUsername());
-        passwordTextField.setText(proxyPreferences.getPassword());
-
-        oldProxyPreferences = proxyPreferences;
-    }
-
-    @Override
-    public void storeSettings() {
-        Boolean useProxy = useProxyCheckBox.isSelected();
-        String hostname = hostnameTextField.getText().trim();
-        String port = portTextField.getText().trim();
-        Boolean useAuthentication = useAuthenticationCheckBox.isSelected();
-        String username = usernameTextField.getText().trim();
-        String password = passwordTextField.getText();
-        ProxyPreferences proxyPreferences = new ProxyPreferences(useProxy, hostname, port, useAuthentication, username,
-                password);
-        if (!proxyPreferences.equals(oldProxyPreferences)) {
-            ProxyRegisterer.register(proxyPreferences);
-        }
-        preferences.storeProxyPreferences(proxyPreferences);
-    }
-
-    @Override
-    public boolean validateSettings() {
-        boolean validSetting;
-        boolean validAuthenticationSetting = false;
-        if (useProxyCheckBox.isSelected()) {
-            String host = hostnameTextField.getText();
-            String port = portTextField.getText();
-            if ((host == null) || host.trim().isEmpty() || (port == null) || port.trim().isEmpty()) {
-                validSetting = false;
-            } else {
-                Integer p;
-                try {
-                    p = Integer.parseInt(port);
-                    validSetting = p > 0;
-                } catch (NumberFormatException e) {
-                    validSetting = false;
-                }
-            }
-            if (useAuthenticationCheckBox.isSelected()) {
-                String userName = usernameTextField.getText();
-                char[] password = passwordTextField.getText().toCharArray();
-                // no empty proxy passwords currently supported (they make no sense in this case anyway)
-                if ((userName == null) || userName.trim().isEmpty()  || (password.length == 0)) {
-                    validAuthenticationSetting = false;
-                    validSetting = false;
-                } else {
-                    validAuthenticationSetting = true;
-                }
-            }
-        } else {
-            validSetting = true;
-        }
-        if (!validSetting) {
-            if (validAuthenticationSetting) {
-
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Invalid setting"),
-                        Localization.lang("Please specify both hostname and port")));
-            } else {
-                DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Invalid setting"),
-                        Localization.lang("Please specify both username and password")));
-
-            }
-        }
-        return validSetting;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Network");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
index b3396fe2eec..6354b054091 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
@@ -1,10 +1,40 @@
 package org.jabref.gui.preferences;
 
+import java.util.List;
+
 public interface PreferenceTabViewModel {
 
+    /**
+     * This method is called when the dialog is opened, or if it is made
+     * visible after being hidden. The tab should update all its values.
+     *
+     * This is the ONLY PLACE to set values for the fields in the tab. It
+     * is ILLEGAL to set values only at construction time, because the dialog
+     * will be reused and updated.
+     */
     void setValues();
 
+    /**
+     * This method is called when the user presses OK in the
+     * Preferences dialog. Implementing classes must make sure all
+     * settings presented get stored in JabRefPreferences.
+     */
     void storeSettings();
 
+    /**
+     * This method is called before the {@link #storeSettings()} method,
+     * to check if there are illegal settings in the tab, or if is ready
+     * to be closed.
+     * If the tab is *not* ready, it should display a message to the user
+     * informing about the illegal setting.
+     */
     boolean validateSettings();
+
+    /**
+     * This method should be called after storing the preferences, to
+     * collect the properties, which require a restart of JabRef to load
+     *
+     * @return The messages for the changed properties (e. g. "Changed language: English")
+     */
+    List<String> getRestartWarnings();
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 7fb30a48067..85646a80202 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -24,12 +24,12 @@
 
 /**
  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
- * PrefsTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses ok.
+ * PreferencesTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses ok.
  */
 public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel> {
 
     @FXML private CustomTextField searchBox;
-    @FXML private ListView<PrefsTab> preferenceTabList;
+    @FXML private ListView<PreferencesTab> preferenceTabList;
     @FXML private ScrollPane preferencePaneContainer;
     @FXML private ButtonType saveButton;
 
@@ -84,8 +84,8 @@ private void initialize() {
         });
 
         preferenceTabList.getSelectionModel().selectFirst();
-        new ViewModelListCellFactory<PrefsTab>()
-                .withText(PrefsTab::getTabName)
+        new ViewModelListCellFactory<PreferencesTab>()
+                .withText(PreferencesTab::getTabName)
                 .install(preferenceTabList);
 
         viewModel.setValues(); // ToDo: Remove this after conversion of all tabs
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 0347e948824..653a1e24cd8 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
 
@@ -35,7 +36,7 @@ public class PreferencesDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final JabRefPreferences prefs;
-    private final ObservableList<PrefsTab> preferenceTabs;
+    private final ObservableList<PreferencesTab> preferenceTabs;
     private final JabRefFrame frame;
 
     public PreferencesDialogViewModel(DialogService dialogService, TaskExecutor taskExecutor, JabRefFrame frame) {
@@ -44,26 +45,26 @@ public PreferencesDialogViewModel(DialogService dialogService, TaskExecutor task
         this.prefs = Globals.prefs;
         this.frame = frame;
 
-        preferenceTabs = FXCollections.observableArrayList();
-        preferenceTabs.add(new GeneralTabView(prefs));
-        preferenceTabs.add(new FileTabView(prefs));
-        preferenceTabs.add(new TablePrefsTab(prefs));
-        preferenceTabs.add(new TableColumnsTab(prefs, frame));
-        preferenceTabs.add(new PreviewTabView(prefs));
-        preferenceTabs.add(new ExternalTabView(prefs, frame));
-        preferenceTabs.add(new GroupsPrefsTab(prefs));
-        preferenceTabs.add(new EntryEditorPrefsTab(prefs));
-        preferenceTabs.add(new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()));
-        preferenceTabs.add(new ImportSettingsTab(prefs));
-        preferenceTabs.add(new ExportSortingPrefsTab(prefs));
-        preferenceTabs.add(new NameFormatterTab(prefs));
-        preferenceTabs.add(new XmpPrefsTab(prefs));
-        preferenceTabs.add(new NetworkTab(dialogService, prefs));
-        preferenceTabs.add(new AdvancedTab(dialogService, prefs));
-        preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
+        preferenceTabs = FXCollections.observableArrayList(
+                new GeneralTabView(prefs),
+                new FileTabView(prefs),
+                new TablePrefsTab(prefs),
+                new TableColumnsTab(prefs, frame),
+                new PreviewTabView(prefs),
+                new ExternalTabView(prefs, frame),
+                new GroupsTabView(prefs),
+                new EntryEditorPrefsTab(prefs),
+                new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()),
+                new ImportSettingsTab(prefs),
+                new ExportSortingPrefsTab(prefs),
+                new NameFormatterTab(prefs),
+                new XmpPrefsTab(prefs),
+                new AdvancedTabView(prefs),
+                new AppearancePrefsTab(dialogService, prefs)
+        );
     }
 
-    public ObservableList<PrefsTab> getPreferenceTabs() {
+    public ObservableList<PreferencesTab> getPreferenceTabs() {
         return new ReadOnlyListWrapper<>(preferenceTabs);
     }
 
@@ -153,7 +154,7 @@ private void updateAfterPreferenceChanges() {
      */
 
     public boolean validSettings() {
-        for (PrefsTab tab : preferenceTabs) {
+        for (PreferencesTab tab : preferenceTabs) {
             if (!tab.validateSettings()) {
                 return false;
             }
@@ -162,17 +163,27 @@ public boolean validSettings() {
     }
 
     public void storeAllSettings() {
+        List<String> restartWarnings = new ArrayList<>();
+
         // Run validation checks
         if (!validSettings()) {
             return;
         }
 
         // Store settings
-        for (PrefsTab tab : preferenceTabs) {
-            tab.storeSettings(); // ToDo: After conversion of all tabs: prefsTab.getViewModel().storeSettings();
+        for (PreferencesTab tab : preferenceTabs) {
+            tab.storeSettings();
+            restartWarnings.addAll(tab.getRestartWarnings());
         }
         prefs.flush();
 
+        if (!restartWarnings.isEmpty()) {
+            dialogService.showWarningDialogAndWait(Localization.lang("Restart required"),
+                    String.join(",\n", restartWarnings)
+                            + "\n\n"
+                            + Localization.lang("You must restart JabRef for this to come into effect."));
+        }
+
         GUIGlobals.updateEntryEditorColors();
         frame.setupAllTables();
         frame.getGlobalSearchBar().updateHintVisibility();
@@ -181,11 +192,10 @@ public void storeAllSettings() {
 
     /**
      * Inserts the JabRefPreferences-values into the the Properties of the ViewModel
-     * ToDo: Reword after conversion of all tabs: resetValues()
      */
     public void setValues() {
-        for (PrefsTab prefsTab : preferenceTabs) {
-            prefsTab.setValues(); // ToDo: After conversion of all tabs: prefsTab.getViewModel().setValues();
+        for (PreferencesTab preferencesTab : preferenceTabs) {
+            preferencesTab.setValues();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
index 4478d88f75e..ce6e9ea65fa 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
@@ -17,12 +17,12 @@
 class PreferencesSearchHandler {
 
     private static PseudoClass labelHighlight = PseudoClass.getPseudoClass("search-highlight");
-    private final List<PrefsTab> preferenceTabs;
-    private final ListProperty<PrefsTab> filteredPreferenceTabs;
-    private final ArrayListMultimap<PrefsTab, Labeled> preferenceTabsLabelNames;
+    private final List<PreferencesTab> preferenceTabs;
+    private final ListProperty<PreferencesTab> filteredPreferenceTabs;
+    private final ArrayListMultimap<PreferencesTab, Labeled> preferenceTabsLabelNames;
     private final ArrayList<Labeled> highlightedLabels = new ArrayList<>();
 
-    PreferencesSearchHandler(List<PrefsTab> preferenceTabs) {
+    PreferencesSearchHandler(List<PreferencesTab> preferenceTabs) {
         this.preferenceTabs = preferenceTabs;
         this.preferenceTabsLabelNames = getPrefsTabLabelMap();
         this.filteredPreferenceTabs = new SimpleListProperty<>(FXCollections.observableArrayList(preferenceTabs));
@@ -36,7 +36,7 @@ public void filterTabs(String text) {
         }
 
         filteredPreferenceTabs.clear();
-        for (PrefsTab tab : preferenceTabsLabelNames.keySet()) {
+        for (PreferencesTab tab : preferenceTabsLabelNames.keySet()) {
             boolean tabContainsLabel = false;
             for (Labeled labeled : preferenceTabsLabelNames.get(tab)) {
                 if (labelContainsText(labeled, text)) {
@@ -69,20 +69,20 @@ private void clearSearch() {
     }
 
     /*
-     * Traverse all nodes of a PrefsTab and return a
-     * mapping from PrefsTab to all its Labeled type nodes.
+     * Traverse all nodes of a PreferencesTab and return a
+     * mapping from PreferencesTab to all its Labeled type nodes.
      */
-    private ArrayListMultimap<PrefsTab, Labeled> getPrefsTabLabelMap() {
-        ArrayListMultimap<PrefsTab, Labeled> prefsTabLabelMap = ArrayListMultimap.create();
-        for (PrefsTab prefsTab : preferenceTabs) {
-            Node builder = prefsTab.getBuilder();
+    private ArrayListMultimap<PreferencesTab, Labeled> getPrefsTabLabelMap() {
+        ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap = ArrayListMultimap.create();
+        for (PreferencesTab preferencesTab : preferenceTabs) {
+            Node builder = preferencesTab.getBuilder();
             if (builder instanceof Parent) {
                 Parent parentBuilder = (Parent) builder;
                 for (Node child : parentBuilder.getChildrenUnmodifiable()) {
                     if (child instanceof Labeled) {
                         Labeled labeled = (Labeled) child;
                         if (!labeled.getText().isEmpty()) {
-                            prefsTabLabelMap.put(prefsTab, labeled);
+                            prefsTabLabelMap.put(preferencesTab, labeled);
                         }
                     }
                 }
@@ -91,7 +91,7 @@ private ArrayListMultimap<PrefsTab, Labeled> getPrefsTabLabelMap() {
         return prefsTabLabelMap;
     }
 
-    protected ListProperty<PrefsTab> filteredPreferenceTabsProperty() {
+    protected ListProperty<PreferencesTab> filteredPreferenceTabsProperty() {
         return filteredPreferenceTabs;
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
new file mode 100644
index 00000000000..8f52ec3ffef
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
@@ -0,0 +1,50 @@
+package org.jabref.gui.preferences;
+
+import java.util.List;
+
+import javafx.scene.Node;
+
+/**
+ * A prefsTab is a component displayed in the PreferenceDialog.
+ *
+ * It needs to extend from Component.
+ */
+interface PreferencesTab {
+
+    Node getBuilder();
+
+    /**
+     * Should return the localized identifier to use for the tab.
+     *
+     * @return Identifier for the tab (for instance "General", "Appearance" or "External Files").
+     */
+    String getTabName();
+
+    /**
+     * This method is called when the dialog is opened, or if it is made
+     * visible after being hidden. This calls the appropriate method in the
+     * ViewModel.
+     */
+    void setValues();
+
+    /**
+     * This method is called when the user presses OK in the Preferences
+     * dialog. This calls the appropriate method in the ViewModel.
+     */
+    void storeSettings();
+
+    /**
+     * This method is called before the {@link #storeSettings()} method,
+     * to check if there are illegal settings in the tab, or if is ready
+     * to be closed. This calls the appropriate method in the ViewModel.
+     */
+    boolean validateSettings();
+
+    /**
+     * This method should be called after storing the preferences, This
+     * calls the appropriate method in the ViewModel.
+     *
+     * @return The messages for the changed properties (e. g. "Changed language: English")
+     */
+    List<String> getRestartWarnings();
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PrefsTab.java b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
deleted file mode 100644
index d5e794754ea..00000000000
--- a/src/main/java/org/jabref/gui/preferences/PrefsTab.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.jabref.gui.preferences;
-
-import javafx.scene.Node;
-
-/**
- * A prefsTab is a component displayed in the PreferenceDialog.
- *
- * It needs to extend from Component.
- */
-interface PrefsTab {
-
-    Node getBuilder();
-
-    /**
-     * This method is called when the dialog is opened, or if it is made
-     * visible after being hidden. The tab should update all its values.
-     *
-     * This is the ONLY PLACE to set values for the fields in the tab. It
-     * is ILLEGAL to set values only at construction time, because the dialog
-     * will be reused and updated.
-     */
-    void setValues(); // ToDo: Remove this after conversion of all tabs, done in ViewModel
-
-    /**
-     * This method is called when the user presses OK in the
-     * Preferences dialog. Implementing classes must make sure all
-     * settings presented get stored in JabRefPreferences.
-     */
-    void storeSettings(); // ToDo: After conversion of all tabs: viewModel.storeSettings()
-
-    /**
-     * This method is called before the {@link #storeSettings()} method,
-     * to check if there are illegal settings in the tab, or if is ready
-     * to be closed.
-     * If the tab is *not* ready, it should display a message to the user
-     * informing about the illegal setting.
-     */
-    boolean validateSettings(); // ToDo: After conversion of all tabs: viewModel.validateSettings()
-
-    /**
-     * Should return the localized identifier to use for the tab.
-     *
-     * @return Identifier for the tab (for instance "General", "Appearance" or "External Files").
-     */
-    String getTabName();
-}
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
index c4b229187ce..b2989b9f888 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
@@ -3,12 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
@@ -20,16 +17,13 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-import javafx.scene.layout.VBox;
 
 import org.jabref.Globals;
-import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.gui.util.IconValidationDecorator;
-import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.citationstyle.PreviewLayout;
 import org.jabref.logic.l10n.Localization;
@@ -43,33 +37,24 @@
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 
-public class PreviewTabView extends VBox implements PrefsTab {
+public class PreviewTabView extends AbstractPreferenceTabView implements PreferencesTab {
 
     @FXML private ListView<PreviewLayout> availableListView;
     @FXML private ListView<PreviewLayout> chosenListView;
-
     @FXML private Button toRightButton;
     @FXML private Button toLeftButton;
     @FXML private Button sortUpButton;
     @FXML private Button sortDownButton;
-
     @FXML private Label readOnlyLabel;
     @FXML private Button resetDefaultButton;
-
     @FXML private Tab previewTab;
     @FXML private CodeArea editArea;
 
-    private final ContextMenu contextMenu;
-
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private DialogService dialogService;
-    private final JabRefPreferences preferences;
+    private final ContextMenu contextMenu = new ContextMenu();
 
     private long lastKeyPressTime;
     private String listSearchTerm;
 
-    private PreviewTabViewModel viewModel;
-
     private ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     private class EditAction extends SimpleCommand {
@@ -104,14 +89,17 @@ public void execute() {
 
     public PreviewTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
-        contextMenu = new ContextMenu();
-        ViewLoader.view(this)
+                ViewLoader.view(this)
                   .root(this)
                   .load();
     }
 
+    @Override
+    public String getTabName() { return Localization.lang("Entry preview"); }
+
     public void initialize() {
-        viewModel = new PreviewTabViewModel(dialogService, preferences, taskExecutor);
+        PreviewTabViewModel previewTabViewModel = new PreviewTabViewModel(dialogService, preferences, taskExecutor);
+        this.viewModel = previewTabViewModel;
 
         lastKeyPressTime = System.currentTimeMillis();
 
@@ -125,64 +113,64 @@ public void initialize() {
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
 
-        availableListView.itemsProperty().bindBidirectional(viewModel.availableListProperty());
-        viewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
+        availableListView.itemsProperty().bindBidirectional(previewTabViewModel.availableListProperty());
+        previewTabViewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
                 .withText(PreviewLayout::getName)
                 .install(availableListView);
         availableListView.setOnDragOver(this::dragOver);
         availableListView.setOnDragDetected(this::dragDetectedInAvailable);
-        availableListView.setOnDragDropped(event -> dragDropped(viewModel.availableListProperty(), event));
+        availableListView.setOnDragDropped(event -> dragDropped(previewTabViewModel.availableListProperty(), event));
         availableListView.setOnKeyTyped(event -> jumpToSearchKey(availableListView, event));
         availableListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        chosenListView.itemsProperty().bindBidirectional(viewModel.chosenListProperty());
-        viewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
+        chosenListView.itemsProperty().bindBidirectional(previewTabViewModel.chosenListProperty());
+        previewTabViewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
                 .withText(PreviewLayout::getName)
                 .setOnDragDropped(this::dragDroppedInChosenCell)
                 .install(chosenListView);
         chosenListView.setOnDragOver(this::dragOver);
         chosenListView.setOnDragDetected(this::dragDetectedInChosen);
-        chosenListView.setOnDragDropped(event -> dragDropped(viewModel.chosenListProperty(), event));
+        chosenListView.setOnDragDropped(event -> dragDropped(previewTabViewModel.chosenListProperty(), event));
         chosenListView.setOnKeyTyped(event -> jumpToSearchKey(chosenListView, event));
         chosenListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        chosenListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
+        chosenListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) -> previewTabViewModel.setPreviewLayout(newValue));
 
-        toRightButton.disableProperty().bind(viewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        toRightButton.disableProperty().bind(previewTabViewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
-        toLeftButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
-        sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
-        sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        toLeftButton.disableProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        sortUpButton.disableProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        sortDownButton.disableProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
         previewTab.setContent(new PreviewViewer(new BibDatabaseContext(), dialogService, Globals.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());
+        EasyBind.subscribe(previewTabViewModel.layoutProperty(), value -> ((PreviewViewer) previewTab.getContent()).setLayout(value));
+        previewTab.getContent().visibleProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
 
         editArea.clear();
         editArea.setParagraphGraphicFactory(LineNumberFactory.get(editArea));
         editArea.setContextMenu(contextMenu);
-        editArea.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
-        viewModel.sourceTextProperty().addListener((observable, oldValue, newValue) -> editArea.replaceText(newValue));
+        editArea.visibleProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
+        previewTabViewModel.sourceTextProperty().addListener((observable, oldValue, newValue) -> editArea.replaceText(newValue));
         editArea.textProperty().addListener((observable, oldValue, newValue) -> {
-            viewModel.sourceTextProperty().setValue(newValue);
-            editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue));
+            previewTabViewModel.sourceTextProperty().setValue(newValue);
+            editArea.setStyleSpans(0, previewTabViewModel.computeHighlighting(newValue));
         });
         editArea.focusedProperty().addListener((observable, oldValue, newValue) -> {
             if (!newValue) {
-                viewModel.refreshPreview();
+                previewTabViewModel.refreshPreview();
             }
         });
 
-        readOnlyLabel.visibleProperty().bind(viewModel.selectedIsEditableProperty().not());
-        resetDefaultButton.disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        contextMenu.getItems().get(0).disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        contextMenu.getItems().get(2).disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        editArea.editableProperty().bind(viewModel.selectedIsEditableProperty());
+        readOnlyLabel.visibleProperty().bind(previewTabViewModel.selectedIsEditableProperty().not());
+        resetDefaultButton.disableProperty().bind(previewTabViewModel.selectedIsEditableProperty().not());
+        contextMenu.getItems().get(0).disableProperty().bind(previewTabViewModel.selectedIsEditableProperty().not());
+        contextMenu.getItems().get(2).disableProperty().bind(previewTabViewModel.selectedIsEditableProperty().not());
+        editArea.editableProperty().bind(previewTabViewModel.selectedIsEditableProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.chosenListValidationStatus(), chosenListView));
+        Platform.runLater(() -> validationVisualizer.initVisualization(previewTabViewModel.chosenListValidationStatus(), chosenListView));
     }
 
     /**
@@ -209,62 +197,47 @@ private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed)
             .findFirst().ifPresent(list::scrollTo);
     }
 
-    private void dragOver(DragEvent event) {
-        viewModel.dragOver(event);
-    }
+    private void dragOver(DragEvent event) { ((PreviewTabViewModel) viewModel).dragOver(event); }
 
     private void dragDetectedInAvailable(MouseEvent event) {
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.availableSelectionModelProperty().getValue().getSelectedItems());
+        PreviewTabViewModel previewTabViewModel = (PreviewTabViewModel) viewModel;
+        List<PreviewLayout> selectedLayouts = new ArrayList<>(previewTabViewModel.availableSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            viewModel.dragDetected(viewModel.availableListProperty(), selectedLayouts, dragboard);
+            previewTabViewModel.dragDetected(previewTabViewModel.availableListProperty(), selectedLayouts, dragboard);
         }
         event.consume();
     }
 
     private void dragDetectedInChosen(MouseEvent event) {
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
+        PreviewTabViewModel previewTabViewModel = (PreviewTabViewModel) viewModel;
+        List<PreviewLayout> selectedLayouts = new ArrayList<>(previewTabViewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            viewModel.dragDetected(viewModel.chosenListProperty(), selectedLayouts, dragboard);
+            previewTabViewModel.dragDetected(previewTabViewModel.chosenListProperty(), selectedLayouts, dragboard);
         }
         event.consume();
     }
 
     private void dragDropped(ListProperty<PreviewLayout> targetList, DragEvent event) {
-        boolean success = viewModel.dragDropped(targetList, event.getDragboard());
+        boolean success = ((PreviewTabViewModel) viewModel).dragDropped(targetList, event.getDragboard());
         event.setDropCompleted(success);
         event.consume();
     }
 
     private void dragDroppedInChosenCell(PreviewLayout targetLayout, DragEvent event) {
-        boolean success = viewModel.dragDroppedInChosenCell(targetLayout, event.getDragboard());
+        boolean success = ((PreviewTabViewModel) viewModel).dragDroppedInChosenCell(targetLayout, event.getDragboard());
         event.setDropCompleted(success);
         event.consume();
     }
 
-    public void toRightButtonAction() { viewModel.addToChosen(); }
-
-    public void toLeftButtonAction() { viewModel.removeFromChosen(); }
+    public void toRightButtonAction() { ((PreviewTabViewModel) viewModel).addToChosen(); }
 
-    public void sortUpButtonAction() { viewModel.selectedInChosenUp(); }
+    public void toLeftButtonAction() { ((PreviewTabViewModel) viewModel).removeFromChosen(); }
 
-    public void sortDownButtonAction() { viewModel.selectedInChosenDown(); }
+    public void sortUpButtonAction() { ((PreviewTabViewModel) viewModel).selectedInChosenUp(); }
 
-    public void resetDefaultButtonAction() { viewModel.resetDefaultLayout(); }
+    public void sortDownButtonAction() { ((PreviewTabViewModel) viewModel).selectedInChosenDown(); }
 
-    @Override
-    public Node getBuilder() { return this; }
-
-    @Override
-    public void setValues() { } // Done by bindings
-
-    @Override
-    public void storeSettings() { viewModel.storeSettings(); }
-
-    @Override
-    public boolean validateSettings() { return viewModel.validateSettings(); }
-
-    @Override
-    public String getTabName() { return Localization.lang("Entry preview"); }
+    public void resetDefaultButtonAction() { ((PreviewTabViewModel) viewModel).resetDefaultLayout(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
index cc40248258d..37878b27955 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -53,9 +53,9 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(PreviewTabViewModel.class);
 
     private final ListProperty<PreviewLayout> availableListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
     private final ListProperty<PreviewLayout> chosenListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
 
     private final BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
 
@@ -99,9 +99,6 @@ public PreviewTabViewModel(DialogService dialogService, JabRefPreferences prefer
     }
 
     public void setValues() {
-        availableSelectionModelProperty.setValue(new NoSelectionModel<>());
-        chosenSelectionModelProperty.setValue(new NoSelectionModel<>());
-
         chosenListProperty().getValue().clear();
         chosenListProperty.getValue().addAll(previewPreferences.getPreviewCycle());
 
@@ -216,16 +213,20 @@ public ValidationStatus chosenListValidationStatus() {
 
     @Override
     public boolean validateSettings() {
-        ValidationStatus status = chosenListValidationStatus();
-        if (!status.isValid()) {
-            if (status.getHighestMessage().isPresent()) {
-                dialogService.showErrorDialogAndWait(status.getHighestMessage().get().getMessage());
+        ValidationStatus validationStatus = chosenListValidationStatus();
+        if (!validationStatus.isValid()) {
+            if (validationStatus.getHighestMessage().isPresent()) {
+                validationStatus.getHighestMessage().ifPresent(message ->
+                        dialogService.showErrorDialogAndWait(message.getMessage()));
             }
             return false;
         }
         return true;
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
+
     public void addToChosen() {
         List<PreviewLayout> selected = new ArrayList<>(availableSelectionModelProperty.getValue().getSelectedItems());
         availableListProperty.removeAll(selected);
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
index 73b05df7057..b681aa5fd81 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.java
@@ -42,7 +42,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-class TableColumnsTab extends Pane implements PrefsTab {
+class TableColumnsTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
@@ -556,4 +556,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Entry table columns");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
index c0dfe9b90be..d753c7a7a72 100644
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
@@ -11,7 +14,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
-class TablePrefsTab extends Pane implements PrefsTab {
+class TablePrefsTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
 
@@ -139,4 +142,7 @@ public boolean validateSettings() {
     public String getTabName() {
         return Localization.lang("Entry table");
     }
+
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
index 0db600850b0..d0020403bb4 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrefsTab.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -36,7 +37,7 @@
  *
  * Allows the user to enable and configure the XMP privacy filter.
  */
-class XmpPrefsTab extends Pane implements PrefsTab {
+class XmpPrefsTab extends Pane implements PreferencesTab {
 
     private final JabRefPreferences prefs;
     private final GridPane builder = new GridPane();
@@ -149,6 +150,9 @@ public String getTabName() {
         return Localization.lang("XMP-metadata");
     }
 
+    @Override
+    public List<String> getRestartWarnings() { return new ArrayList<>(); }
+
     private class XMPPrivacyFilter {
 
         private final SimpleStringProperty field;
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index 5758eefb892..b80e25e855b 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -24,6 +24,8 @@ public PushToApplicationSettings(PushToApplication application, DialogService di
         this.application = (AbstractPushToApplication) application;
         this.dialogService = dialogService;
         settingsPane = new GridPane();
+        settingsPane.setHgap(10.0);
+        settingsPane.setVgap(4.0);
 
         commandLabel = new Label();
         path = new TextField();
diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
index ee2eac121fa..1b836552911 100644
--- a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
+++ b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
@@ -7,14 +7,14 @@ private ProxyRegisterer() {
 
     public static void register(ProxyPreferences proxyPrefs) {
         if (proxyPrefs.isUseProxy()) {
-            // NetworkTab.java ensures that proxyHostname and proxyPort are not null
+            // NetworkTabView.java ensures that proxyHostname and proxyPort are not null
             System.setProperty("http.proxyHost", proxyPrefs.getHostname());
             System.setProperty("http.proxyPort", proxyPrefs.getPort());
 
             System.setProperty("https.proxyHost", proxyPrefs.getHostname());
             System.setProperty("https.proxyPort", proxyPrefs.getPort());
 
-            // NetworkTab.java ensures that proxyUsername and proxyPassword are neither null nor empty
+            // NetworkTabView.java ensures that proxyUsername and proxyPassword are neither null nor empty
             if (proxyPrefs.isUseAuthentication()) {
                 System.setProperty("http.proxyUser", proxyPrefs.getUsername());
                 System.setProperty("http.proxyPassword", proxyPrefs.getPassword());
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2d0503a5235..34321e1e9e1 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -128,7 +128,7 @@ Change\ of\ Grouping\ Method=Change of Grouping Method
 
 change\ preamble=change preamble
 
-Changed\ language\ settings=Changed language settings
+Changed\ language=Changed language
 
 Changed\ preamble=Changed preamble
 
@@ -246,13 +246,13 @@ Description=Description
 
 Disable\ this\ confirmation\ dialog=Disable this confirmation dialog
 
-Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups.=Display all entries belonging to one or more of the selected groups.
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Display all entries belonging to one or more of the selected groups
 
 Display\ all\ error\ messages=Display all error messages
 
 Display\ help\ on\ command\ line\ options=Display help on command line options
 
-Display\ only\ entries\ belonging\ to\ all\ selected\ groups.=Display only entries belonging to all selected groups.
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=Display only entries belonging to all selected groups
 Display\ version=Display version
 
 Do\ not\ abbreviate\ names=Do not abbreviate names
@@ -485,8 +485,6 @@ Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Indepe
 I\ Agree=I Agree
 Insert\ rows=Insert rows
 
-Intersection=Intersection
-
 Invalid\ BibTeX\ key=Invalid BibTeX key
 
 Invalid\ date\ format=Invalid date format
@@ -790,6 +788,8 @@ resolved=resolved
 
 Restart=Restart
 
+Restart\ required=Restart required
+
 Review=Review
 Review\ changes=Review changes
 Review\ Field\ Migration=Review Field Migration
@@ -953,7 +953,6 @@ unable\ to\ write\ to=unable to write to
 
 Undo=Undo
 
-Union=Union
 Unknown\ BibTeX\ entries\:=Unknown BibTeX entries\:
 
 unknown\ edit=unknown edit
@@ -996,7 +995,6 @@ web\ link=web link
 What\ do\ you\ want\ to\ do?=What do you want to do?
 Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Whatever option you choose, Mr. DLib may share its data with research partners to further improve recommendation quality as part of a 'living lab'. Mr. DLib may also release public datasets that may contain anonymized information about you and the recommendations (sensitive information such as metadata of your articles will be anonymised through e.g. hashing). Research partners are obliged to adhere to the same strict data protection policy as Mr. DLib.
 
-When\ adding/removing\ keywords,\ separate\ them\ by=When adding/removing keywords, separate them by
 Will\ write\ XMP-metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Will write XMP-metadata to the PDFs linked from selected entries.
 
 with=with
@@ -1013,7 +1011,6 @@ XMP-annotated\ PDF=XMP-annotated PDF
 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\ have\ changed\ the\ language\ setting.=You have changed the language setting.
 
 You\ must\ restart\ JabRef\ for\ the\ new\ key\ bindings\ to\ work\ properly.=You must restart JabRef for the new key bindings to work properly.
 
@@ -1112,7 +1109,7 @@ LaTex\ file\ directory=LaTex file directory
 Search\ failed\:\ illegal\ search\ expression=Search failed: illegal search expression
 Show\ ArXiv\ column=Show ArXiv column
 
-You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535\ in\ the\ text\ field\ for=You must enter an integer value in the interval 1025-65535 in the text field for
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=You must enter an integer value in the interval 1025-65535
 Automatically\ open\ browse\ dialog\ when\ creating\ new\ file\ link=Automatically open browse dialog when creating new file link
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocomplete names in 'Firstname Lastname' format only
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocomplete names in 'Lastname, Firstname' format only
@@ -1317,11 +1314,14 @@ All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=All key bindings will
 
 Automatically\ set\ file\ links=Automatically set file links
 Resetting\ all\ key\ bindings=Resetting all key bindings
-Hostname=Hostname
-Invalid\ setting=Invalid setting
+
 Network=Network
-Please\ specify\ both\ hostname\ and\ port=Please specify both hostname and port
-Please\ specify\ both\ username\ and\ password=Please specify both username and password
+Search\ IEEEXplore=Search IEEEXplore
+Hostname=Hostname
+Please\ specify\ a\ hostname=Please specify a hostname
+Please\ specify\ a\ port=Please specify a port
+Please\ specify\ a\ username=Please specify a username
+Please\ specify\ a\ password=Please specify a password
 
 Use\ custom\ proxy\ configuration=Use custom proxy configuration
 Proxy\ requires\ authentication=Proxy requires authentication
@@ -1425,7 +1425,6 @@ unexpected\ opening\ curly\ bracket=unexpected opening curly bracket
 capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=capital letters are not masked using curly brackets {}
 should\ contain\ a\ four\ digit\ number=should contain a four digit number
 should\ contain\ a\ valid\ page\ number\ range=should contain a valid page number range
-Search\ %0=Search %0
 No\ results\ found.=No results found.
 Found\ %0\ results.=Found %0 results.
 plain\ text=plain text
@@ -2049,6 +2048,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you w
 Add\ new\ keyword=Add new keyword
 Keyword\:=Keyword:
 Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists
+Keyword\ seperator=Keyword seperator
 Remove\ keyword=Remove keyword
 Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ \"%0\"?=Are you sure you want to remove keyword: "%0"?
 Reset\ to\ default=Reset to default