diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 0010f4128fc..046936eb127 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+        "http://www.checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
     <module name="Header">
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 71943814250..65babae5cb6 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE suppressions PUBLIC
         "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-        "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+        "http://www.checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
     <suppress checks="[a-zA-Z0-9]*" files="[\\/]gen[\\/]" />
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 09c8fb16846..d008a5d597c 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -62,4 +62,7 @@
     requires antlr.runtime;
     requires commons.lang3;
     requires xmpbox;
+    requires de.saxsys.mvvmfx.validation;
+    requires richtextfx;
+    requires unirest.java;
 }
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
index 14c2655be95..64fac7cdc94 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplay.fxml
@@ -8,35 +8,53 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-<fx:root prefHeight="200.0" prefWidth="600.0" type="javafx.scene.layout.GridPane" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.SaveOrderConfigDisplayView">
-    <columnConstraints>
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0" />
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-    </columnConstraints>
-    <rowConstraints>
-        <RowConstraints prefHeight="30.0" />
-        <RowConstraints prefHeight="30.0" />
-        <RowConstraints prefHeight="30.0" />
-        <RowConstraints prefHeight="30.0" />
-        <RowConstraints prefHeight="30.0" />
-        <RowConstraints prefHeight="30.0" />
-    </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.SaveOrderConfigDisplayView">
     <fx:define>
-        <ToggleGroup fx:id="saveOrderToggleGroup" />
+        <ToggleGroup fx:id="saveOrderToggleGroup"/>
     </fx:define>
-    <children>
-        <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-        <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-        <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-        <RadioButton fx:id="exportInSpecifiedOrder" mnemonicParsing="false" prefHeight="5.0" prefWidth="206.0" text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="2" />
-        <RadioButton fx:id="exportInTableOrder" mnemonicParsing="false" text="%Export in current table sort order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" GridPane.rowIndex="1" />
-        <RadioButton fx:id="exportInOriginalOrder" mnemonicParsing="false" text="%Export entries in their original order" toggleGroup="$saveOrderToggleGroup" GridPane.columnSpan="3" />
-        <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-        <CheckBox fx:id="saveSecDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-        <CheckBox fx:id="saveTerDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false" text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Primary sort criterion" GridPane.rowIndex="3" />
-        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Secondary sort criterion" GridPane.rowIndex="4" />
-        <Label disabled="${!exportInSpecifiedOrder.selected}" text="%Tertiary sort criterion" GridPane.rowIndex="5" />
-    </children>
+
+    <RadioButton fx:id="exportInOriginalOrder" text="%Export entries in their original order"
+                 toggleGroup="$saveOrderToggleGroup"/>
+    <RadioButton fx:id="exportInTableOrder" text="%Export in current table sort order"
+                 toggleGroup="$saveOrderToggleGroup"/>
+    <RadioButton fx:id="exportInSpecifiedOrder"
+                 text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup"/>
+
+    <GridPane alignment="CENTER_LEFT" hgap="10.0">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="100.0"/>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints prefHeight="30.0"/>
+            <RowConstraints prefHeight="30.0"/>
+            <RowConstraints prefHeight="30.0"/>
+            <RowConstraints prefHeight="30.0"/>
+            <RowConstraints prefHeight="30.0"/>
+            <RowConstraints prefHeight="30.0"/>
+        </rowConstraints>
+
+        <Label disable="${!exportInSpecifiedOrder.selected}" text="%Primary sort criterion" GridPane.rowIndex="0"/>
+        <Label disable="${!exportInSpecifiedOrder.selected}" text="%Secondary sort criterion" GridPane.rowIndex="1"/>
+        <Label disable="${!exportInSpecifiedOrder.selected}" text="%Tertiary sort criterion" GridPane.rowIndex="2"/>
+
+        <ComboBox fx:id="savePriSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="0"
+                  disable="${!exportInSpecifiedOrder.selected}"/>
+        <ComboBox fx:id="saveSecSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="1"
+                  disable="${!exportInSpecifiedOrder.selected}"/>
+        <ComboBox fx:id="saveTerSort" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="2"
+                  disable="${!exportInSpecifiedOrder.selected}"/>
+
+        <CheckBox fx:id="savePriDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false"
+                  text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="0"/>
+        <CheckBox fx:id="saveSecDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false"
+                  text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
+        <CheckBox fx:id="saveTerDesc" disable="${!exportInSpecifiedOrder.selected}" mnemonicParsing="false"
+                  text="%Descending" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
+    </GridPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
index 2c4ef4c5f6f..15679bc9ac2 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayView.java
@@ -7,8 +7,10 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 
+import org.jabref.gui.util.FieldsUtil;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.metadata.SaveOrderConfig;
@@ -16,17 +18,15 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class SaveOrderConfigDisplayView extends GridPane {
-
-    private final SaveOrderConfig config;
+public class SaveOrderConfigDisplayView extends VBox {
 
     @FXML private ToggleGroup saveOrderToggleGroup;
-    @FXML private ComboBox<Field> savePriSort;
-    @FXML private ComboBox<Field> saveSecSort;
-    @FXML private ComboBox<Field> saveTerSort;
     @FXML private RadioButton exportInSpecifiedOrder;
     @FXML private RadioButton exportInTableOrder;
     @FXML private RadioButton exportInOriginalOrder;
+    @FXML private ComboBox<Field> savePriSort;
+    @FXML private ComboBox<Field> saveSecSort;
+    @FXML private ComboBox<Field> saveTerSort;
     @FXML private CheckBox savePriDesc;
     @FXML private CheckBox saveSecDesc;
     @FXML private CheckBox saveTerDesc;
@@ -34,9 +34,7 @@ public class SaveOrderConfigDisplayView extends GridPane {
 
     private SaveOrderConfigDisplayViewModel viewModel;
 
-    public SaveOrderConfigDisplayView(SaveOrderConfig config) {
-        this.config = config;
-
+    public SaveOrderConfigDisplayView() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -45,19 +43,32 @@ public SaveOrderConfigDisplayView(SaveOrderConfig config) {
     @FXML
     private void initialize() {
 
-        viewModel = new SaveOrderConfigDisplayViewModel(config, preferencesService);
+        viewModel = new SaveOrderConfigDisplayViewModel(preferencesService);
 
-        exportInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-        exportInTableOrder.selectedProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
         exportInOriginalOrder.selectedProperty().bindBidirectional(viewModel.saveInOriginalProperty());
+        exportInTableOrder.selectedProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportInSpecifiedOrder.selectedProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
 
+        new ViewModelListCellFactory<Field>()
+                .withText(FieldsUtil::getNameWithType)
+                .install(savePriSort);
         savePriSort.itemsProperty().bindBidirectional(viewModel.priSortFieldsProperty());
-        saveSecSort.itemsProperty().bindBidirectional(viewModel.secSortFieldsProperty());
-        saveTerSort.itemsProperty().bindBidirectional(viewModel.terSortFieldsProperty());
-
         savePriSort.valueProperty().bindBidirectional(viewModel.savePriSortSelectedValueProperty());
+        savePriSort.setConverter(FieldsUtil.fieldStringConverter);
+
+        new ViewModelListCellFactory<Field>()
+                .withText(FieldsUtil::getNameWithType)
+                .install(saveSecSort);
+        saveSecSort.itemsProperty().bindBidirectional(viewModel.secSortFieldsProperty());
         saveSecSort.valueProperty().bindBidirectional(viewModel.saveSecSortSelectedValueProperty());
+        saveSecSort.setConverter(FieldsUtil.fieldStringConverter);
+
+        new ViewModelListCellFactory<Field>()
+                .withText(FieldsUtil::getNameWithType)
+                .install(saveTerSort);
+        saveTerSort.itemsProperty().bindBidirectional(viewModel.terSortFieldsProperty());
         saveTerSort.valueProperty().bindBidirectional(viewModel.saveTerSortSelectedValueProperty());
+        saveTerSort.setConverter(FieldsUtil.fieldStringConverter);
 
         savePriDesc.selectedProperty().bindBidirectional(viewModel.savePriDescPropertySelected());
         saveSecDesc.selectedProperty().bindBidirectional(viewModel.saveSecDescPropertySelected());
@@ -65,6 +76,10 @@ private void initialize() {
 
     }
 
+    public void setValues(SaveOrderConfig config) {
+        viewModel.setSaveOrderConfig(config);
+    }
+
     public void changeExportDescriptionToSave() {
         exportInOriginalOrder.setText(Localization.lang("Save entries in their original order"));
         exportInSpecifiedOrder.setText(Localization.lang("Save entries ordered as specified"));
diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
index cc06c9e8cd9..89ef04f1c25 100644
--- a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
+++ b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
@@ -37,15 +37,13 @@ public class SaveOrderConfigDisplayViewModel {
 
     private final PreferencesService prefs;
 
-    public SaveOrderConfigDisplayViewModel(SaveOrderConfig config, PreferencesService prefs) {
+    public SaveOrderConfigDisplayViewModel(PreferencesService prefs) {
         this.prefs = prefs;
 
         Set<Field> fieldNames = FieldFactory.getCommonFields();
         priSortFieldsProperty.addAll(fieldNames);
         secSortFieldsProperty.addAll(fieldNames);
         terSortFieldsProperty.addAll(fieldNames);
-
-        setSaveOrderConfig(config);
     }
 
     public ListProperty<Field> priSortFieldsProperty() {
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 98b9a2074e8..40682452586 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -271,6 +271,10 @@ public enum JabRefIcons implements JabRefIcon {
         PREVIOUS_UP(MaterialDesignIcon.CHEVRON_UP),
         NEXT_RIGHT(MaterialDesignIcon.CHEVRON_RIGHT),
         NEXT_DOWN(MaterialDesignIcon.CHEVRON_DOWN),
+        LIST_MOVE_LEFT(MaterialDesignIcon.CHEVRON_LEFT),
+        LIST_MOVE_UP(MaterialDesignIcon.CHEVRON_UP),
+        LIST_MOVE_RIGHT(MaterialDesignIcon.CHEVRON_RIGHT),
+        LIST_MOVE_DOWN(MaterialDesignIcon.CHEVRON_DOWN),
         FIT_WIDTH(MaterialDesignIcon.ARROW_EXPAND_ALL),
         FIT_SINGLE_PAGE(MaterialDesignIcon.NOTE),
         ZOOM_OUT(MaterialDesignIcon.MAGNIFY_MINUS),
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index b4c2a0a4694..42197cbc5a0 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -79,14 +79,9 @@ private void initialize() {
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         protect.disableProperty().bind(viewModel.protectDisableProperty());
 
+        saveOrderConfigDisplayView = new SaveOrderConfigDisplayView();
         Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
-        if (storedSaveOrderConfig.isPresent()) {
-            saveOrderConfigDisplayView = new SaveOrderConfigDisplayView(storedSaveOrderConfig.get());
-            oldSaveOrderConfig = storedSaveOrderConfig.get();
-        } else {
-            oldSaveOrderConfig = preferencesService.loadExportSaveOrder();
-            saveOrderConfigDisplayView = new SaveOrderConfigDisplayView(preferencesService.loadExportSaveOrder());
-        }
+        oldSaveOrderConfig = storedSaveOrderConfig.orElseGet(preferencesService::loadExportSaveOrder);
 
         saveOrderConfigDisplayView.changeExportDescriptionToSave();
         fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
@@ -103,6 +98,7 @@ private void initialize() {
 
     private void setValues() {
         fieldFormatterCleanupsPanel.setValues(panel.getBibDatabaseContext().getMetaData());
+        saveOrderConfigDisplayView.setValues(oldSaveOrderConfig);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index b957082890b..cf8b4e69c4c 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -11,12 +11,12 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.preferences.JabRefPreferences;
 
-public abstract class AbstractPreferenceTabView extends VBox implements PreferencesTab {
+public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox implements PreferencesTab {
 
     @Inject protected TaskExecutor taskExecutor;
     @Inject protected DialogService dialogService;
 
-    protected PreferenceTabViewModel viewModel;
+    protected T viewModel;
 
     protected JabRefPreferences preferences;
 
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
index 7c9886d84fb..a98ac76d508 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
@@ -13,53 +13,53 @@
 <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="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">
+        <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"/>
+    </HBox>
 
-        <Label styleClass="sectionHeader" text="%Search IEEEXplore" />
-        <CheckBox fx:id="useIEEELatexAbbreviations" text="%Use IEEE LaTeX abbreviations" />
+    <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="%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>
+    <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>
+        <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"/>
+    </GridPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
index 3e2ce55a038..0da5d97b869 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
@@ -23,7 +23,7 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
-public class AdvancedTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class AdvancedTabView extends AbstractPreferenceTabView<AdvancedTabViewModel> implements PreferencesTab {
     @FXML private Label remoteLabel;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
@@ -62,35 +62,34 @@ public AdvancedTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("Advanced"); }
 
     public void initialize() {
-        AdvancedTabViewModel advancedTabViewModel = new AdvancedTabViewModel(dialogService, preferences);
-        this.viewModel = advancedTabViewModel;
+        this.viewModel = new AdvancedTabViewModel(dialogService, preferences);
 
         remoteLabel.setVisible(preferences.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS));
-        remoteServer.selectedProperty().bindBidirectional(advancedTabViewModel.remoteServerProperty());
-        remotePort.textProperty().bindBidirectional(advancedTabViewModel.remotePortProperty());
+        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
+        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
 
-        useIEEELatexAbbreviations.selectedProperty().bindBidirectional(advancedTabViewModel.useIEEELatexAbbreviationsProperty());
+        useIEEELatexAbbreviations.selectedProperty().bindBidirectional(viewModel.useIEEELatexAbbreviationsProperty());
 
-        useCaseKeeper.selectedProperty().bindBidirectional(advancedTabViewModel.useCaseKeeperProperty());
-        useUnitFormatter.selectedProperty().bindBidirectional(advancedTabViewModel.useUnitFormatterProperty());
+        useCaseKeeper.selectedProperty().bindBidirectional(viewModel.useCaseKeeperProperty());
+        useUnitFormatter.selectedProperty().bindBidirectional(viewModel.useUnitFormatterProperty());
 
-        proxyUse.selectedProperty().bindBidirectional(advancedTabViewModel.proxyUseProperty());
+        proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
         proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyHostname.textProperty().bindBidirectional(advancedTabViewModel.proxyHostnameProperty());
+        proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
         proxyHostname.disableProperty().bind(proxyUse.selectedProperty().not());
         proxyPortLabel.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyPort.textProperty().bindBidirectional(advancedTabViewModel.proxyPortProperty());
+        proxyPort.textProperty().bindBidirectional(viewModel.proxyPortProperty());
         proxyPort.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyUseAuthentication.selectedProperty().bindBidirectional(advancedTabViewModel.proxyUseAuthenticationProperty());
+        proxyUseAuthentication.selectedProperty().bindBidirectional(viewModel.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.textProperty().bindBidirectional(viewModel.proxyUsernameProperty());
         proxyUsername.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyPasswordLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
-        proxyPassword.textProperty().bindBidirectional(advancedTabViewModel.proxyPasswordProperty());
+        proxyPassword.textProperty().bindBidirectional(viewModel.proxyPasswordProperty());
         proxyPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyAttentionLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
 
@@ -104,11 +103,11 @@ public void initialize() {
 
         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);
+            validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
+            validationVisualizer.initVisualization(viewModel.proxyHostnameValidationStatus(), proxyHostname);
+            validationVisualizer.initVisualization(viewModel.proxyPortValidationStatus(), proxyPort);
+            validationVisualizer.initVisualization(viewModel.proxyUsernameValidationStatus(), proxyUsername);
+            validationVisualizer.initVisualization(viewModel.proxyPasswordValidationStatus(), proxyPassword);
         });
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
index aeecbd871c4..663df383ee6 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
@@ -58,8 +58,6 @@ public AdvancedTabViewModel(DialogService dialogService, JabRefPreferences prefe
         this.remotePreferences = preferences.getRemotePreferences();
         this.proxyPreferences = preferences.getProxyPreferences();
 
-        setValues();
-
         remotePortValidator = new FunctionBasedValidator<>(
                 remotePortProperty,
                 input -> {
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
deleted file mode 100644
index b3da27b7eb7..00000000000
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorPrefsTab.java
+++ /dev/null
@@ -1,292 +0,0 @@
-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;
-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.autocompleter.AutoCompleteFirstNameMode;
-import org.jabref.gui.autocompleter.AutoCompletePreferences;
-import org.jabref.gui.entryeditor.FileDragDropPreferenceType;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
-import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_FULL;
-
-class EntryEditorPrefsTab extends Pane implements PreferencesTab {
-
-    private final CheckBox autoOpenForm;
-    private final CheckBox defSource;
-    private final CheckBox emacsMode;
-    private final CheckBox emacsRebindCtrlA;
-    private final CheckBox emacsRebindCtrlF;
-    private final CheckBox autoComplete;
-    private final CheckBox recommendations;
-    private final CheckBox acceptRecommendations;
-    private final CheckBox latexCitations;
-    private final CheckBox validation;
-    private final RadioButton autoCompBoth;
-    private final RadioButton autoCompFF;
-    private final RadioButton autoCompLF;
-    private final RadioButton firstNameModeFull;
-    private final RadioButton firstNameModeAbbr;
-    private final RadioButton firstNameModeBoth;
-    private final GridPane builder = new GridPane();
-
-    private final TextField autoCompFields;
-    private final JabRefPreferences prefs;
-    private final AutoCompletePreferences autoCompletePreferences;
-
-    private final RadioButton copyFile;
-    private final RadioButton linkFile;
-    private final RadioButton renameCopyFile;
-
-    public EntryEditorPrefsTab(JabRefPreferences prefs) {
-        this.prefs = prefs;
-        autoCompletePreferences = prefs.getAutoCompletePreferences();
-        builder.setVgap(7);
-
-        autoOpenForm = new CheckBox(Localization.lang("Open editor when a new entry is created"));
-        defSource = new CheckBox(Localization.lang("Show BibTeX source by default"));
-        emacsMode = new CheckBox(Localization.lang("Use Emacs key bindings"));
-        emacsRebindCtrlA = new CheckBox(Localization.lang("Rebind C-a, too"));
-        emacsRebindCtrlF = new CheckBox(Localization.lang("Rebind C-f, too"));
-        autoComplete = new CheckBox(Localization.lang("Enable word/name autocompletion"));
-        recommendations = new CheckBox(Localization.lang("Show 'Related Articles' tab"));
-        acceptRecommendations = new CheckBox(Localization.lang("Accept recommendations from Mr. DLib"));
-        latexCitations = new CheckBox(Localization.lang("Show 'LaTeX Citations' tab"));
-        validation = new CheckBox(Localization.lang("Show validation messages"));
-
-        // allowed name formats
-        autoCompFF = new RadioButton(Localization.lang("Autocomplete names in 'Firstname Lastname' format only"));
-        autoCompLF = new RadioButton(Localization.lang("Autocomplete names in 'Lastname, Firstname' format only"));
-        autoCompBoth = new RadioButton(Localization.lang("Autocomplete names in both formats"));
-
-        // treatment of first name
-        firstNameModeFull = new RadioButton(Localization.lang("Use full firstname whenever possible"));
-        firstNameModeAbbr = new RadioButton(Localization.lang("Use abbreviated firstname whenever possible"));
-        firstNameModeBoth = new RadioButton(Localization.lang("Use abbreviated and full firstname"));
-
-        // We need a listener on showSource to enable and disable the source panel-related choices:
-        emacsMode.setOnAction(event -> emacsRebindCtrlA.setDisable(!emacsMode.isSelected()));
-
-        // We need a listener on showSource to enable and disable the source panel-related choices:
-        emacsMode.setOnAction(event -> emacsRebindCtrlF.setDisable(!emacsMode.isSelected()));
-
-        autoCompFields = new TextField();
-        // We need a listener on autoComplete to enable and disable the
-        // autoCompFields text field:
-        autoComplete.setOnAction(event -> setAutoCompleteElementsEnabled(autoComplete.isSelected()));
-
-        // Editor options title
-        Label editorOptions = new Label(Localization.lang("Editor options"));
-        editorOptions.getStyleClass().add("sectionHeader");
-        builder.add(editorOptions, 1, 1);
-
-        // Editor options configuration
-        builder.add(autoOpenForm,  1, 2);
-        builder.add(defSource,  1, 3);
-        builder.add(emacsMode, 1, 4);
-        builder.add(emacsRebindCtrlA, 1, 5);
-        builder.add(emacsRebindCtrlF, 1, 6);
-        builder.add(recommendations, 1, 7);
-        builder.add(acceptRecommendations, 1, 8);
-        builder.add(latexCitations, 1, 9);
-        builder.add(validation, 1, 10);
-        builder.add(new Label(""), 1, 11);
-
-        builder.add(new Separator(), 1, 13);
-
-        // Autocompletion options title
-        Label autocompletionOptions = new Label(Localization.lang("Autocompletion options"));
-        autocompletionOptions.getStyleClass().add("sectionHeader");
-        builder.add(autocompletionOptions, 1, 15);
-        builder.add(autoComplete,   1, 16);
-
-        Label useFields = new Label("       " + Localization.lang("Use autocompletion for the following fields") + ":");
-        builder.add(useFields, 1, 17);
-        builder.add(autoCompFields, 2, 17);
-        builder.add(new Label(""), 1, 18);
-
-        builder.add(new Separator(), 1, 21);
-
-        // Name format title
-        Label nameFormat = new Label(Localization.lang("Name format used for autocompletion"));
-        nameFormat.getStyleClass().add("sectionHeader");
-        builder.add(nameFormat, 1, 23);
-
-        // Name format configuration
-        final ToggleGroup autocompletionToggleGroup = new ToggleGroup();
-        builder.add(autoCompFF, 1, 24);
-        builder.add(autoCompLF,  1, 25);
-        builder.add(autoCompBoth,  1, 26);
-        autoCompFF.setToggleGroup(autocompletionToggleGroup);
-        autoCompLF.setToggleGroup(autocompletionToggleGroup);
-        autoCompBoth.setToggleGroup(autocompletionToggleGroup);
-        builder.add(new Label(""), 1, 27);
-
-        builder.add(new Separator(), 1, 30);
-
-        // Treatement of first names title
-        Label treatment = new Label(Localization.lang("Treatment of first names"));
-        treatment.getStyleClass().add("sectionHeader");
-        builder.add(treatment, 1, 32);
-
-        // Treatment of first names configuration
-        final ToggleGroup treatmentOfFirstNamesToggleGroup = new ToggleGroup();
-        builder.add(firstNameModeAbbr,  1, 33);
-        builder.add(firstNameModeFull, 1, 34);
-        builder.add(firstNameModeBoth,  1, 35);
-        firstNameModeAbbr.setToggleGroup(treatmentOfFirstNamesToggleGroup);
-        firstNameModeFull.setToggleGroup(treatmentOfFirstNamesToggleGroup);
-        firstNameModeBoth.setToggleGroup(treatmentOfFirstNamesToggleGroup);
-
-        builder.add(new Separator(), 1, 38);
-
-        // Default drag & drop title
-        Label linkFileOptions = new Label(Localization.lang("Default drag & drop action"));
-        linkFileOptions.getStyleClass().add("sectionHeader");
-        builder.add(linkFileOptions, 1, 40);
-
-        // Default drag & drop configuration
-        final ToggleGroup group = new ToggleGroup();
-        copyFile = new RadioButton(Localization.lang("Copy file to default file folder"));
-        linkFile = new RadioButton(Localization.lang("Link file (without copying)"));
-        renameCopyFile = new RadioButton(Localization.lang("Copy, rename and link file"));
-        builder.add(copyFile, 1, 41);
-        builder.add(linkFile, 1, 42);
-        builder.add(renameCopyFile, 1, 43);
-        copyFile.setToggleGroup(group);
-        linkFile.setToggleGroup(group);
-        renameCopyFile.setToggleGroup(group);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    private void setAutoCompleteElementsEnabled(boolean enabled) {
-        autoCompFields.setDisable(!enabled);
-        autoCompLF.setDisable(!enabled);
-        autoCompFF.setDisable(!enabled);
-        autoCompBoth.setDisable(!enabled);
-        firstNameModeAbbr.setDisable(!enabled);
-        firstNameModeFull.setDisable(!enabled);
-        firstNameModeBoth.setDisable(!enabled);
-    }
-
-    @Override
-    public void setValues() {
-        autoOpenForm.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_OPEN_FORM));
-        defSource.setSelected(prefs.getBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE));
-        emacsMode.setSelected(prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS));
-        emacsRebindCtrlA.setSelected(prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CA));
-        emacsRebindCtrlF.setSelected(prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CF));
-        recommendations.setSelected(prefs.getBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS));
-        acceptRecommendations.setSelected(prefs.getBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS));
-        latexCitations.setSelected(prefs.getBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS));
-        autoComplete.setSelected(autoCompletePreferences.shouldAutoComplete());
-        autoCompFields.setText(autoCompletePreferences.getCompleteNamesAsString());
-
-        if (autoCompletePreferences.getOnlyCompleteFirstLast()) {
-            autoCompFF.setSelected(true);
-        } else if (autoCompletePreferences.getOnlyCompleteLastFirst()) {
-            autoCompLF.setSelected(true);
-        } else {
-            autoCompBoth.setSelected(true);
-        }
-
-        switch (autoCompletePreferences.getFirstNameMode()) {
-        case ONLY_ABBREVIATED:
-            firstNameModeAbbr.setSelected(true);
-            break;
-        case ONLY_FULL:
-            firstNameModeFull.setSelected(true);
-            break;
-        default:
-            firstNameModeBoth.setSelected(true);
-            break;
-        }
-
-        FileDragDropPreferenceType dragDropPreferenceType = prefs.getEntryEditorFileLinkPreference();
-        if (dragDropPreferenceType == FileDragDropPreferenceType.COPY) {
-            copyFile.setSelected(true);
-        } else if (dragDropPreferenceType == FileDragDropPreferenceType.LINK) {
-            linkFile.setSelected(true);
-        } else {
-            renameCopyFile.setSelected(true);
-        }
-
-        // similar for emacs CTRL-a and emacs mode
-        emacsRebindCtrlA.setDisable(!emacsMode.isSelected());
-        // Autocomplete fields is only enabled when autocompletion is selected
-        setAutoCompleteElementsEnabled(autoComplete.isSelected());
-
-        validation.setSelected(prefs.getBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR));
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.putBoolean(JabRefPreferences.AUTO_OPEN_FORM, autoOpenForm.isSelected());
-        prefs.putBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE, defSource.isSelected());
-        prefs.putBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS, recommendations.isSelected());
-        prefs.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, acceptRecommendations.isSelected());
-        prefs.putBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS, latexCitations.isSelected());
-        prefs.putBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR, validation.isSelected());
-
-        autoCompletePreferences.setShouldAutoComplete(autoComplete.isSelected());
-        autoCompletePreferences.setCompleteNames(autoCompFields.getText());
-        if (autoCompBoth.isSelected()) {
-            autoCompletePreferences.setOnlyCompleteFirstLast(false);
-            autoCompletePreferences.setOnlyCompleteLastFirst(false);
-        }
-        else if (autoCompFF.isSelected()) {
-            autoCompletePreferences.setOnlyCompleteFirstLast(true);
-            autoCompletePreferences.setOnlyCompleteLastFirst(false);
-        }
-        else {
-            autoCompletePreferences.setOnlyCompleteFirstLast(false);
-            autoCompletePreferences.setOnlyCompleteLastFirst(true);
-        }
-        if (firstNameModeAbbr.isSelected()) {
-            autoCompletePreferences.setFirstNameMode(ONLY_ABBREVIATED);
-        } else if (firstNameModeFull.isSelected()) {
-            autoCompletePreferences.setFirstNameMode(ONLY_FULL);
-        } else {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
-        }
-
-        if (copyFile.isSelected()) {
-            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.COPY);
-        } else if (linkFile.isSelected()) {
-            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.LINK);
-        } else {
-            prefs.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.MOVE);
-        }
-
-        prefs.storeAutoCompletePreferences(autoCompletePreferences);
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    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/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
new file mode 100644
index 00000000000..0d62000f0d2
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTab.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
+         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.EntryEditorTabView">
+    <Label styleClass="titleHeader" text="%Entry editor"/>
+    <fx:define>
+        <ToggleGroup fx:id="nameFormat"/>
+        <ToggleGroup fx:id="firstNames"/>
+        <ToggleGroup fx:id="dnd"/>
+    </fx:define>
+
+    <CheckBox fx:id="openOnNewEntry" text="%Open editor when a new entry is created"/>
+    <CheckBox fx:id="defaultSource" text="%Show BibTeX source by default"/>
+    <CheckBox fx:id="enableRelatedArticlesTab" text="%Show 'Related Articles' tab"/>
+    <CheckBox fx:id="acceptRecommendations" text="%Accept recommendations from Mr. DLib"
+              disable="${!enableRelatedArticlesTab.selected}">
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </CheckBox>
+    <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
+    <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
+
+    <Label styleClass="sectionHeader" text="%Autocompletion"/>
+    <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
+    <VBox spacing="10.0">
+        <HBox spacing="4.0">
+            <Label text="%Affected fields:" disable="${!enableAutoComplete.selected}"/>
+            <TextField fx:id="autoCompleteFields" prefWidth="250.0" HBox.hgrow="ALWAYS"
+                       disable="${!enableAutoComplete.selected}">
+                <HBox.margin>
+                    <Insets top="-4.0"/>
+                </HBox.margin>
+            </TextField>
+        </HBox>
+        <Label text="%Name format" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteFirstLast" text="%Autocomplete names in 'Firstname Lastname' format only"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteLastFirst" text="%Autocomplete names in 'Lastname, Firstname' format only"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteBoth" text="%Autocomplete names in both formats"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <Label text="%First names" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeAbbreviated" text="%Use abbreviated firstname whenever possible"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeFull" text="%Use full firstname whenever possible"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeBoth" text="%Use abbreviated and full firstname"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </VBox>
+    <Label styleClass="sectionHeader" text="%Default drag &amp; drop action"/>
+    <RadioButton fx:id="dndCopyFile" text="%Copy file to default file folder" toggleGroup="$dnd"/>
+    <RadioButton fx:id="dndLinkFile" text="%Link file (without copying)" toggleGroup="$dnd"/>
+    <RadioButton fx:id="dndCopyRenameLinkFile" text="%Copy, rename and link file" toggleGroup="$dnd"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
new file mode 100644
index 00000000000..ea84c509b67
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabView.java
@@ -0,0 +1,65 @@
+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 EntryEditorTabView extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
+
+    @FXML private CheckBox openOnNewEntry;
+    @FXML private CheckBox defaultSource;
+    @FXML private CheckBox enableRelatedArticlesTab;
+    @FXML private CheckBox acceptRecommendations;
+    @FXML private CheckBox enableLatexCitationsTab;
+    @FXML private CheckBox enableValidation;
+    @FXML private CheckBox enableAutoComplete;
+    @FXML private TextField autoCompleteFields;
+    @FXML private RadioButton autoCompleteFirstLast;
+    @FXML private RadioButton autoCompleteLastFirst;
+    @FXML private RadioButton autoCompleteBoth;
+    @FXML private RadioButton firstNameModeAbbreviated;
+    @FXML private RadioButton firstNameModeFull;
+    @FXML private RadioButton firstNameModeBoth;
+    @FXML private RadioButton dndCopyFile;
+    @FXML private RadioButton dndLinkFile;
+    @FXML private RadioButton dndCopyRenameLinkFile;
+
+    public EntryEditorTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Entry editor"); }
+
+    public void initialize () {
+        this.viewModel = new EntryEditorTabViewModel(dialogService, preferences);
+
+        openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
+        defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
+        enableRelatedArticlesTab.selectedProperty().bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
+        acceptRecommendations.selectedProperty().bindBidirectional(viewModel.acceptRecommendationsProperty());
+        enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
+        enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
+        enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
+        autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
+        autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
+        autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
+        autoCompleteBoth.selectedProperty().bindBidirectional(viewModel.autoCompleteBothProperty());
+        firstNameModeAbbreviated.selectedProperty().bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
+        firstNameModeFull.selectedProperty().bindBidirectional(viewModel.firstNameModeFullProperty());
+        firstNameModeBoth.selectedProperty().bindBidirectional(viewModel.firstNameModeBothProperty());
+        dndCopyFile.selectedProperty().bindBidirectional(viewModel.dndCopyFileProperty());
+        dndLinkFile.selectedProperty().bindBidirectional(viewModel.dndLinkFileProperty());
+        dndCopyRenameLinkFile.selectedProperty().bindBidirectional(viewModel.dndCopyRenameLinkFileProperty());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
new file mode 100644
index 00000000000..efd12048f86
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -0,0 +1,178 @@
+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.autocompleter.AutoCompleteFirstNameMode;
+import org.jabref.gui.autocompleter.AutoCompletePreferences;
+import org.jabref.gui.entryeditor.FileDragDropPreferenceType;
+import org.jabref.preferences.JabRefPreferences;
+
+import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
+import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_FULL;
+
+public class EntryEditorTabViewModel implements PreferenceTabViewModel {
+
+    private final BooleanProperty openOnNewEntryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty defaultSourceProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableRelatedArticlesTabProperty = new SimpleBooleanProperty();
+    private final BooleanProperty acceptRecommendationsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableLatexCitationsTabProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableValidationProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
+    private final StringProperty autoCompleteFieldsProperty = new SimpleStringProperty();
+    private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty dndCopyFileProperty = new SimpleBooleanProperty();
+    private final BooleanProperty dndLinkFileProperty = new SimpleBooleanProperty();
+    private final BooleanProperty dndCopyRenameLinkFileProperty = new SimpleBooleanProperty();
+
+    private AutoCompletePreferences autoCompletePreferences;
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public EntryEditorTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.autoCompletePreferences = preferences.getAutoCompletePreferences();
+    }
+
+    @Override
+    public void setValues() {
+        openOnNewEntryProperty.setValue(preferences.getBoolean(JabRefPreferences.AUTO_OPEN_FORM));
+        defaultSourceProperty.setValue(preferences.getBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE));
+        enableRelatedArticlesTabProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS));
+        acceptRecommendationsProperty.setValue(preferences.getBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS));
+        enableLatexCitationsTabProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS));
+        enableValidationProperty.setValue(preferences.getBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR));
+        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
+        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
+
+        if (autoCompletePreferences.getOnlyCompleteFirstLast()) {
+            autoCompleteFirstLastProperty.setValue(true);
+        } else if (autoCompletePreferences.getOnlyCompleteLastFirst()) {
+            autoCompleteLastFirstProperty.setValue(true);
+        } else {
+            autoCompleteBothProperty.setValue(true);
+        }
+
+        switch (autoCompletePreferences.getFirstNameMode()) {
+            case ONLY_ABBREVIATED:
+                firstNameModeAbbreviatedProperty.setValue(true);
+                break;
+            case ONLY_FULL:
+                firstNameModeFullProperty.setValue(true);
+                break;
+            default:
+                firstNameModeBothProperty.setValue(true);
+                break;
+        }
+
+        FileDragDropPreferenceType dragDropPreferenceType = preferences.getEntryEditorFileLinkPreference();
+        if (dragDropPreferenceType == FileDragDropPreferenceType.COPY) {
+            dndCopyFileProperty.setValue(true);
+        } else if (dragDropPreferenceType == FileDragDropPreferenceType.LINK) {
+            dndLinkFileProperty.setValue(true);
+        } else {
+            dndCopyRenameLinkFileProperty.setValue(true);
+        }
+    }
+
+    @Override
+    public void storeSettings() {
+        preferences.putBoolean(JabRefPreferences.AUTO_OPEN_FORM, openOnNewEntryProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE, defaultSourceProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS, enableRelatedArticlesTabProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, acceptRecommendationsProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS, enableLatexCitationsTabProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR, enableValidationProperty.getValue());
+
+        autoCompletePreferences.setShouldAutoComplete(enableAutoCompleteProperty.getValue());
+        autoCompletePreferences.setCompleteNames(autoCompleteFieldsProperty.getValue());
+        if (autoCompleteBothProperty.getValue()) {
+            autoCompletePreferences.setOnlyCompleteFirstLast(false);
+            autoCompletePreferences.setOnlyCompleteLastFirst(false);
+        }
+        else if (autoCompleteFirstLastProperty.getValue()) {
+            autoCompletePreferences.setOnlyCompleteFirstLast(true);
+            autoCompletePreferences.setOnlyCompleteLastFirst(false);
+        }
+        else {
+            autoCompletePreferences.setOnlyCompleteFirstLast(false);
+            autoCompletePreferences.setOnlyCompleteLastFirst(true);
+        }
+
+        if (firstNameModeAbbreviatedProperty.getValue()) {
+            autoCompletePreferences.setFirstNameMode(ONLY_ABBREVIATED);
+        } else if (firstNameModeFullProperty.getValue()) {
+            autoCompletePreferences.setFirstNameMode(ONLY_FULL);
+        } else {
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
+        }
+
+        if (dndCopyFileProperty.getValue()) {
+            preferences.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.COPY);
+        } else if (dndLinkFileProperty.getValue()) {
+            preferences.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.LINK);
+        } else {
+            preferences.storeEntryEditorFileLinkPreference(FileDragDropPreferenceType.MOVE);
+        }
+
+        preferences.storeAutoCompletePreferences(autoCompletePreferences);
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return new ArrayList<>();
+    }
+
+    public BooleanProperty openOnNewEntryProperty() { return openOnNewEntryProperty; }
+
+    public BooleanProperty defaultSourceProperty() { return defaultSourceProperty; }
+
+    public BooleanProperty enableRelatedArticlesTabProperty() { return enableRelatedArticlesTabProperty; }
+
+    public BooleanProperty acceptRecommendationsProperty() { return acceptRecommendationsProperty; }
+
+    public BooleanProperty enableLatexCitationsTabProperty() { return enableLatexCitationsTabProperty; }
+
+    public BooleanProperty enableValidationProperty() { return enableValidationProperty; }
+
+    public BooleanProperty enableAutoCompleteProperty() { return enableAutoCompleteProperty; }
+
+    public StringProperty autoCompleteFieldsProperty() { return autoCompleteFieldsProperty; }
+
+    public BooleanProperty autoCompleteFirstLastProperty() { return autoCompleteFirstLastProperty; }
+
+    public BooleanProperty autoCompleteLastFirstProperty() { return autoCompleteLastFirstProperty; }
+
+    public BooleanProperty autoCompleteBothProperty() { return autoCompleteBothProperty; }
+
+    public BooleanProperty firstNameModeAbbreviatedProperty() { return firstNameModeAbbreviatedProperty; }
+
+    public BooleanProperty firstNameModeFullProperty() { return firstNameModeFullProperty; }
+
+    public BooleanProperty firstNameModeBothProperty() { return firstNameModeBothProperty; }
+
+    public BooleanProperty dndCopyFileProperty() { return dndCopyFileProperty; }
+
+    public BooleanProperty dndLinkFileProperty() { return dndLinkFileProperty; }
+
+    public BooleanProperty dndCopyRenameLinkFileProperty() { return dndCopyRenameLinkFileProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java b/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
deleted file mode 100644
index c4a802e679c..00000000000
--- a/src/main/java/org/jabref/gui/preferences/ExportSortingPrefsTab.java
+++ /dev/null
@@ -1,57 +0,0 @@
-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;
-import javafx.scene.shape.Line;
-
-import org.jabref.gui.SaveOrderConfigDisplayView;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-/**
- * Preference tab for file sorting options.
- */
-class ExportSortingPrefsTab extends Pane implements PreferencesTab {
-
-    private final SaveOrderConfigDisplayView exportOrderPanel;
-    private final GridPane builder = new GridPane();
-
-    public ExportSortingPrefsTab(JabRefPreferences prefs) {
-        exportOrderPanel = new SaveOrderConfigDisplayView(prefs.loadExportSaveOrder());
-
-        builder.add(exportOrderPanel, 1, 8);
-        builder.add(new Line(), 2, 9);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        //empty
-    }
-
-    @Override
-    public void storeSettings() {
-        exportOrderPanel.storeConfig();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    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/ExportSortingTabView.java b/src/main/java/org/jabref/gui/preferences/ExportSortingTabView.java
new file mode 100644
index 00000000000..a7fdbb2eec0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExportSortingTabView.java
@@ -0,0 +1,52 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.scene.control.Label;
+
+import org.jabref.gui.SaveOrderConfigDisplayView;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+public class ExportSortingTabView extends AbstractPreferenceTabView implements PreferencesTab {
+
+    private final SaveOrderConfigDisplayView exportOrderPanel;
+
+    public ExportSortingTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        Label title = new Label(Localization.lang("Export sorting"));
+        title.getStyleClass().add("titleHeader");
+
+        exportOrderPanel = new SaveOrderConfigDisplayView();
+        exportOrderPanel.setValues(preferences.loadExportSaveOrder());
+
+        this.setWidth(650.0);
+        this.setSpacing(10.0);
+        this.getChildren().addAll(title, exportOrderPanel);
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Export sorting"); }
+
+    @Override
+    public void setValues() {
+        exportOrderPanel.setValues(preferences.loadExportSaveOrder());
+    }
+
+    @Override
+    public void storeSettings() {
+        exportOrderPanel.storeConfig();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return true;
+    }
+
+    @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 88344fff4ef..9823c1d4c39 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
@@ -13,6 +13,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
+
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
          fx:controller="org.jabref.gui.preferences.ExternalTabView">
@@ -21,108 +22,105 @@
         <ToggleGroup fx:id="openPDF"/>
         <ToggleGroup fx:id="openFileBrowser"/>
     </fx:define>
-    <children>
-        <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" minWidth="150.0" />
-            </children>
-        </HBox>
-        <CheckBox fx:id="autoOpenAttachedFolders" text="%Automatically open folders of attached files"/>
-
-        <Label styleClass="sectionHeader" text="%Push applications"/>
-        <HBox>
-            <GridPane alignment="CENTER_LEFT" hgap="10.0">
-                <columnConstraints>
-                    <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 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" 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="titleHeader" text="%External programs"/>
+    <Label styleClass="sectionHeader" text="%Sending of emails"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Subject for sending an email with references"/>
+        <TextField fx:id="eMailReferenceSubject" minWidth="150.0"/>
+    </HBox>
+    <CheckBox fx:id="autoOpenAttachedFolders" text="%Automatically open folders of attached files"/>
 
-        <Label styleClass="sectionHeader" text="%Open console"/>
-        <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
+    <Label styleClass="sectionHeader" text="%Push applications"/>
+    <HBox>
+        <GridPane alignment="CENTER_LEFT" hgap="10.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"/>
-                <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>
-        </GridPane>
-
-        <Label styleClass="sectionHeader" text="%Open PDF"/>
-        <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 hgrow="SOMETIMES" minWidth="10.0" prefWidth="150.0"/>
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="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>
-                <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>
+            <Label text="%Application to push entries to"/>
+            <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"/>
         </GridPane>
+    </HBox>
 
-        <Label styleClass="sectionHeader" text="%Open File Browser"/>
-        <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="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>
-        </GridPane>
-    </children>
+    <Label styleClass="sectionHeader" text="%Open console"/>
+    <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>
+        <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"/>
+    </GridPane>
+
+    <Label styleClass="sectionHeader" text="%Open PDF"/>
+    <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>
+        <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"/>
+    </GridPane>
+
+    <Label styleClass="sectionHeader" text="%Open File Browser"/>
+    <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>
+        <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"/>
+    </GridPane>
 </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 4df5dc1ba5b..106dcff3f2a 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
@@ -15,7 +15,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class ExternalTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class ExternalTabView extends AbstractPreferenceTabView<ExternalTabViewModel> implements PreferencesTab {
 
     @FXML private TextField eMailReferenceSubject;
     @FXML private CheckBox autoOpenAttachedFolders;
@@ -55,67 +55,58 @@ public ExternalTabView(JabRefPreferences preferences, JabRefFrame frame) {
     public String getTabName() { return Localization.lang("External programs"); }
 
     public void initialize() {
-        ExternalTabViewModel externalTabViewModel = new ExternalTabViewModel(dialogService, preferences, frame);
-        this.viewModel = externalTabViewModel;
+        this.viewModel = new ExternalTabViewModel(dialogService, preferences, frame);
 
         new ViewModelListCellFactory<PushToApplication>()
                 .withText(PushToApplication::getApplicationName)
                 .withIcon(PushToApplication::getIcon)
                 .install(pushToApplicationCombo);
 
-        eMailReferenceSubject.textProperty().bindBidirectional(externalTabViewModel.eMailReferenceSubjectProperty());
-        autoOpenAttachedFolders.selectedProperty().bindBidirectional(externalTabViewModel.autoOpenAttachedFoldersProperty());
+        eMailReferenceSubject.textProperty().bindBidirectional(viewModel.eMailReferenceSubjectProperty());
+        autoOpenAttachedFolders.selectedProperty().bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
 
-        pushToApplicationCombo.itemsProperty().bind(externalTabViewModel.pushToApplicationsListProperty());
-        pushToApplicationCombo.valueProperty().bindBidirectional(externalTabViewModel.selectedPushToApplication());
-        citeCommand.textProperty().bindBidirectional(externalTabViewModel.citeCommandProperty());
+        pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
+        pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
+        citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
 
-        useTerminalDefault.selectedProperty().bindBidirectional(externalTabViewModel.useTerminalDefaultProperty());
-        useTerminalSpecial.selectedProperty().bindBidirectional(externalTabViewModel.useTerminalSpecialProperty());
-        useTerminalCommand.textProperty().bindBidirectional(externalTabViewModel.useTerminalCommandProperty());
+        useTerminalDefault.selectedProperty().bindBidirectional(viewModel.useTerminalDefaultProperty());
+        useTerminalSpecial.selectedProperty().bindBidirectional(viewModel.useTerminalSpecialProperty());
+        useTerminalCommand.textProperty().bindBidirectional(viewModel.useTerminalCommandProperty());
         useTerminalCommand.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
         useTerminalBrowse.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
 
-        usePDFAcrobat.selectedProperty().bindBidirectional(externalTabViewModel.usePDFAcrobatProperty());
-        usePDFAcrobatCommand.textProperty().bindBidirectional(externalTabViewModel.usePDFAcrobatCommandProperty());
+        usePDFAcrobat.selectedProperty().bindBidirectional(viewModel.usePDFAcrobatProperty());
+        usePDFAcrobatCommand.textProperty().bindBidirectional(viewModel.usePDFAcrobatCommandProperty());
         usePDFAcrobatCommand.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
         usePDFAcrobatBrowse.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
 
-        usePDFSumatra.selectedProperty().bindBidirectional(externalTabViewModel.usePDFSumatraProperty());
-        usePDFSumatraCommand.textProperty().bindBidirectional(externalTabViewModel.usePDFSumatraCommandProperty());
+        usePDFSumatra.selectedProperty().bindBidirectional(viewModel.usePDFSumatraProperty());
+        usePDFSumatraCommand.textProperty().bindBidirectional(viewModel.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());
+        useFileBrowserDefault.selectedProperty().bindBidirectional(viewModel.useFileBrowserDefaultProperty());
+        useFileBrowserSpecial.selectedProperty().bindBidirectional(viewModel.useFileBrowserSpecialProperty());
+        useFileBrowserSpecialCommand.textProperty().bindBidirectional(viewModel.useFileBrowserSpecialCommandProperty());
         useFileBrowserSpecialCommand.disableProperty().bind(useFileBrowserSpecial.selectedProperty().not());
         useFileBrowserSpecialBrowse.disableProperty().bind(useFileBrowserSpecial.selectedProperty().not());
     }
 
     @FXML
-    void pushToApplicationSettings() { ((ExternalTabViewModel) viewModel).pushToApplicationSettings(); }
+    void pushToApplicationSettings() { viewModel.pushToApplicationSettings(); }
 
     @FXML
-    void manageExternalFileTypes() {
-        ((ExternalTabViewModel) viewModel).manageExternalFileTypes();
-    }
+    void manageExternalFileTypes() { viewModel.manageExternalFileTypes(); }
 
     @FXML
-    void useTerminalCommandBrowse() {
-        ((ExternalTabViewModel) viewModel).useTerminalCommandBrowse();
-    }
+    void useTerminalCommandBrowse() { viewModel.useTerminalCommandBrowse(); }
 
     @FXML
-    void usePDFAcrobatCommandBrowse() {
-        ((ExternalTabViewModel) viewModel).usePDFAcrobatCommandBrowse();
-    }
+    void usePDFAcrobatCommandBrowse() { viewModel.usePDFAcrobatCommandBrowse(); }
 
     @FXML
-    void usePDFSumatraCommandBrowse() {
-        ((ExternalTabViewModel) viewModel).usePDFSumatraCommandBrowse();
-    }
+    void usePDFSumatraCommandBrowse() { viewModel.usePDFSumatraCommandBrowse(); }
 
     @FXML
-    void useFileBrowserSpecialCommandBrowse() { ((ExternalTabViewModel) viewModel).useFileBrowserSpecialCommandBrowse(); }
+    void useFileBrowserSpecialCommandBrowse() { 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 03834fc88c8..ab115772783 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
@@ -59,8 +59,6 @@ public ExternalTabViewModel(DialogService dialogService, JabRefPreferences prefe
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.frame = frame;
-
-        setValues();
     }
 
     public void setValues() {
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
index 70c46cf4bca..5fddfd20114 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
@@ -17,64 +17,55 @@
         <ToggleGroup fx:id="stringsResolveToggleGroup"/>
         <ToggleGroup fx:id="autolinkToggleGroup"/>
     </fx:define>
-    <children>
-        <Label styleClass="titleHeader" text="%File"/>
+    <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">
-            <children>
-                <Label text="%Do not wrap the following fields when saving"/>
-                <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
-            </children>
-        </HBox>
-        <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" 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">
-            <children>
-                <Label alignment="TOP_LEFT" text="%Newline separator"/>
-                <ComboBox fx:id="newLineSeparator" prefWidth="120.0"/>
-            </children>
-        </HBox>
-        <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
+    <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">
+        <Label text="%Do not wrap the following fields when saving"/>
+        <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
+    </HBox>
+    <RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only"
+                 toggleGroup="$stringsResolveToggleGroup"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <RadioButton fx:id="resolveStringsAll" text="%Resolve strings for all fields except"
+                     toggleGroup="$stringsResolveToggleGroup"/>
+        <TextField fx:id="resolveStringsExcept" HBox.hgrow="ALWAYS"/>
+    </HBox>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label alignment="TOP_LEFT" text="%Newline separator"/>
+        <ComboBox fx:id="newLineSeparator" prefWidth="120.0"/>
+    </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>
-                <Label text="%Main file directory"/>
-                <TextField fx:id="mainFileDir" HBox.hgrow="ALWAYS"/>
-                <Button onAction="#mainFileDirBrowse" text="%Browse"/>
-            </children>
-        </HBox>
-        <CheckBox fx:id="useBibLocationAsPrimary" text="%Use the BIB file location as primary file directory">
-            <tooltip>
-                <Tooltip
-                        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"/>
-        <HBox alignment="CENTER_LEFT" spacing="10.0">
-            <children>
-                <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="openBrowseOnCreate" text="%Automatically open browse dialog when creating new file link"/>
+    <Label styleClass="sectionHeader" text="%External file links"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Main file directory"/>
+        <TextField fx:id="mainFileDir" HBox.hgrow="ALWAYS"/>
+        <Button onAction="#mainFileDirBrowse" text="%Browse"/>
+    </HBox>
+    <CheckBox fx:id="useBibLocationAsPrimary" text="%Use the BIB file location as primary file directory">
+        <tooltip>
+            <Tooltip
+                    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"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search"
+                     toggleGroup="$autolinkToggleGroup"/>
+        <TextField fx:id="autolinkRegexKey" HBox.hgrow="ALWAYS"/>
+        <Button fx:id="autolinkRegexHelp"/>
+    </HBox>
+    <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>
-                <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
-                <Button fx:id="autosaveLocalLibrariesHelp"/>
-            </children>
-        </HBox>
-    </children>
+    <Label styleClass="sectionHeader" text="%Autosave"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
+        <Button fx:id="autosaveLocalLibrariesHelp"/>
+    </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabView.java b/src/main/java/org/jabref/gui/preferences/FileTabView.java
index 6da2335affb..825291e056d 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTabView.java
@@ -21,7 +21,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class FileTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class FileTabView extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox openLastStartup;
     @FXML private CheckBox backupOldFile;
@@ -59,41 +59,38 @@ public FileTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("File"); }
 
     public void initialize() {
-        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());
+        this.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());
         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());
+        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());
         autolinkRegexKey.disableProperty().bind(autolinkUseRegex.selectedProperty().not());
-        searchFilesOnOpen.selectedProperty().bindBidirectional(fileTabViewModel.searchFilesOnOpenProperty());
-        openBrowseOnCreate.selectedProperty().bindBidirectional(fileTabViewModel.openBrowseOnCreateProperty());
+        searchFilesOnOpen.selectedProperty().bindBidirectional(viewModel.searchFilesOnOpenProperty());
+        openBrowseOnCreate.selectedProperty().bindBidirectional(viewModel.openBrowseOnCreateProperty());
 
-        autosaveLocalLibraries.selectedProperty().bindBidirectional(fileTabViewModel.autosaveLocalLibrariesProperty());
+        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.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(fileTabViewModel.mainFileDirValidationStatus(), mainFileDir));
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDir));
     }
 
-    public void mainFileDirBrowse() {
-        ((FileTabViewModel) viewModel).mainFileDirBrowse();
-    }
+    public void mainFileDirBrowse() { 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 28047e8e9a3..0bc123b300e 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
@@ -59,7 +59,6 @@ public class FileTabViewModel implements PreferenceTabViewModel {
     public FileTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        setValues();
 
         mainFileDirValidator = new FunctionBasedValidator<>(
                 mainFileDirProperty,
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index a58433fb82d..31583c049a8 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -14,79 +14,73 @@
 <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="titleHeader" text="%General"/>
+    <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" vgrow="SOMETIMES"/>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+        </rowConstraints>
+        <Label text="%Language"/>
+        <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
+        <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"/>
+    </GridPane>
+    <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="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)"/>
+
+    <Label styleClass="sectionHeader" text="%Entry owner"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="markOwner" text="%Mark new entries with owner name"/>
+        <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>
+        </CheckBox>
+        <Button fx:id="markOwnerHelp" prefWidth="20.0"/>
+    </HBox>
+
+    <Label styleClass="sectionHeader" text="%Time stamp"/>
+    <CheckBox fx:id="markTimestamp" text="%Mark new entries with addition date"/>
+    <HBox spacing="10.0">
         <GridPane hgap="10.0" vgap="4.0">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
+                <ColumnConstraints hgrow="SOMETIMES"/>
+                <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>
-            <children>
-                <Label text="%Language"/>
-                <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
-                <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>
+            <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="3"/>
+            <Label fx:id="markTimeStampFieldNameLabel" text="%Field name" GridPane.rowIndex="1"/>
+            <TextField fx:id="markTimeStampFieldName" prefWidth="200.0" GridPane.columnIndex="1"
+                       GridPane.rowIndex="1"/>
         </GridPane>
-        <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="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)"/>
-
-        <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" 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>
-                </CheckBox>
-                <Button fx:id="markOwnerHelp" prefWidth="20.0"/>
-            </children>
-        </HBox>
-
-        <Label styleClass="sectionHeader" text="%Time stamp"/>
-        <CheckBox fx:id="markTimestamp" text="%Mark new entries with addition date"/>
-        <HBox spacing="10.0">
-            <children>
-                <GridPane hgap="10.0" vgap="4.0">
-                    <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                        <ColumnConstraints hgrow="SOMETIMES"/>
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-                    </rowConstraints>
-                    <children>
-                        <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="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>
-        </HBox>
-        <CheckBox fx:id="updateTimeStamp" text="%Update timestamp on modification"/>
-    </children>
+    </HBox>
+    <CheckBox fx:id="updateTimeStamp" text="%Update timestamp on modification"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index 95797c83428..0a3ecee5bbe 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -24,7 +24,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class GeneralTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<Charset> defaultEncoding;
@@ -63,48 +63,47 @@ public GeneralTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("General"); }
 
     public void initialize() {
-        GeneralTabViewModel generalTabViewModel = new GeneralTabViewModel(dialogService, preferences);
-        this.viewModel = generalTabViewModel;
+        this.viewModel = new GeneralTabViewModel(dialogService, preferences);
 
-        language.itemsProperty().bind(generalTabViewModel.languagesListProperty());
-        language.valueProperty().bindBidirectional(generalTabViewModel.selectedLanguageProperty());
+        language.itemsProperty().bind(viewModel.languagesListProperty());
+        language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
 
-        defaultEncoding.itemsProperty().bind(generalTabViewModel.encodingsListProperty());
-        defaultEncoding.valueProperty().bindBidirectional(generalTabViewModel.selectedEncodingProperty());
+        defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
+        defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
-        biblatexMode.itemsProperty().bind(generalTabViewModel.biblatexModeListProperty());
-        biblatexMode.valueProperty().bindBidirectional(generalTabViewModel.selectedBiblatexModeProperty());
+        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
+        biblatexMode.valueProperty().bindBidirectional(viewModel.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());
+        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(generalTabViewModel.markOwnerProperty());
-        markOwnerName.textProperty().bindBidirectional(generalTabViewModel.markOwnerNameProperty());
+        markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
+        markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
         markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
-        markOwnerOverwrite.selectedProperty().bindBidirectional(generalTabViewModel.markOwnerOverwriteProperty());
+        markOwnerOverwrite.selectedProperty().bindBidirectional(viewModel.markOwnerOverwriteProperty());
         markOwnerOverwrite.disableProperty().bind(markOwner.selectedProperty().not());
 
-        markTimestamp.selectedProperty().bindBidirectional(generalTabViewModel.markTimestampProperty());
+        markTimestamp.selectedProperty().bindBidirectional(viewModel.markTimestampProperty());
         markTimeStampFormatLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampFormat.textProperty().bindBidirectional(generalTabViewModel.markTimeStampFormatProperty());
+        markTimeStampFormat.textProperty().bindBidirectional(viewModel.markTimeStampFormatProperty());
         markTimeStampFormat.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampOverwrite.selectedProperty().bindBidirectional(generalTabViewModel.markTimeStampOverwriteProperty());
+        markTimeStampOverwrite.selectedProperty().bindBidirectional(viewModel.markTimeStampOverwriteProperty());
         markTimeStampOverwrite.disableProperty().bind(markTimestamp.selectedProperty().not());
         markTimeStampFieldNameLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampFieldName.textProperty().bindBidirectional(generalTabViewModel.markTimeStampFieldNameProperty());
+        markTimeStampFieldName.textProperty().bindBidirectional(viewModel.markTimeStampFieldNameProperty());
         markTimeStampFieldName.disableProperty().bind(markTimestamp.selectedProperty().not());
-        updateTimeStamp.selectedProperty().bindBidirectional(generalTabViewModel.updateTimeStampProperty());
+        updateTimeStamp.selectedProperty().bindBidirectional(viewModel.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(generalTabViewModel.markTimeStampFormatValidationStatus(), markTimeStampFormat));
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.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 9ca4d692b75..05c2a7afcb9 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -61,7 +61,6 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     public GeneralTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        setValues();
 
         markTimeStampFormatValidator = new FunctionBasedValidator<>(
                 markTimeStampFormatProperty,
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
index 40b0a18537d..ee38f7d5e34 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTab.fxml
@@ -9,37 +9,37 @@
 <?import javafx.scene.layout.GridPane?>
 <?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.GroupsTabView">
     <fx:define>
         <ToggleGroup fx:id="groupViewMode"/>
     </fx:define>
-    <children>
-        <Label styleClass="titleHeader" text="%Groups" />
+    <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="%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>
+    <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>
+        <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"/>
+    </GridPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabView.java b/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
index c3bdaa9a0b0..0198f0f3ba7 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTabView.java
@@ -10,7 +10,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class GroupsTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class GroupsTabView extends AbstractPreferenceTabView<GroupsTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox grayNonHits;
     @FXML private RadioButton groupViewModeIntersection;
@@ -31,14 +31,13 @@ public GroupsTabView(JabRefPreferences preferences) {
     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());
+        this.viewModel = new GroupsTabViewModel(dialogService, preferences);
+
+        grayNonHits.selectedProperty().bindBidirectional(viewModel.grayNonHitsProperty());
+        groupViewModeIntersection.selectedProperty().bindBidirectional(viewModel.groupViewModeIntersectionProperty());
+        groupViewModeUnion.selectedProperty().bindBidirectional(viewModel.groupViewModeUnionProperty());
+        autoAssignGroup.selectedProperty().bindBidirectional(viewModel.autoAssignGroupProperty());
+        defaultGroupingField.textProperty().bindBidirectional(viewModel.defaultGroupingFieldProperty());
+        keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
index bc7a55209d7..be1da293e39 100644
--- a/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GroupsTabViewModel.java
@@ -27,7 +27,6 @@ public class GroupsTabViewModel implements PreferenceTabViewModel {
     public GroupsTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        setValues();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java b/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
deleted file mode 100644
index 2ee1662d1ca..00000000000
--- a/src/main/java/org/jabref/gui/preferences/ImportSettingsTab.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javafx.collections.FXCollections;
-import javafx.scene.Node;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-public class ImportSettingsTab implements PreferencesTab {
-
-    public static final String[] DEFAULT_FILENAMEPATTERNS = new String[] {"[bibtexkey]",
-                                                                          "[bibtexkey] - [title]"};
-
-    private final JabRefPreferences prefs;
-    private final GridPane builder = new GridPane();
-    private final TextField fileNamePattern;
-    private final ComboBox<String> selectFileNamePattern;
-
-    private final TextField fileDirPattern;
-
-    public ImportSettingsTab(JabRefPreferences prefs) {
-        this.prefs = Objects.requireNonNull(prefs);
-
-        fileNamePattern = new TextField();
-        fileDirPattern = new TextField();
-        selectFileNamePattern = new ComboBox<>();
-        selectFileNamePattern.getItems().addAll(FXCollections.observableArrayList(DEFAULT_FILENAMEPATTERNS));
-        selectFileNamePattern.setValue(Localization.lang("Choose pattern"));
-
-        selectFileNamePattern.setOnAction(e -> {
-            fileNamePattern.setText(selectFileNamePattern.getValue());
-        });
-
-        Label defaultImportStyle = new Label(Localization.lang("Default import style for drag and drop of PDFs"));
-        defaultImportStyle.getStyleClass().add("sectionHeader");
-        builder.add(defaultImportStyle, 1, 1);
-        builder.add(new Label(""), 1, 7);
-
-        Label defaultPdfFileLinkAction = new Label(Localization.lang("Default PDF file link action"));
-        defaultPdfFileLinkAction.getStyleClass().add("sectionHeader");
-        builder.add(defaultPdfFileLinkAction, 1, 8);
-        Label filenameFormatPattern = new Label(Localization.lang("Filename format pattern").concat(":"));
-        builder.add(filenameFormatPattern, 1, 9);
-        builder.add(fileNamePattern, 2, 9);
-        builder.add(selectFileNamePattern, 3, 9);
-
-        Label lbfileDirPattern = new Label(Localization.lang("File directory pattern").concat(":"));
-        builder.add(lbfileDirPattern, 1, 10);
-        builder.add(fileDirPattern, 2, 10);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        fileNamePattern.setText(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
-        fileDirPattern.setText(prefs.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, fileNamePattern.getText());
-        prefs.put(JabRefPreferences.IMPORT_FILEDIRPATTERN, fileDirPattern.getText());
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    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/ImportTab.fxml b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
new file mode 100644
index 00000000000..8cb14943e5d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?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?>
+
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
+         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.ImportTabView">
+
+    <Label styleClass="titleHeader" text="%Import"/>
+
+    <Label styleClass="sectionHeader" text="%Linked file name conventions"/>
+    <GridPane hgap="4.0" vgap="4.0">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints vgrow="SOMETIMES"/>
+            <RowConstraints vgrow="SOMETIMES"/>
+        </rowConstraints>
+        <Label text="%Filename format pattern"/>
+        <ComboBox fx:id="fileNamePattern" promptText="%Choose pattern" GridPane.columnIndex="1" editable="true"
+                  prefWidth="300" minWidth="300" maxWidth="300"/>
+
+        <Label text="%File directory pattern" GridPane.rowIndex="1"/>
+        <TextField fx:id="fileDirPattern" GridPane.columnIndex="1" GridPane.rowIndex="1"
+                   prefWidth="300" minWidth="300" maxWidth="300"/>
+    </GridPane>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabView.java b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
new file mode 100644
index 00000000000..ae93a5470b6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
@@ -0,0 +1,35 @@
+package org.jabref.gui.preferences;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class ImportTabView extends AbstractPreferenceTabView<ImportTabViewModel> implements PreferencesTab {
+
+    @FXML private ComboBox<String> fileNamePattern;
+    @FXML private TextField fileDirPattern;
+
+    public ImportTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    public void initialize () {
+        this.viewModel = new ImportTabViewModel(dialogService, preferences);
+
+        fileNamePattern.valueProperty().bindBidirectional(viewModel.fileNamePatternProperty());
+        fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
+        fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Import"); }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
new file mode 100644
index 00000000000..f94016147cc
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
@@ -0,0 +1,58 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.preferences.JabRefPreferences;
+
+public class ImportTabViewModel implements PreferenceTabViewModel {
+
+    public static final String[] DEFAULT_FILENAME_PATTERNS = new String[] { "[bibtexkey]", "[bibtexkey] - [title]" };
+
+    private final ListProperty<String> defaultFileNamePatternsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(DEFAULT_FILENAME_PATTERNS));
+    private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
+    private final StringProperty fileDirPatternProperty = new SimpleStringProperty();
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public ImportTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+    }
+
+    @Override
+    public void setValues() {
+        fileNamePatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
+        fileDirPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
+    }
+
+    @Override
+    public void storeSettings() {
+        preferences.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, fileNamePatternProperty.getValue());
+        preferences.put(JabRefPreferences.IMPORT_FILEDIRPATTERN, fileDirPatternProperty.getValue());
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return new ArrayList<>();
+    }
+
+    public ListProperty<String> defaultFileNamePatternsProperty() { return defaultFileNamePatternsProperty; }
+
+    public StringProperty fileNamePatternProperty() { return fileNamePatternProperty; }
+
+    public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
index 950c610d24e..4b28dcd8c33 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
@@ -20,7 +20,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class NameFormatterTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class NameFormatterTabView extends AbstractPreferenceTabView<NameFormatterTabViewModel> implements PreferencesTab {
 
     @FXML private TableView<NameFormatterItemModel> formatterList;
     @FXML private TableColumn<NameFormatterItemModel, String> formatterNameColumn;
@@ -42,8 +42,7 @@ public NameFormatterTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("Name formatter"); }
 
     public void initialize () {
-        NameFormatterTabViewModel nameFormatterTabViewModel = new NameFormatterTabViewModel(dialogService, preferences);
-        this.viewModel = nameFormatterTabViewModel;
+        this.viewModel = new NameFormatterTabViewModel(dialogService, preferences);
 
         formatterList.setEditable(true);
 
@@ -53,9 +52,8 @@ public void initialize () {
         formatterNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         formatterNameColumn.setEditable(true);
         formatterNameColumn.setOnEditCommit(
-                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) -> {
-                    event.getRowValue().setName(event.getNewValue());
-                });
+                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
+                        event.getRowValue().setName(event.getNewValue()));
 
         formatterStringColumn.setSortable(true);
         formatterStringColumn.setReorderable(false);
@@ -63,9 +61,8 @@ public void initialize () {
         formatterStringColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         formatterStringColumn.setEditable(true);
         formatterStringColumn.setOnEditCommit(
-                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) -> {
-                    event.getRowValue().setFormat(event.getNewValue());
-                });
+                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
+                    event.getRowValue().setFormat(event.getNewValue()));
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
@@ -73,28 +70,25 @@ public void initialize () {
         new ValueTableCellFactory<NameFormatterItemModel, String>()
                 .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove") + " " + name)
-                .withOnMouseClickedEvent(item -> evt -> {
-                    nameFormatterTabViewModel.removeFormatter(formatterList.getFocusModel().getFocusedItem());
-                })
+                .withOnMouseClickedEvent(item -> evt ->
+                        viewModel.removeFormatter(formatterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
         formatterList.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.DELETE) {
-                nameFormatterTabViewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
+                viewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
             }
         });
 
-        formatterList.itemsProperty().bindBidirectional(nameFormatterTabViewModel.formatterListProperty());
+        formatterList.itemsProperty().bindBidirectional(viewModel.formatterListProperty());
 
-        addFormatterName.textProperty().bindBidirectional(nameFormatterTabViewModel.addFormatterNameProperty());
-        addFormatterString.textProperty().bindBidirectional(nameFormatterTabViewModel.addFormatterStringProperty());
+        addFormatterName.textProperty().bindBidirectional(viewModel.addFormatterNameProperty());
+        addFormatterString.textProperty().bindBidirectional(viewModel.addFormatterStringProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER), formatterHelp);
     }
 
-    public void addFormatter() {
-        ((NameFormatterTabViewModel) viewModel).addFormatter();
-    }
+    public void addFormatter() { viewModel.addFormatter(); }
 
 }
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
index 2d510bcceb2..17cd46bc184 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
@@ -25,7 +25,6 @@ public class NameFormatterTabViewModel implements PreferenceTabViewModel {
     NameFormatterTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        setValues();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index c28ca142d01..d3c8459d90e 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -15,44 +15,36 @@
             fx:controller="org.jabref.gui.preferences.PreferencesDialogView">
     <content>
         <SplitPane dividerPositions="0.2">
-            <items>
-                <VBox prefWidth="160.0" styleClass="preference-sidepane">
-                    <children>
-                        <CustomTextField fx:id="searchBox" promptText="%Search" VBox.vgrow="NEVER">
-                            <VBox.margin>
-                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
-                            </VBox.margin>
-                        </CustomTextField>
-                        <ListView fx:id="preferenceTabList" VBox.vgrow="ALWAYS"/>
-                        <VBox prefHeight="10.0" VBox.vgrow="SOMETIMES"/>
-                        <VBox alignment="BOTTOM_LEFT" spacing="3.0">
-                            <children>
-                                <Button maxWidth="Infinity" onAction="#importPreferences" text="%Import preferences">
-                                    <tooltip>
-                                        <Tooltip text="%Import preferences from file"/>
-                                    </tooltip>
-                                </Button>
-                                <Button maxWidth="Infinity" onAction="#exportPreferences" text="%Export preferences">
-                                    <tooltip>
-                                        <Tooltip text="%Export preferences to file"/>
-                                    </tooltip>
-                                </Button>
-                                <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
-                                <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
-                            </children>
-                            <padding>
-                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
-                            </padding>
-                        </VBox>
-                    </children>
+            <VBox prefWidth="160.0" styleClass="preference-sidepane">
+                <CustomTextField fx:id="searchBox" promptText="%Search" VBox.vgrow="NEVER">
+                    <VBox.margin>
+                        <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+                    </VBox.margin>
+                </CustomTextField>
+                <ListView fx:id="preferenceTabList" VBox.vgrow="ALWAYS"/>
+                <VBox prefHeight="10.0" VBox.vgrow="SOMETIMES"/>
+                <VBox alignment="BOTTOM_LEFT" spacing="3.0">
+                    <padding>
+                        <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+                    </padding>
+                    <Button maxWidth="Infinity" onAction="#importPreferences" text="%Import preferences">
+                        <tooltip>
+                            <Tooltip text="%Import preferences from file"/>
+                        </tooltip>
+                    </Button>
+                    <Button maxWidth="Infinity" onAction="#exportPreferences" text="%Export preferences">
+                        <tooltip>
+                            <Tooltip text="%Export preferences to file"/>
+                        </tooltip>
+                    </Button>
+                    <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
+                    <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
                 </VBox>
-                <ScrollPane fx:id="preferencePaneContainer" styleClass="preferencePaneContainer" maxHeight="Infinity"
-                            maxWidth="Infinity"/>
-            </items>
+            </VBox>
+            <ScrollPane fx:id="preferencePaneContainer" styleClass="preferencePaneContainer" maxHeight="Infinity"
+                        maxWidth="Infinity"/>
         </SplitPane>
     </content>
-    <buttonTypes>
-        <ButtonType fx:id="saveButton" text="%Save" buttonData="OK_DONE"/>
-        <ButtonType fx:constant="CANCEL"/>
-    </buttonTypes>
+    <ButtonType fx:id="saveButton" text="%Save" buttonData="OK_DONE"/>
+    <ButtonType fx:constant="CANCEL"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 85646a80202..62c641be770 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -34,14 +34,13 @@ public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel
     @FXML private ButtonType saveButton;
 
     @Inject private DialogService dialogService;
+    @Inject private TaskExecutor taskExecutor;
 
     private JabRefFrame frame;
-    private TaskExecutor taskExecutor;
     private PreferencesDialogViewModel viewModel;
 
-    public PreferencesDialogView(JabRefFrame frame, TaskExecutor taskExecutor) {
+    public PreferencesDialogView(JabRefFrame frame) {
         this.frame = frame;
-        this.taskExecutor = taskExecutor;
         this.setTitle(Localization.lang("JabRef preferences"));
 
         ViewLoader.view(this)
@@ -61,7 +60,7 @@ public PreferencesDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new PreferencesDialogViewModel(dialogService, taskExecutor, frame);
+        viewModel = new PreferencesDialogViewModel(dialogService, frame);
 
         preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
 
@@ -76,10 +75,10 @@ private void initialize() {
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
 
         EasyBind.subscribe(preferenceTabList.getSelectionModel().selectedItemProperty(), tab -> {
-            if (tab != null) {
-                preferencePaneContainer.setContent(tab.getBuilder());
-            } else {
+            if (tab == null) {
                 preferencePaneContainer.setContent(null);
+            } else {
+                preferencePaneContainer.setContent(tab.getBuilder());
             }
         });
 
@@ -88,7 +87,7 @@ private void initialize() {
                 .withText(PreferencesTab::getTabName)
                 .install(preferenceTabList);
 
-        viewModel.setValues(); // ToDo: Remove this after conversion of all tabs
+        viewModel.setValues();
     }
 
     @FXML
@@ -105,22 +104,14 @@ private void savePreferencesAndCloseDialog() {
     }
 
     @FXML
-    void exportPreferences() {
-        viewModel.exportPreferences();
-    }
+    void exportPreferences() { viewModel.exportPreferences(); }
 
     @FXML
-    void importPreferences() {
-        viewModel.importPreferences();
-    }
+    void importPreferences() { viewModel.importPreferences(); }
 
     @FXML
-    void showAllPreferences() {
-        viewModel.showPreferences();
-    }
+    void showAllPreferences() { viewModel.showPreferences(); }
 
     @FXML
-    void resetPreferences() {
-        viewModel.resetPreferences();
-    }
+    void resetPreferences() { viewModel.resetPreferences(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 94d9af78de5..c5879c0ecd6 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -15,7 +15,6 @@
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
@@ -34,33 +33,31 @@ public class PreferencesDialogViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
 
     private final DialogService dialogService;
-    private final TaskExecutor taskExecutor;
-    private final JabRefPreferences prefs;
+    private final JabRefPreferences preferences;
     private final ObservableList<PreferencesTab> preferenceTabs;
     private final JabRefFrame frame;
 
-    public PreferencesDialogViewModel(DialogService dialogService, TaskExecutor taskExecutor, JabRefFrame frame) {
+    public PreferencesDialogViewModel(DialogService dialogService, JabRefFrame frame) {
         this.dialogService = dialogService;
-        this.taskExecutor = taskExecutor;
-        this.prefs = Globals.prefs;
+        this.preferences = Globals.prefs;
         this.frame = frame;
 
         preferenceTabs = FXCollections.observableArrayList(
-                new GeneralTabView(prefs),
-                new FileTabView(prefs),
-                new TablePrefsTab(prefs),
-                new TableColumnsTabView(prefs),
-                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 NameFormatterTabView(prefs),
-                new XmpPrivacyTabView(prefs),
-                new AdvancedTabView(prefs),
-                new AppearancePrefsTab(dialogService, prefs)
+                new GeneralTabView(preferences),
+                new FileTabView(preferences),
+                new TableTabView(preferences),
+                new TableColumnsTabView(preferences),
+                new PreviewTabView(preferences),
+                new ExternalTabView(preferences, frame),
+                new GroupsTabView(preferences),
+                new EntryEditorTabView(preferences),
+                new BibtexKeyPatternPrefTab(preferences, frame.getCurrentBasePanel()),
+                new ImportTabView(preferences),
+                new ExportSortingTabView(preferences),
+                new NameFormatterTabView(preferences),
+                new XmpPrivacyTabView(preferences),
+                new AdvancedTabView(preferences),
+                new AppearancePrefsTab(dialogService, preferences)
         );
     }
 
@@ -72,11 +69,11 @@ public void importPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
+                .withInitialDirectory(preferences.setLastPreferencesExportPath()).build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
             try {
-                prefs.importPreferences(file);
+                preferences.importPreferences(file);
                 updateAfterPreferenceChanges();
 
                 dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
@@ -92,15 +89,15 @@ public void exportPreferences() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(prefs.setLastPreferencesExportPath())
+                .withInitialDirectory(preferences.setLastPreferencesExportPath())
                 .build();
 
         dialogService.showFileSaveDialog(fileDialogConfiguration)
                      .ifPresent(exportFile -> {
                          try {
                              storeAllSettings();
-                             prefs.exportPreferences(exportFile);
-                             prefs.setLastPreferencesExportPath(exportFile);
+                             preferences.exportPreferences(exportFile);
+                             preferences.setLastPreferencesExportPath(exportFile);
                          } catch (JabRefException ex) {
                              LOGGER.warn(ex.getMessage(), ex);
                              dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
@@ -109,7 +106,7 @@ public void exportPreferences() {
     }
 
     public void showPreferences() {
-        new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).showAndWait();
+        new PreferencesFilterDialog(new JabRefPreferencesFilter(preferences)).showAndWait();
     }
 
     public void resetPreferences() {
@@ -120,7 +117,7 @@ public void resetPreferences() {
                 Localization.lang("Cancel"));
         if (resetPreferencesConfirmed) {
             try {
-                prefs.clear();
+                preferences.clear();
 
                 dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
                         Localization.lang("You must restart JabRef for this to come into effect."));
@@ -139,12 +136,12 @@ public void resetPreferences() {
     private void updateAfterPreferenceChanges() {
         setValues();
 
-        List<TemplateExporter> customExporters = prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
-        LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-        SavePreferences savePreferences = prefs.loadForExportFromPreferences();
-        XmpPreferences xmpPreferences = prefs.getXMPPreferences();
+        List<TemplateExporter> customExporters = preferences.getCustomExportFormats(Globals.journalAbbreviationLoader);
+        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
+        SavePreferences savePreferences = preferences.loadForExportFromPreferences();
+        XmpPreferences xmpPreferences = preferences.getXMPPreferences();
         Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences);
-        prefs.updateEntryEditorTabList();
+        preferences.updateEntryEditorTabList();
     }
 
     /**
@@ -175,7 +172,7 @@ public void storeAllSettings() {
             tab.storeSettings();
             restartWarnings.addAll(tab.getRestartWarnings());
         }
-        prefs.flush();
+        preferences.flush();
 
         if (!restartWarnings.isEmpty()) {
             dialogService.showWarningDialogAndWait(Localization.lang("Restart required"),
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
index f71fc84da18..e5564dfa21f 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTab.fxml
@@ -10,61 +10,74 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.fxmisc.flowless.VirtualizedScrollPane?>
 <?import org.fxmisc.richtext.CodeArea?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<?import javafx.scene.control.Tooltip?>
 <fx:root prefWidth="650.0" spacing="4.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.212"
          xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreviewTabView">
-    <children>
-        <Label text="%Current Preview" styleClass="titleHeader"/>
-        <HBox prefHeight="100.0" prefWidth="200.0" spacing="4.0">
-            <children>
-                <VBox spacing="4.0" HBox.hgrow="ALWAYS">
-                    <children>
-                        <Label text="%Available" styleClass="sectionHeader"/>
-                        <ListView fx:id="availableListView" maxHeight="250.0" minHeight="250.0"/>
-                    </children>
-                </VBox>
-                <VBox alignment="CENTER" spacing="4.0">
-                    <children>
-                        <Label styleClass="sectionHeader"/>
-                        <Button fx:id="toRightButton" prefWidth="60.0" text="&gt;&gt;" onAction="#toRightButtonAction"/>
-                        <Button fx:id="toLeftButton" prefWidth="60.0" text="&lt;&lt;" onAction="#toLeftButtonAction"/>
-                        <VBox prefHeight="40.0"/>
-                        <Button fx:id="sortUpButton" prefWidth="60.0" text="%Up" onAction="#sortUpButtonAction"/>
-                        <Button fx:id="sortDownButton" prefWidth="60.0" text="%Down" onAction="#sortDownButtonAction"/>
-                    </children>
-                </VBox>
-                <VBox spacing="4.0" HBox.hgrow="ALWAYS">
-                    <children>
-                        <Label text="%Selected" styleClass="sectionHeader"/>
-                        <ListView fx:id="chosenListView" maxHeight="250.0" minHeight="250.0"/>
-                    </children>
-                </VBox>
-            </children>
+    <Label text="%Current Preview" styleClass="titleHeader"/>
+    <HBox spacing="4.0">
+        <VBox spacing="4.0" HBox.hgrow="ALWAYS">
+            <Label text="%Available" styleClass="sectionHeader"/>
+            <ListView fx:id="availableListView" maxHeight="250.0" minHeight="250.0"/>
+        </VBox>
+        <VBox alignment="CENTER" spacing="4.0">
+            <Label styleClass="sectionHeader"/>
+            <Button fx:id="toRightButton" onAction="#toRightButtonAction"
+                    prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow">
+                <graphic>
+                    <JabRefIconView glyph="LIST_MOVE_RIGHT"/>
+                </graphic>
+            </Button>
+            <Button fx:id="toLeftButton" onAction="#toLeftButtonAction"
+                    prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow">
+                <graphic>
+                    <JabRefIconView glyph="LIST_MOVE_LEFT"/>
+                </graphic>
+            </Button>
+        </VBox>
+        <VBox spacing="4.0" HBox.hgrow="ALWAYS">
+            <Label text="%Selected" styleClass="sectionHeader"/>
+            <ListView fx:id="chosenListView" maxHeight="250.0" minHeight="250.0"/>
+        </VBox>
+        <VBox alignment="CENTER" spacing="4.0">
+            <Label styleClass="sectionHeader"/>
+            <Button fx:id="sortUpButton" onAction="#sortUpButtonAction"
+                    prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow">
+                <graphic>
+                    <JabRefIconView glyph="LIST_MOVE_UP"/>
+                </graphic>
+            </Button>
+            <Button fx:id="sortDownButton" onAction="#sortDownButtonAction"
+                    prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow">
+                <graphic>
+                    <JabRefIconView glyph="LIST_MOVE_DOWN"/>
+                </graphic>
+            </Button>
+        </VBox>
+    </HBox>
+
+    <AnchorPane>
+        <TabPane prefHeight="250.0" prefWidth="650.0" tabClosingPolicy="UNAVAILABLE">
+            <Tab text="%Preview" fx:id="previewTab"/>
+            <Tab text="%Edit">
+                <VirtualizedScrollPane>
+                    <content>
+                        <CodeArea fx:id="editArea"/>
+                    </content>
+                </VirtualizedScrollPane>
+            </Tab>
+        </TabPane>
+        <HBox alignment="CENTER_RIGHT" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="2.0" spacing="5.0">
+            <Label fx:id="readOnlyLabel" text="%Read only"/>
+            <Button fx:id="resetDefaultButton" onAction="#resetDefaultButtonAction"
+                    prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow">
+                <graphic>
+                    <JabRefIconView glyph="REFRESH"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Reset default preview style" />
+                </tooltip>
+            </Button>
         </HBox>
-        <AnchorPane>
-            <children>
-                <TabPane prefHeight="250.0" prefWidth="650.0" tabClosingPolicy="UNAVAILABLE">
-                    <tabs>
-                        <Tab text="%Preview" fx:id="previewTab" />
-                        <Tab text="%Edit">
-                            <content>
-                                <VirtualizedScrollPane>
-                                    <content>
-                                        <CodeArea fx:id="editArea"/>
-                                    </content>
-                                </VirtualizedScrollPane>
-                            </content>
-                        </Tab>
-                    </tabs>
-                </TabPane>
-                <HBox alignment="CENTER_RIGHT" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="2.0" spacing="5.0">
-                    <children>
-                        <Label fx:id="readOnlyLabel" text="%Read only"/>
-                        <Button
-                                fx:id="resetDefaultButton" text="%Reset default preview style"
-                                onAction="#resetDefaultButtonAction"/>
-                    </children>
-                </HBox>
-            </children>
-        </AnchorPane>
-    </children>
+    </AnchorPane>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
index b2989b9f888..c75bfd93d61 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabView.java
@@ -37,7 +37,7 @@
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 
-public class PreviewTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class PreviewTabView extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
 
     @FXML private ListView<PreviewLayout> availableListView;
     @FXML private ListView<PreviewLayout> chosenListView;
@@ -89,7 +89,8 @@ public void execute() {
 
     public PreviewTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
-                ViewLoader.view(this)
+
+        ViewLoader.view(this)
                   .root(this)
                   .load();
     }
@@ -98,79 +99,78 @@ public PreviewTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("Entry preview"); }
 
     public void initialize() {
-        PreviewTabViewModel previewTabViewModel = new PreviewTabViewModel(dialogService, preferences, taskExecutor);
-        this.viewModel = previewTabViewModel;
+        this.viewModel = new PreviewTabViewModel(dialogService, preferences, taskExecutor);
 
         lastKeyPressTime = System.currentTimeMillis();
 
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
         contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.CUT, new PreviewTabView.EditAction(StandardActions.CUT)),
-                factory.createMenuItem(StandardActions.COPY, new PreviewTabView.EditAction(StandardActions.COPY)),
-                factory.createMenuItem(StandardActions.PASTE, new PreviewTabView.EditAction(StandardActions.PASTE)),
-                factory.createMenuItem(StandardActions.SELECT_ALL, new PreviewTabView.EditAction(StandardActions.SELECT_ALL))
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY)),
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE)),
+                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL))
         );
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
         contextMenu.getStyleClass().add("context-menu");
 
-        availableListView.itemsProperty().bindBidirectional(previewTabViewModel.availableListProperty());
-        previewTabViewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
+        availableListView.itemsProperty().bindBidirectional(viewModel.availableListProperty());
+        viewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
                 .withText(PreviewLayout::getName)
                 .install(availableListView);
         availableListView.setOnDragOver(this::dragOver);
         availableListView.setOnDragDetected(this::dragDetectedInAvailable);
-        availableListView.setOnDragDropped(event -> dragDropped(previewTabViewModel.availableListProperty(), event));
+        availableListView.setOnDragDropped(event -> dragDropped(viewModel.availableListProperty(), event));
         availableListView.setOnKeyTyped(event -> jumpToSearchKey(availableListView, event));
         availableListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        chosenListView.itemsProperty().bindBidirectional(previewTabViewModel.chosenListProperty());
-        previewTabViewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
+        chosenListView.itemsProperty().bindBidirectional(viewModel.chosenListProperty());
+        viewModel.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(previewTabViewModel.chosenListProperty(), event));
+        chosenListView.setOnDragDropped(event -> dragDropped(viewModel.chosenListProperty(), event));
         chosenListView.setOnKeyTyped(event -> jumpToSearchKey(chosenListView, event));
         chosenListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        chosenListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) -> previewTabViewModel.setPreviewLayout(newValue));
+        chosenListView.selectionModelProperty().getValue().selectedItemProperty().addListener((observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
 
-        toRightButton.disableProperty().bind(previewTabViewModel.availableSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        toRightButton.disableProperty().bind(viewModel.availableSelectionModelProperty().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());
+        toLeftButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
+        sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
         previewTab.setContent(new PreviewViewer(new BibDatabaseContext(), dialogService, Globals.stateManager));
         ((PreviewViewer) previewTab.getContent()).setEntry(TestEntry.getTestEntry());
-        EasyBind.subscribe(previewTabViewModel.layoutProperty(), value -> ((PreviewViewer) previewTab.getContent()).setLayout(value));
-        previewTab.getContent().visibleProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
+        EasyBind.subscribe(viewModel.layoutProperty(), value -> ((PreviewViewer) previewTab.getContent()).setLayout(value));
+        previewTab.getContent().visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
 
         editArea.clear();
         editArea.setParagraphGraphicFactory(LineNumberFactory.get(editArea));
         editArea.setContextMenu(contextMenu);
-        editArea.visibleProperty().bind(previewTabViewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
-        previewTabViewModel.sourceTextProperty().addListener((observable, oldValue, newValue) -> editArea.replaceText(newValue));
+        editArea.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull());
+        viewModel.sourceTextProperty().addListener((observable, oldValue, newValue) -> editArea.replaceText(newValue));
         editArea.textProperty().addListener((observable, oldValue, newValue) -> {
-            previewTabViewModel.sourceTextProperty().setValue(newValue);
-            editArea.setStyleSpans(0, previewTabViewModel.computeHighlighting(newValue));
+            viewModel.sourceTextProperty().setValue(newValue);
+            editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue));
         });
         editArea.focusedProperty().addListener((observable, oldValue, newValue) -> {
             if (!newValue) {
-                previewTabViewModel.refreshPreview();
+                viewModel.refreshPreview();
             }
         });
 
-        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());
+        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());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(previewTabViewModel.chosenListValidationStatus(), chosenListView));
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.chosenListValidationStatus(), chosenListView));
     }
 
     /**
@@ -197,47 +197,45 @@ private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed)
             .findFirst().ifPresent(list::scrollTo);
     }
 
-    private void dragOver(DragEvent event) { ((PreviewTabViewModel) viewModel).dragOver(event); }
+    private void dragOver(DragEvent event) { viewModel.dragOver(event); }
 
     private void dragDetectedInAvailable(MouseEvent event) {
-        PreviewTabViewModel previewTabViewModel = (PreviewTabViewModel) viewModel;
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(previewTabViewModel.availableSelectionModelProperty().getValue().getSelectedItems());
+        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.availableSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            previewTabViewModel.dragDetected(previewTabViewModel.availableListProperty(), selectedLayouts, dragboard);
+            viewModel.dragDetected(viewModel.availableListProperty(), selectedLayouts, dragboard);
         }
         event.consume();
     }
 
     private void dragDetectedInChosen(MouseEvent event) {
-        PreviewTabViewModel previewTabViewModel = (PreviewTabViewModel) viewModel;
-        List<PreviewLayout> selectedLayouts = new ArrayList<>(previewTabViewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
+        List<PreviewLayout> selectedLayouts = new ArrayList<>(viewModel.chosenSelectionModelProperty().getValue().getSelectedItems());
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
-            previewTabViewModel.dragDetected(previewTabViewModel.chosenListProperty(), selectedLayouts, dragboard);
+            viewModel.dragDetected(viewModel.chosenListProperty(), selectedLayouts, dragboard);
         }
         event.consume();
     }
 
     private void dragDropped(ListProperty<PreviewLayout> targetList, DragEvent event) {
-        boolean success = ((PreviewTabViewModel) viewModel).dragDropped(targetList, event.getDragboard());
+        boolean success = viewModel.dragDropped(targetList, event.getDragboard());
         event.setDropCompleted(success);
         event.consume();
     }
 
     private void dragDroppedInChosenCell(PreviewLayout targetLayout, DragEvent event) {
-        boolean success = ((PreviewTabViewModel) viewModel).dragDroppedInChosenCell(targetLayout, event.getDragboard());
+        boolean success = viewModel.dragDroppedInChosenCell(targetLayout, event.getDragboard());
         event.setDropCompleted(success);
         event.consume();
     }
 
-    public void toRightButtonAction() { ((PreviewTabViewModel) viewModel).addToChosen(); }
+    public void toRightButtonAction() { viewModel.addToChosen(); }
 
-    public void toLeftButtonAction() { ((PreviewTabViewModel) viewModel).removeFromChosen(); }
+    public void toLeftButtonAction() { viewModel.removeFromChosen(); }
 
-    public void sortUpButtonAction() { ((PreviewTabViewModel) viewModel).selectedInChosenUp(); }
+    public void sortUpButtonAction() { viewModel.selectedInChosenUp(); }
 
-    public void sortDownButtonAction() { ((PreviewTabViewModel) viewModel).selectedInChosenDown(); }
+    public void sortDownButtonAction() { viewModel.selectedInChosenDown(); }
 
-    public void resetDefaultButtonAction() { ((PreviewTabViewModel) viewModel).resetDefaultLayout(); }
+    public void resetDefaultButtonAction() { 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 37878b27955..32d2bbff98b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -78,8 +78,6 @@ public PreviewTabViewModel(DialogService dialogService, JabRefPreferences prefer
         this.taskExecutor = taskExecutor;
         previewPreferences = preferences.getPreviewPreferences();
 
-        setValues();
-
         sourceTextProperty.addListener((observable, oldValue, newValue) -> {
             if (getCurrentLayout() instanceof TextBasedPreviewLayout) {
                 ((TextBasedPreviewLayout) getCurrentLayout()).setText(sourceTextProperty.getValue().replace("\n", "__NEWLINE__"));
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index 684e830d445..f17774fcb57 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -16,6 +16,6 @@ public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor)
 
     @Override
     public void execute() {
-        new PreferencesDialogView(jabRefFrame, taskExecutor).show();
+        new PreferencesDialogView(jabRefFrame).show();
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml
index 69912ee367c..1bd8fb9c59a 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTab.fxml
@@ -36,7 +36,7 @@
             <ComboBox fx:id="addColumnName" editable="true" maxWidth="Infinity"/>
         </VBox>
         <VBox alignment="CENTER">
-            <Button fx:id="reloadTableColumns" prefHeight="20.0" prefWidth="20.0"
+            <Button prefHeight="20.0" prefWidth="20.0"
                     styleClass="icon-button,narrow" onAction="#updateToCurrentColumnOrder">
                 <graphic>
                     <JabRefIconView glyph="REFRESH"/>
@@ -49,7 +49,7 @@
                 <Button prefHeight="20.0" prefWidth="20.0"
                         styleClass="icon-button,narrow" onAction="#sortColumnUp">
                     <graphic>
-                        <JabRefIconView glyph="UP"/>
+                        <JabRefIconView glyph="LIST_MOVE_UP"/>
                     </graphic>
                     <tooltip>
                         <Tooltip text="%Sort column one step upwards"/>
@@ -58,7 +58,7 @@
                 <Button prefHeight="20.0" prefWidth="20.0"
                         styleClass="icon-button,narrow" onAction="#sortColumnDown">
                     <graphic>
-                        <JabRefIconView glyph="DOWN"/>
+                        <JabRefIconView glyph="LIST_MOVE_DOWN"/>
                     </graphic>
                     <tooltip>
                         <Tooltip text="%Sort column one step downwards"/>
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
index 20fa77d23e3..fcf310daeef 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
@@ -9,7 +9,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
-import javafx.util.StringConverter;
 
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -22,13 +21,12 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class TableColumnsTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class TableColumnsTabView extends AbstractPreferenceTabView<TableColumnsTabViewModel> implements PreferencesTab {
 
     @FXML private TableView<TableColumnsItemModel> columnsList;
     @FXML private TableColumn<TableColumnsItemModel, Field> nameColumn;
@@ -85,61 +83,47 @@ private void setupTable() {
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(name -> Localization.lang("Remove column") + " " + name.getDisplayName())
                 .withOnMouseClickedEvent(item -> evt ->
-                        ((TableColumnsTabViewModel) viewModel).removeColumn(columnsList.getFocusModel().getFocusedItem()))
+                        viewModel.removeColumn(columnsList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
-        ((TableColumnsTabViewModel) viewModel).selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
+        viewModel.selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
         columnsList.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.DELETE) {
-                ((TableColumnsTabViewModel) viewModel).removeColumn(columnsList.getSelectionModel().getSelectedItem());
+                viewModel.removeColumn(columnsList.getSelectionModel().getSelectedItem());
             }
         });
 
-        columnsList.itemsProperty().bind(((TableColumnsTabViewModel) viewModel).columnsListProperty());
+        columnsList.itemsProperty().bind(viewModel.columnsListProperty());
 
         new ViewModelListCellFactory<Field>()
                 .withText(FieldsUtil::getNameWithType)
                 .install(addColumnName);
-        addColumnName.itemsProperty().bind(((TableColumnsTabViewModel) viewModel).availableColumnsProperty());
-        addColumnName.valueProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).addColumnProperty());
-        addColumnName.setConverter(new StringConverter<>() {
-            @Override
-            public String toString(Field object) {
-                if (object != null) {
-                    return object.getName();
-                } else {
-                    return "";
-                }
-            }
-
-            @Override
-            public Field fromString(String string) {
-                return FieldFactory.parseField(string);
-            }
-        });
+        addColumnName.itemsProperty().bind(viewModel.availableColumnsProperty());
+        addColumnName.valueProperty().bindBidirectional(viewModel.addColumnProperty());
+        addColumnName.setConverter(FieldsUtil.fieldStringConverter);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(((TableColumnsTabViewModel) viewModel).columnsListValidationStatus(), columnsList));
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.columnsListValidationStatus(), columnsList));
     }
 
     private void setupBindings() {
-        showFileColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showFileColumnProperty());
-        showUrlColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showUrlColumnProperty());
-        urlFirst.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).preferUrlProperty());
-        doiFirst.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).preferDoiProperty());
-        showEPrintColumn.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).showEPrintColumnProperty());
-        specialFieldsEnable.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsEnabledProperty());
-        specialFieldsSyncKeywords.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsSyncKeywordsProperty());
-        specialFieldsSerialize.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).specialFieldsSerializeProperty());
-        extraFileColumnsEnable.selectedProperty().bindBidirectional(((TableColumnsTabViewModel) viewModel).extraFileColumnsEnabledProperty());
+        showFileColumn.selectedProperty().bindBidirectional(viewModel.showFileColumnProperty());
+        showUrlColumn.selectedProperty().bindBidirectional(viewModel.showUrlColumnProperty());
+        urlFirst.selectedProperty().bindBidirectional(viewModel.preferUrlProperty());
+        doiFirst.selectedProperty().bindBidirectional(viewModel.preferDoiProperty());
+        showEPrintColumn.selectedProperty().bindBidirectional(viewModel.showEPrintColumnProperty());
+        specialFieldsEnable.selectedProperty().bindBidirectional(viewModel.specialFieldsEnabledProperty());
+        specialFieldsSyncKeywords.selectedProperty().bindBidirectional(viewModel.specialFieldsSyncKeywordsProperty());
+        specialFieldsSerialize.selectedProperty().bindBidirectional(viewModel.specialFieldsSerializeProperty());
+        extraFileColumnsEnable.selectedProperty().bindBidirectional(viewModel.extraFileColumnsEnabledProperty());
     }
 
-    public void updateToCurrentColumnOrder() { ((TableColumnsTabViewModel) viewModel).fillColumnList(); }
+    public void updateToCurrentColumnOrder() { viewModel.fillColumnList(); }
 
-    public void sortColumnUp() { ((TableColumnsTabViewModel) viewModel).moveColumnUp(); }
+    public void sortColumnUp() { viewModel.moveColumnUp(); }
 
-    public void sortColumnDown() { ((TableColumnsTabViewModel) viewModel).moveColumnDown(); }
+    public void sortColumnDown() { viewModel.moveColumnDown(); }
 
-    public void addColumn() { ((TableColumnsTabViewModel) viewModel).insertColumnInList(); }
+    public void addColumn() { viewModel.insertColumnInList(); }
 
 }
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
index 7227149ca7f..cce80e1cd14 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
@@ -86,8 +86,6 @@ public TableColumnsTabViewModel(DialogService dialogService, JabRefPreferences p
                         Localization.lang("Entry table columns"),
                         Localization.lang("Columns"),
                         Localization.lang("List must not be empty."))));
-
-        setValues();
     }
 
     @Override
@@ -104,13 +102,13 @@ public void setValues() {
 
         fillColumnList();
 
-        List<Field> internalFields = new ArrayList<>();
-        internalFields.add(InternalField.OWNER);
-        internalFields.add(InternalField.TIMESTAMP);
-        internalFields.add(InternalField.GROUPS);
-        internalFields.add(InternalField.KEY_FIELD);
-        internalFields.add(InternalField.TYPE_HEADER);
-        internalFields.forEach(item -> availableColumnsProperty.getValue().add(item));
+        availableColumnsProperty.clear();
+
+        availableColumnsProperty.add(InternalField.TIMESTAMP);
+        availableColumnsProperty.add(InternalField.OWNER);
+        availableColumnsProperty.add(InternalField.GROUPS);
+        availableColumnsProperty.add(InternalField.KEY_FIELD);
+        availableColumnsProperty.add(InternalField.TYPE_HEADER);
 
         EnumSet.allOf(StandardField.class).forEach(item -> availableColumnsProperty.getValue().add(item));
 
diff --git a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java b/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
deleted file mode 100644
index d22a6f30002..00000000000
--- a/src/main/java/org/jabref/gui/preferences/TablePrefsTab.java
+++ /dev/null
@@ -1,140 +0,0 @@
-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;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
-
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.JabRefPreferences;
-
-class TablePrefsTab extends Pane implements PreferencesTab {
-
-    private final JabRefPreferences prefs;
-
-    private final CheckBox autoResizeMode;
-
-    private final RadioButton namesAsIs;
-    private final RadioButton namesFf;
-    private final RadioButton namesFl;
-    private final RadioButton namesNatbib;
-    private final RadioButton abbrNames;
-    private final RadioButton noAbbrNames;
-    private final RadioButton lastNamesOnly;
-
-    private final GridPane builder = new GridPane();
-
-    /**
-     * Customization of external program paths.
-     *
-     * @param prefs
-     *            a <code>JabRefPreferences</code> value
-     */
-    public TablePrefsTab(JabRefPreferences prefs) {
-        this.prefs = prefs;
-        autoResizeMode = new CheckBox(Localization.lang("Fit table horizontally on screen"));
-        namesAsIs = new RadioButton(Localization.lang("Show names unchanged"));
-        namesFf = new RadioButton(Localization.lang("Show 'Firstname Lastname'"));
-        namesFl = new RadioButton(Localization.lang("Show 'Lastname, Firstname'"));
-        namesNatbib = new RadioButton(Localization.lang("Natbib style"));
-        noAbbrNames = new RadioButton(Localization.lang("Do not abbreviate names"));
-        abbrNames = new RadioButton(Localization.lang("Abbreviate names"));
-        lastNamesOnly = new RadioButton(Localization.lang("Show last names only"));
-
-        Label formatOfAuthor = new Label(Localization.lang("Format of author and editor names"));
-        formatOfAuthor.getStyleClass().add("sectionHeader");
-        builder.add(formatOfAuthor, 1, 1);
-        final ToggleGroup formatNamesToggleGroup = new ToggleGroup();
-        final ToggleGroup nameAbbrevToggleGroup = new ToggleGroup();
-        builder.add(namesAsIs, 1, 2);
-        namesAsIs.setToggleGroup(formatNamesToggleGroup);
-        builder.add(noAbbrNames, 2, 2);
-        noAbbrNames.setToggleGroup(nameAbbrevToggleGroup);
-        builder.add(namesFf, 1, 3);
-        namesFf.setToggleGroup(formatNamesToggleGroup);
-        builder.add(abbrNames, 2, 3);
-        abbrNames.setToggleGroup(nameAbbrevToggleGroup);
-        builder.add(namesFl, 1, 4);
-        namesFl.setToggleGroup(formatNamesToggleGroup);
-        builder.add(lastNamesOnly, 2, 4);
-        lastNamesOnly.setToggleGroup(nameAbbrevToggleGroup);
-        builder.add(namesNatbib, 1, 5);
-        namesNatbib.setToggleGroup(formatNamesToggleGroup);
-        Label label1 = new Label("");
-        builder.add(label1, 1, 6);
-        Label general = new Label(Localization.lang("General"));
-        general.getStyleClass().add("sectionHeader");
-        builder.add(general, 1, 7);
-        builder.add(autoResizeMode, 1, 8);
-
-        abbrNames.disableProperty().bind(namesNatbib.selectedProperty());
-        lastNamesOnly.disableProperty().bind(namesNatbib.selectedProperty());
-        noAbbrNames.disableProperty().bind(namesNatbib.selectedProperty());
-
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        autoResizeMode.setSelected(prefs.getBoolean(JabRefPreferences.AUTO_RESIZE_MODE));
-
-        if (prefs.getBoolean(JabRefPreferences.NAMES_AS_IS)) {
-            namesAsIs.setSelected(true);
-        } else if (prefs.getBoolean(JabRefPreferences.NAMES_FIRST_LAST)) {
-            namesFf.setSelected(true);
-        } else if (prefs.getBoolean(JabRefPreferences.NAMES_NATBIB)) {
-            namesNatbib.setSelected(true);
-        } else {
-            namesFl.setSelected(true);
-        }
-        if (prefs.getBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES)) {
-            abbrNames.setSelected(true);
-        } else if (prefs.getBoolean(JabRefPreferences.NAMES_LAST_ONLY)) {
-            lastNamesOnly.setSelected(true);
-        } else {
-            noAbbrNames.setSelected(true);
-        }
-
-    }
-
-    /**
-     * Store changes to table preferences. This method is called when the user
-     * clicks Ok.
-     *
-     */
-    @Override
-    public void storeSettings() {
-
-        prefs.putBoolean(JabRefPreferences.NAMES_AS_IS, namesAsIs.isSelected());
-        prefs.putBoolean(JabRefPreferences.NAMES_FIRST_LAST, namesFf.isSelected());
-        prefs.putBoolean(JabRefPreferences.NAMES_NATBIB, namesNatbib.isSelected());
-        prefs.putBoolean(JabRefPreferences.NAMES_LAST_ONLY, lastNamesOnly.isSelected());
-        prefs.putBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES, abbrNames.isSelected());
-
-        prefs.putBoolean(JabRefPreferences.AUTO_RESIZE_MODE, autoResizeMode.isSelected());
-
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    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/TableTab.fxml b/src/main/java/org/jabref/gui/preferences/TableTab.fxml
new file mode 100644
index 00000000000..77b799317cc
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableTab.fxml
@@ -0,0 +1,29 @@
+<?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.ToggleGroup?>
+<?import javafx.scene.layout.VBox?>
+
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
+         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.TableTabView">
+    <fx:define>
+        <ToggleGroup fx:id="namesFormat"/>
+        <ToggleGroup fx:id="abbreviationMode"/>
+    </fx:define>
+    <Label styleClass="titleHeader" text="%Entry table"/>
+
+    <Label styleClass="sectionHeader" text="%General"/>
+    <CheckBox fx:id="autoResizeName" text="%Fit table horizontally on screen"/>
+
+    <Label styleClass="sectionHeader" text="%Format of author and editor names"/>
+    <RadioButton fx:id="namesNatbib" mnemonicParsing="false" text="%Natbib style" toggleGroup="$namesFormat"/>
+    <RadioButton fx:id="nameAsIs" mnemonicParsing="false" text="%Show names unchanged" toggleGroup="$namesFormat"/>
+    <RadioButton fx:id="nameFirstLast" mnemonicParsing="false" text="%Show 'Firstname Lastname'" toggleGroup="$namesFormat"/>
+    <RadioButton fx:id="nameLastFirst" mnemonicParsing="false" text="%Show 'Lastname, Firstname'" toggleGroup="$namesFormat"/>
+    <Label styleClass="sectionHeader" text="%Abbreviations"/>
+    <RadioButton fx:id="abbreviationDisabled" disable="${namesNatbib.selected}" text="%Do not abbreviate names" toggleGroup="$abbreviationMode"/>
+    <RadioButton fx:id="abbreviationEnabled" disable="${namesNatbib.selected}" text="%Abbreviate names" toggleGroup="$abbreviationMode"/>
+    <RadioButton fx:id="abbreviationLastNameOnly" disable="${namesNatbib.selected}" text="%Show last names only" toggleGroup="$abbreviationMode"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/TableTabView.java b/src/main/java/org/jabref/gui/preferences/TableTabView.java
new file mode 100644
index 00000000000..1a799af40a8
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableTabView.java
@@ -0,0 +1,46 @@
+package org.jabref.gui.preferences;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.RadioButton;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class TableTabView extends AbstractPreferenceTabView<TableTabViewModel> implements PreferencesTab {
+
+    @FXML private CheckBox autoResizeName;
+    @FXML private RadioButton namesNatbib;
+    @FXML private RadioButton nameAsIs;
+    @FXML private RadioButton nameFirstLast;
+    @FXML private RadioButton nameLastFirst;
+    @FXML private RadioButton abbreviationDisabled;
+    @FXML private RadioButton abbreviationEnabled;
+    @FXML private RadioButton abbreviationLastNameOnly;
+
+    public TableTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    @Override
+    public String getTabName() { return Localization.lang("Entry table"); }
+
+    public void initialize () {
+        this.viewModel = new TableTabViewModel(dialogService, preferences);
+
+        autoResizeName.selectedProperty().bindBidirectional(viewModel.autoResizeNameProperty());
+        namesNatbib.selectedProperty().bindBidirectional(viewModel.namesNatbibProperty());
+        nameAsIs.selectedProperty().bindBidirectional(viewModel.nameAsIsProperty());
+        nameFirstLast.selectedProperty().bindBidirectional(viewModel.nameFirstLastProperty());
+        nameLastFirst.selectedProperty().bindBidirectional(viewModel.nameLastFirstProperty());
+        abbreviationDisabled.selectedProperty().bindBidirectional(viewModel.abbreviationDisabledProperty());
+        abbreviationEnabled.selectedProperty().bindBidirectional(viewModel.abbreviationEnabledProperty());
+        abbreviationLastNameOnly.selectedProperty().bindBidirectional(viewModel.abbreviationLastNameOnlyProperty());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/TableTabViewModel.java b/src/main/java/org/jabref/gui/preferences/TableTabViewModel.java
new file mode 100644
index 00000000000..b1c52ceced2
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/TableTabViewModel.java
@@ -0,0 +1,102 @@
+package org.jabref.gui.preferences;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+import org.jabref.gui.DialogService;
+import org.jabref.preferences.JabRefPreferences;
+
+public class TableTabViewModel implements PreferenceTabViewModel {
+
+    private BooleanProperty autoResizeNameProperty = new SimpleBooleanProperty();
+    private BooleanProperty namesNatbibProperty = new SimpleBooleanProperty();
+    private BooleanProperty nameAsIsProperty = new SimpleBooleanProperty();
+    private BooleanProperty nameFirstLastProperty = new SimpleBooleanProperty();
+    private BooleanProperty nameLastFirstProperty = new SimpleBooleanProperty();
+    private BooleanProperty abbreviationDisabledProperty = new SimpleBooleanProperty();
+    private BooleanProperty abbreviationEnabledProperty = new SimpleBooleanProperty();
+    private BooleanProperty abbreviationLastNameOnlyProperty = new SimpleBooleanProperty();
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public TableTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+    }
+
+    @Override
+    public void setValues() {
+        autoResizeNameProperty.setValue(preferences.getBoolean(JabRefPreferences.AUTO_RESIZE_MODE));
+
+        if (preferences.getBoolean(JabRefPreferences.NAMES_NATBIB)) {
+            namesNatbibProperty.setValue(true);
+            nameAsIsProperty.setValue(false);
+            nameFirstLastProperty.setValue(false);
+            nameLastFirstProperty.setValue(false);
+        } else if (preferences.getBoolean(JabRefPreferences.NAMES_AS_IS)) {
+            namesNatbibProperty.setValue(false);
+            nameAsIsProperty.setValue(true);
+            nameFirstLastProperty.setValue(false);
+            nameLastFirstProperty.setValue(false);
+        } else if (preferences.getBoolean(JabRefPreferences.NAMES_FIRST_LAST)) {
+            namesNatbibProperty.setValue(false);
+            nameAsIsProperty.setValue(false);
+            nameFirstLastProperty.setValue(true);
+            nameLastFirstProperty.setValue(false);
+        } else {
+            namesNatbibProperty.setValue(false);
+            nameAsIsProperty.setValue(false);
+            nameFirstLastProperty.setValue(false);
+            nameLastFirstProperty.setValue(true);
+        }
+
+        if (preferences.getBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES)) {
+            abbreviationEnabledProperty.setValue(true);
+        } else if (preferences.getBoolean(JabRefPreferences.NAMES_LAST_ONLY)) {
+            abbreviationLastNameOnlyProperty.setValue(true);
+        } else {
+            abbreviationDisabledProperty.setValue(true);
+        }
+    }
+
+    @Override
+    public void storeSettings() {
+        preferences.putBoolean(JabRefPreferences.AUTO_RESIZE_MODE, autoResizeNameProperty.getValue());
+
+        preferences.putBoolean(JabRefPreferences.NAMES_NATBIB, namesNatbibProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.NAMES_AS_IS, nameAsIsProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.NAMES_FIRST_LAST, nameFirstLastProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES, abbreviationEnabledProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.NAMES_LAST_ONLY, abbreviationLastNameOnlyProperty.getValue());
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return new ArrayList<>();
+    }
+
+    public BooleanProperty autoResizeNameProperty() { return autoResizeNameProperty; }
+
+    public BooleanProperty namesNatbibProperty() { return namesNatbibProperty; }
+
+    public BooleanProperty nameAsIsProperty() { return nameAsIsProperty; }
+
+    public BooleanProperty nameFirstLastProperty() { return nameFirstLastProperty; }
+
+    public BooleanProperty nameLastFirstProperty() { return nameLastFirstProperty; }
+
+    public BooleanProperty abbreviationDisabledProperty() { return abbreviationDisabledProperty; }
+
+    public BooleanProperty abbreviationEnabledProperty() { return abbreviationEnabledProperty; }
+
+    public BooleanProperty abbreviationLastNameOnlyProperty() { return abbreviationLastNameOnlyProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
index a977be8ccf3..452c0993497 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
@@ -8,7 +8,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
-import javafx.util.StringConverter;
 
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BindingsHelper;
@@ -18,13 +17,12 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
-public class XmpPrivacyTabView extends AbstractPreferenceTabView implements PreferencesTab {
+public class XmpPrivacyTabView extends AbstractPreferenceTabView<XmpPrivacyTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox enableXmpFilter;
     @FXML private TableView<Field> filterList;
@@ -47,13 +45,12 @@ public XmpPrivacyTabView(JabRefPreferences preferences) {
     public String getTabName() { return Localization.lang("XMP-metadata"); }
 
     public void initialize () {
-        XmpPrivacyTabViewModel xmpPrivacyTabViewModel = new XmpPrivacyTabViewModel(dialogService, preferences);
-        this.viewModel = xmpPrivacyTabViewModel;
+        this.viewModel = new XmpPrivacyTabViewModel(dialogService, preferences);
 
-        enableXmpFilter.selectedProperty().bindBidirectional(xmpPrivacyTabViewModel.xmpFilterEnabledProperty());
-        filterList.disableProperty().bind(xmpPrivacyTabViewModel.xmpFilterEnabledProperty().not());
-        addFieldName.disableProperty().bind(xmpPrivacyTabViewModel.xmpFilterEnabledProperty().not());
-        addField.disableProperty().bind(xmpPrivacyTabViewModel.xmpFilterEnabledProperty().not());
+        enableXmpFilter.selectedProperty().bindBidirectional(viewModel.xmpFilterEnabledProperty());
+        filterList.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
+        addFieldName.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
+        addField.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
 
         fieldColumn.setSortable(true);
         fieldColumn.setReorderable(false);
@@ -68,44 +65,29 @@ public void initialize () {
         new ValueTableCellFactory<Field, Field>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withTooltip(item -> Localization.lang("Remove") + " " + item.getName())
-                .withOnMouseClickedEvent(item -> evt -> {
-                    xmpPrivacyTabViewModel.removeFilter(filterList.getFocusModel().getFocusedItem());
-                })
+                .withOnMouseClickedEvent(
+                        item -> evt -> viewModel.removeFilter(filterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
         filterList.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.DELETE) {
-                xmpPrivacyTabViewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
+                viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
             }
         });
 
-        filterList.itemsProperty().bind(xmpPrivacyTabViewModel.filterListProperty());
+        filterList.itemsProperty().bind(viewModel.filterListProperty());
 
         addFieldName.setEditable(true);
         new ViewModelListCellFactory<Field>()
                 .withText(FieldsUtil::getNameWithType)
                 .install(addFieldName);
-        addFieldName.itemsProperty().bind(xmpPrivacyTabViewModel.availableFieldsProperty());
-        addFieldName.valueProperty().bindBidirectional(xmpPrivacyTabViewModel.addFieldNameProperty());
-        addFieldName.setConverter(new StringConverter<>() {
-            @Override
-            public String toString(Field object) {
-                if (object != null) {
-                    return object.getDisplayName();
-                } else {
-                    return "";
-                }
-            }
-
-            @Override
-            public Field fromString(String string) {
-                return FieldFactory.parseField(string);
-            }
-        });
+        addFieldName.itemsProperty().bind(viewModel.availableFieldsProperty());
+        addFieldName.valueProperty().bindBidirectional(viewModel.addFieldNameProperty());
+        addFieldName.setConverter(FieldsUtil.fieldStringConverter);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(xmpPrivacyTabViewModel.xmpFilterListValidationStatus(), filterList));
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.xmpFilterListValidationStatus(), filterList));
     }
 
-    public void addField() { ((XmpPrivacyTabViewModel) viewModel).addField(); }
+    public void addField() { viewModel.addField(); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
index 4730f86e715..8627d81460c 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabViewModel.java
@@ -45,8 +45,6 @@ public class XmpPrivacyTabViewModel implements PreferenceTabViewModel {
                         Localization.lang("XMP-metadata"),
                         Localization.lang("Filter List"),
                         Localization.lang("List must not be empty."))));
-
-        setValues();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/FieldsUtil.java b/src/main/java/org/jabref/gui/util/FieldsUtil.java
index e313a064481..69c2158c156 100644
--- a/src/main/java/org/jabref/gui/util/FieldsUtil.java
+++ b/src/main/java/org/jabref/gui/util/FieldsUtil.java
@@ -3,8 +3,11 @@
 import java.util.Collections;
 import java.util.Set;
 
+import javafx.util.StringConverter;
+
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.IEEEField;
 import org.jabref.model.entry.field.InternalField;
@@ -13,6 +16,22 @@
 
 public class FieldsUtil {
 
+    public static StringConverter<Field> fieldStringConverter = new StringConverter<>() {
+        @Override
+        public String toString(Field object) {
+            if (object != null) {
+                return object.getDisplayName();
+            } else {
+                return "";
+            }
+        }
+
+        @Override
+        public Field fromString(String string) {
+            return FieldFactory.parseField(string);
+        }
+    };
+
     public static String getNameWithType(Field field) {
         if (field instanceof SpecialField) {
             return field.getDisplayName() + " (" + Localization.lang("Special") + ")";
@@ -51,5 +70,6 @@ public String getName() {
         public boolean isStandardField() {
             return false;
         }
+
     }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index ff513a46f3a..e35ca7a1e61 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -51,7 +51,7 @@
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTablePreferences;
 import org.jabref.gui.mergeentries.MergeEntries;
-import org.jabref.gui.preferences.ImportSettingsTab;
+import org.jabref.gui.preferences.ImportTabViewModel;
 import org.jabref.gui.push.PushToApplication;
 import org.jabref.gui.push.PushToApplicationsManager;
 import org.jabref.gui.util.ThemeLoader;
@@ -713,7 +713,7 @@ private JabRefPreferences() {
         defaults.put(DROPPEDFILEHANDLER_RENAME, Boolean.FALSE);
 
         // use BibTeX key appended with filename as default pattern
-        defaults.put(IMPORT_FILENAMEPATTERN, ImportSettingsTab.DEFAULT_FILENAMEPATTERNS[1]);
+        defaults.put(IMPORT_FILENAMEPATTERN, ImportTabViewModel.DEFAULT_FILENAME_PATTERNS[1]);
         //Default empty String to be backwards compatible
         defaults.put(IMPORT_FILEDIRPATTERN, "");
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5cd75f25956..283a0fd5ddc 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -20,6 +20,8 @@ Abbreviated\ %0\ journal\ names.=Abbreviated %0 journal names.
 
 Abbreviation=Abbreviation
 
+Abbreviations=Abbreviations
+
 About\ JabRef=About JabRef
 
 Abstract=Abstract
@@ -266,8 +268,6 @@ Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Do not write the follo
 
 Donate\ to\ JabRef=Donate to JabRef
 
-Down=Down
-
 Download\ file=Download file
 duplicate\ removal=duplicate removal
 
@@ -293,10 +293,9 @@ Edit\ group=Edit group
 
 Edit\ preamble=Edit preamble
 Edit\ strings=Edit strings
-Editor\ options=Editor options
 
 empty\ library=empty library
-Enable\ word/name\ autocompletion=Enable word/name autocompletion
+Autocompletion=Autocompletion
 
 Enter\ URL\ to\ download=Enter URL to download
 
@@ -950,12 +949,10 @@ Unknown\ export\ format=Unknown export format
 
 untitled=untitled
 
-Up=Up
-
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PDF/PS links to use the '%0' field.
 
 usage=usage
-Use\ autocompletion\ for\ the\ following\ fields=Use autocompletion for the following fields
+Use\ autocompletion=Use autocompletion
 
 Tweak\ font\ rendering\ for\ entry\ editor\ on\ Linux=Tweak font rendering for entry editor on Linux
 Use\ regular\ expression\ search=Use regular expression search
@@ -1114,8 +1111,7 @@ exportFormat=exportFormat
 Output\ file\ missing=Output file missing
 No\ search\ matches.=No search matches.
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=The output option depends on a valid input option.
-Default\ import\ style\ for\ drag\ and\ drop\ of\ PDFs=Default import style for drag and drop of PDFs
-Default\ PDF\ file\ link\ action=Default PDF file link action
+Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
 Additional\ parameters=Additional parameters
 Cite\ selected\ entries\ between\ parenthesis=Cite selected entries between parenthesis
@@ -1184,9 +1180,8 @@ Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Auto-generating
 Use\ full\ firstname\ whenever\ possible=Use full firstname whenever possible
 Use\ abbreviated\ firstname\ whenever\ possible=Use abbreviated firstname whenever possible
 Use\ abbreviated\ and\ full\ firstname=Use abbreviated and full firstname
-Autocompletion\ options=Autocompletion options
-Name\ format\ used\ for\ autocompletion=Name format used for autocompletion
-Treatment\ of\ first\ names=Treatment of first names
+Name\ format=Name format
+First\ names=First names
 Cleanup\ entries=Cleanup entries
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Automatically assign new entry to selected groups
 %0\ mode=%0 mode
@@ -1289,7 +1284,6 @@ Parse=Parse
 Result=Result
 Show\ DOI\ first=Show DOI first
 Show\ URL\ first=Show URL first
-Use\ Emacs\ key\ bindings=Use Emacs key bindings
 You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=You have to choose exactly two entries to merge.
 
 Update\ timestamp\ on\ modification=Update timestamp on modification
@@ -1311,9 +1305,6 @@ Proxy\ requires\ authentication=Proxy requires authentication
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stored in plain text!
 Clear\ connection\ settings=Clear connection settings
 
-Rebind\ C-a,\ too=Rebind C-a, too
-Rebind\ C-f,\ too=Rebind C-f, too
-
 Open\ folder=Open folder
 Export\ entries\ ordered\ as\ specified=Export entries ordered as specified
 Export\ sort\ order=Export sort order
@@ -2123,3 +2114,5 @@ Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 New\ column=New column
 Open\ files...=Open files...
+
+Affected\ fields\:=Affected fields: