diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26bbe0bd10a..b021da6d6f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We moved the preferences menu command from the options menu to the file menu. [#9768](https://github.com/JabRef/jabref/pull/9768)
 - We changed the handling of an "overflow" of authors at `[authIniN]`: JabRef uses `+` to indicate an overflow. Example: `[authIni2]` produces `A+` (instead of `AB`) for `Aachen and Berlin and Chemnitz`. [#9703](https://github.com/JabRef/jabref/pull/9703)
 - We moved the preferences option to open the last edited files on startup to the 'General' tab. [#9808](https://github.com/JabRef/jabref/pull/9808)
-
+- We split the 'Import and Export' tab into 'Web Search' and 'Export'. [#9839](https://github.com/JabRef/jabref/pull/9839)
 
 ### Fixed
 
@@ -75,7 +75,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We removed the support of BibTeXML. [#9540](https://github.com/JabRef/jabref/issues/9540)
 - We removed support for Markdown syntax for strikethrough and task lists in comment fields. [#9726](https://github.com/JabRef/jabref/pull/9726)
 - We removed the options menu, because the two contents were moved to the File menu or the properties of the library. [#9768](https://github.com/JabRef/jabref/pull/9768)
-
+- We removed the 'File' tab in the preferences and moved its contents to the 'Export' tab. [#9839](https://github.com/JabRef/jabref/pull/9839)
 
 
 
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index b478c4a9a57..45ce8ba77d0 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -533,7 +533,7 @@ private void saveDatabase(BibDatabase newBase, String subName) {
             try (AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
                 BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
                 SaveConfiguration saveConfiguration = new SaveConfiguration()
-                        .withReformatOnSave(preferencesService.getImportExportPreferences().shouldAlwaysReformatOnSave());
+                        .withReformatOnSave(preferencesService.getExportPreferences().shouldAlwaysReformatOnSave());
 
                 BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
                         bibWriter,
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 1ba41fce4d3..bc0ac7fb296 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -297,7 +297,7 @@ public void installAutosaveManagerAndBackupManager() {
     private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED)
                 || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && preferencesService.getImportExportPreferences().shouldAutoSave()))
+                && preferencesService.getExportPreferences().shouldAutoSave()))
                 && context.getDatabasePath().isPresent();
     }
 
@@ -313,7 +313,7 @@ private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
      * Example: *jabref-authors.bib – testbib
      */
     public void updateTabTitle(boolean isChanged) {
-        boolean isAutosaveEnabled = preferencesService.getImportExportPreferences().shouldAutoSave();
+        boolean isAutosaveEnabled = preferencesService.getExportPreferences().shouldAutoSave();
 
         DatabaseLocation databaseLocation = bibDatabaseContext.getLocation();
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
index 4317dbeef8e..77d38da37a9 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -47,7 +47,7 @@ public void execute() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferencesService.getImportExportPreferences().getExportWorkingDirectory())
+                .withInitialDirectory(preferencesService.getExportPreferences().getExportWorkingDirectory())
                 .build();
         Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
         exportPath.ifPresent(path -> {
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index cd08d6a56e8..2fae491983f 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -58,7 +58,7 @@ public CreateModifyExporterDialogViewModel(ExporterViewModel exporter,
     public ExporterViewModel saveExporter() {
         Path layoutFileDir = Path.of(layoutFile.get()).getParent();
         if (layoutFileDir != null) {
-            preferences.getImportExportPreferences().setExportWorkingDirectory(layoutFileDir);
+            preferences.getExportPreferences().setExportWorkingDirectory(layoutFileDir);
         }
 
         // Check that there are no empty strings.
@@ -85,7 +85,7 @@ public void browse() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
                 .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(preferences.getImportExportPreferences().getExportWorkingDirectory()).build();
+                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory()).build();
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index c5479d8c2cd..672615b6c2a 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -78,8 +78,8 @@ public void execute() {
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(FileFilterConverter.exporterToExtensionFilter(exporters))
-                .withDefaultExtension(preferences.getImportExportPreferences().getLastExportExtension())
-                .withInitialDirectory(preferences.getImportExportPreferences().getExportWorkingDirectory())
+                .withDefaultExtension(preferences.getExportPreferences().getLastExportExtension())
+                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory())
                 .build();
         dialogService.showFileSaveDialog(fileDialogConfiguration)
                      .ifPresent(path -> export(path, fileDialogConfiguration.getSelectedExtensionFilter(), exporters));
@@ -110,8 +110,8 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
 
         // Make sure we remember which filter was used, to set
         // the default for next time:
-        preferences.getImportExportPreferences().setLastExportExtension(format.getName());
-        preferences.getImportExportPreferences().setExportWorkingDirectory(file.getParent());
+        preferences.getExportPreferences().setLastExportExtension(format.getName());
+        preferences.getExportPreferences().setExportWorkingDirectory(file.getParent());
 
         final List<BibEntry> finEntries = entries;
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 79a044aef28..9ef046d4207 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -84,7 +84,7 @@ public void execute() {
 
         // Find default choice, if any
         Exporter defaultChoice = exporters.stream()
-                                          .filter(exporter -> exporter.getName().equals(preferences.getImportExportPreferences().getLastExportExtension()))
+                                          .filter(exporter -> exporter.getName().equals(preferences.getExportPreferences().getLastExportExtension()))
                                           .findAny()
                                           .orElse(null);
 
@@ -107,7 +107,7 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
                                                     .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Add chosen export type to last used preference, to become default
-        preferences.getImportExportPreferences().setLastExportExtension(exporter.getName());
+        preferences.getExportPreferences().setLastExportExtension(exporter.getName());
 
         Path tmp = null;
         try {
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 78d79b3ff3e..95fa69f1777 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -233,7 +233,7 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
 
         SaveConfiguration saveConfiguration = new SaveConfiguration()
                 .withSaveType(saveType)
-                .withReformatOnSave(preferences.getImportExportPreferences().shouldAlwaysReformatOnSave());
+                .withReformatOnSave(preferences.getExportPreferences().shouldAlwaysReformatOnSave());
         BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
         synchronized (bibDatabaseContext) {
             try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, saveConfiguration.shouldMakeBackup())) {
diff --git a/src/main/java/org/jabref/gui/importer/ImportCommand.java b/src/main/java/org/jabref/gui/importer/ImportCommand.java
index 8e40e6c0c49..ab0188c6f00 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -54,7 +54,7 @@ public void execute() {
                 .addExtensionFilter(FileFilterConverter.ANY_FILE)
                 .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
                 .addExtensionFilter(FileFilterConverter.importerToExtensionFilter(importers))
-                .withInitialDirectory(preferences.getImportExportPreferences().getImportWorkingDirectory())
+                .withInitialDirectory(preferences.getImporterPreferences().getImportWorkingDirectory())
                 .build();
         dialogService.showFileOpenDialog(fileDialogConfiguration)
                      .ifPresent(path -> doImport(path, importers, fileDialogConfiguration.getSelectedExtensionFilter()));
@@ -71,6 +71,6 @@ private void doImport(Path file, SortedSet<Importer> importers, FileChooser.Exte
         ImportAction importMenu = new ImportAction(frame, openInNew, format.orElse(null), preferences);
         importMenu.automatedImport(Collections.singletonList(file.toString()));
         // Set last working dir for import
-        preferences.getImportExportPreferences().setImportWorkingDirectory(file.getParent());
+        preferences.getImporterPreferences().setImportWorkingDirectory(file.getParent());
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index dfd27079cff..dd2277b4e98 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -126,7 +126,7 @@ public boolean hasDuplicate(BibEntry entry) {
     public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
         // Check if we are supposed to warn about duplicates.
         // If so, then see if there are duplicates, and warn if yes.
-        if (preferences.getImportExportPreferences().shouldWarnAboutDuplicatesOnImport()) {
+        if (preferences.getImporterPreferences().shouldWarnAboutDuplicatesOnImport()) {
             BackgroundTask.wrap(() -> entriesToImport.stream()
                                                      .anyMatch(this::hasDuplicate)).onSuccess(duplicateFound -> {
                 if (duplicateFound) {
@@ -135,7 +135,7 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
                             Localization.lang("Continue with import"),
                             Localization.lang("Cancel import"),
                             Localization.lang("Do not ask again"),
-                            optOut -> preferences.getImportExportPreferences().setWarnAboutDuplicatesOnImport(!optOut));
+                            optOut -> preferences.getImporterPreferences().setWarnAboutDuplicatesOnImport(!optOut));
 
                     if (!continueImport) {
                         dialogService.notify(Localization.lang("Import canceled"));
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
index 848645ae318..3216e60e2ed 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -50,7 +50,7 @@ public SavingPropertiesViewModel(BibDatabaseContext databaseContext, Preferences
         this.preferencesService = preferencesService;
         this.initialMetaData = databaseContext.getMetaData();
         this.exportSaveOrder = initialMetaData.getSaveOrderConfig()
-                                              .orElseGet(() -> preferencesService.getImportExportPreferences().getExportSaveOrder());
+                                              .orElseGet(() -> preferencesService.getExportPreferences().getExportSaveOrder());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 5b713d53172..0515e37561e 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -19,13 +19,12 @@
 import org.jabref.gui.preferences.customimporter.CustomImporterTab;
 import org.jabref.gui.preferences.entry.EntryTab;
 import org.jabref.gui.preferences.entryeditor.EntryEditorTab;
-import org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab;
+import org.jabref.gui.preferences.entryeditortabs.EntryEditorTabsTab;
+import org.jabref.gui.preferences.export.ExportTab;
 import org.jabref.gui.preferences.external.ExternalTab;
 import org.jabref.gui.preferences.externalfiletypes.ExternalFileTypesTab;
-import org.jabref.gui.preferences.file.FileTab;
 import org.jabref.gui.preferences.general.GeneralTab;
 import org.jabref.gui.preferences.groups.GroupsTab;
-import org.jabref.gui.preferences.importexport.ImportExportTab;
 import org.jabref.gui.preferences.journals.JournalAbbreviationsTab;
 import org.jabref.gui.preferences.keybindings.KeyBindingsTab;
 import org.jabref.gui.preferences.linkedfiles.LinkedFilesTab;
@@ -34,6 +33,7 @@
 import org.jabref.gui.preferences.preview.PreviewTab;
 import org.jabref.gui.preferences.protectedterms.ProtectedTermsTab;
 import org.jabref.gui.preferences.table.TableTab;
+import org.jabref.gui.preferences.websearch.WebSearchTab;
 import org.jabref.gui.preferences.xmp.XmpPrivacyTab;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.JabRefException;
@@ -62,7 +62,6 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
         preferenceTabs = FXCollections.observableArrayList(
                 new GeneralTab(),
                 new KeyBindingsTab(),
-                new FileTab(),
                 new EntryTab(),
                 new TableTab(),
                 new PreviewTab(),
@@ -72,8 +71,9 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
                 new JournalAbbreviationsTab(),
                 new GroupsTab(),
                 new EntryEditorTab(),
-                new ImportExportTab(),
-                new CustomEditorFieldsTab(),
+                new WebSearchTab(),
+                new ExportTab(),
+                new EntryEditorTabsTab(),
                 new CitationKeyPatternTab(),
                 new LinkedFilesTab(),
                 new NameFormatterTab(),
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
index 81028a987d1..2bece2af293 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
@@ -12,9 +13,29 @@
          fx:controller="org.jabref.gui.preferences.entry.EntryTab">
     <Label styleClass="titleHeader" text="%Entry"/>
 
+    <Label styleClass="sectionHeader" text="%Field"/>
     <HBox spacing="4" alignment="CENTER_LEFT">
         <Label text="%Keyword separator"/>
-        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0"/>
+        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0" alignment="CENTER"/>
+    </HBox>
+
+    <CheckBox fx:id="resolveStrings" text="%Resolve BibTeX strings"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Affected fields"/>
+        <TextField fx:id="resolveStringsForFields" HBox.hgrow="ALWAYS"
+                   disable="${!resolveStrings.selected}">
+            <HBox.margin>
+                <Insets top="-4.0"/>
+            </HBox.margin>
+        </TextField>
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </HBox>
+
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Do not wrap when saving"/>
+        <TextField fx:id="nonWrappableFields" HBox.hgrow="ALWAYS"/>
     </HBox>
 
     <Label styleClass="sectionHeader" text="%Entry owner"/>
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
index 31fc50f0521..57424ae3e34 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -21,6 +21,10 @@ public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> imple
 
     @FXML private TextField keywordSeparator;
 
+    @FXML private CheckBox resolveStrings;
+    @FXML private TextField resolveStringsForFields;
+    @FXML private TextField nonWrappableFields;
+
     @FXML private CheckBox markOwner;
     @FXML private TextField markOwnerName;
     @FXML private CheckBox markOwnerOverwrite;
@@ -38,13 +42,14 @@ public EntryTab() {
     }
 
     public void initialize() {
-        this.viewModel = new EntryTabViewModel(
-                preferencesService.getBibEntryPreferences(),
-                preferencesService.getOwnerPreferences(),
-                preferencesService.getTimestampPreferences());
+        this.viewModel = new EntryTabViewModel(preferencesService);
 
         keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
 
+        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
+        resolveStringsForFields.textProperty().bindBidirectional(viewModel.resolveStringsForFieldsProperty());
+        nonWrappableFields.textProperty().bindBidirectional(viewModel.nonWrappableFieldsProperty());
+
         markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
         markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
         markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
index 2bf37676ac5..de204b52385 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -6,33 +6,46 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
-
     private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
+    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
+    private final StringProperty nonWrappableFieldsProperty = new SimpleStringProperty("");
+
     private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
     private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
     private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
     private final BooleanProperty addCreationDateProperty = new SimpleBooleanProperty();
     private final BooleanProperty addModificationDateProperty = new SimpleBooleanProperty();
 
+    private final FieldPreferences fieldPreferences;
     private final BibEntryPreferences bibEntryPreferences;
     private final OwnerPreferences ownerPreferences;
     private final TimestampPreferences timestampPreferences;
 
-    public EntryTabViewModel(BibEntryPreferences bibEntryPreferences, OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-        this.bibEntryPreferences = bibEntryPreferences;
-        this.ownerPreferences = ownerPreferences;
-        this.timestampPreferences = timestampPreferences;
+    public EntryTabViewModel(PreferencesService preferencesService) {
+        this.bibEntryPreferences = preferencesService.getBibEntryPreferences();
+        this.fieldPreferences = preferencesService.getFieldPreferences();
+        this.ownerPreferences = preferencesService.getOwnerPreferences();
+        this.timestampPreferences = preferencesService.getTimestampPreferences();
     }
 
     @Override
     public void setValues() {
         keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
 
+        resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
+        resolveStringsForFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
+        nonWrappableFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
+
         markOwnerProperty.setValue(ownerPreferences.isUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
         markOwnerOverwriteProperty.setValue(ownerPreferences.isOverwriteOwner());
@@ -45,6 +58,10 @@ public void setValues() {
     public void storeSettings() {
         bibEntryPreferences.keywordSeparatorProperty().setValue(keywordSeparatorProperty.getValue().charAt(0));
 
+        fieldPreferences.setResolveStrings(resolveStringsProperty.getValue());
+        fieldPreferences.setResolvableFields(FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim()));
+        fieldPreferences.setNonWrappableFields(FieldFactory.parseFieldList(nonWrappableFieldsProperty.getValue().trim()));
+
         ownerPreferences.setUseOwner(markOwnerProperty.getValue());
         ownerPreferences.setDefaultOwner(markOwnerNameProperty.getValue());
         ownerPreferences.setOverwriteOwner(markOwnerOverwriteProperty.getValue());
@@ -57,6 +74,18 @@ public StringProperty keywordSeparatorProperty() {
         return keywordSeparatorProperty;
     }
 
+    public BooleanProperty resolveStringsProperty() {
+        return resolveStringsProperty;
+    }
+
+    public StringProperty resolveStringsForFieldsProperty() {
+        return resolveStringsForFieldsProperty;
+    }
+
+    public StringProperty nonWrappableFieldsProperty() {
+        return nonWrappableFieldsProperty;
+    }
+
     // Entry owner
 
     public BooleanProperty markOwnerProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 8d90f4b8c6d..e734b7cf2e8 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -34,7 +34,7 @@
     <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
     <VBox spacing="10.0">
         <HBox spacing="4.0">
-            <Label text="%Affected fields:" disable="${!enableAutoComplete.selected}"/>
+            <Label text="%Affected fields" disable="${!enableAutoComplete.selected}"/>
             <TextField fx:id="autoCompleteFields" HBox.hgrow="ALWAYS" disable="${!enableAutoComplete.selected}">
                 <HBox.margin>
                     <Insets top="-4.0"/>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.fxml
similarity index 97%
rename from src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
rename to src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.fxml
index ffbec77e841..e8715921876 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.fxml
@@ -9,7 +9,7 @@
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab">
+         fx:controller="org.jabref.gui.preferences.entryeditortabs.EntryEditorTabsTab">
 
     <Label styleClass="titleHeader" text="%Custom editor tabs"/>
 
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.java
similarity index 83%
rename from src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
rename to src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.java
index 319f4e83f02..cb5c90ae880 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTab.java
@@ -15,12 +15,12 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class CustomEditorFieldsTab extends AbstractPreferenceTabView<CustomEditorFieldsTabViewModel> implements PreferencesTab {
+public class EntryEditorTabsTab extends AbstractPreferenceTabView<EntryEditorTabsTabViewModel> implements PreferencesTab {
 
     @FXML private Button generalFieldsHelp;
     @FXML private TextArea fieldsTextArea;
 
-    public CustomEditorFieldsTab() {
+    public EntryEditorTabsTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -32,7 +32,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        viewModel = new CustomEditorFieldsTabViewModel(dialogService, preferencesService);
+        viewModel = new EntryEditorTabsTabViewModel(dialogService, preferencesService);
 
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTabViewModel.java
similarity index 94%
rename from src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTabViewModel.java
index ef51d2486e5..8fc6d90f526 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditortabs/EntryEditorTabsTabViewModel.java
@@ -16,7 +16,7 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.PreferencesService;
 
-public class CustomEditorFieldsTabViewModel implements PreferenceTabViewModel {
+public class EntryEditorTabsTabViewModel implements PreferenceTabViewModel {
 
     private final StringProperty fieldsProperty = new SimpleStringProperty();
 
@@ -24,7 +24,7 @@ public class CustomEditorFieldsTabViewModel implements PreferenceTabViewModel {
     private final PreferencesService preferences;
     private final EntryEditorPreferences entryEditorPreferences;
 
-    public CustomEditorFieldsTabViewModel(DialogService dialogService, PreferencesService preferences) {
+    public EntryEditorTabsTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.entryEditorPreferences = preferences.getEntryEditorPreferences();
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml b/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml
new file mode 100644
index 00000000000..315ffa89114
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.export.ExportTab">
+    <Label styleClass="titleHeader" text="%Export"/>
+
+    <Label styleClass="sectionHeader" text="%Export sort order"/>
+    <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
+
+    <Label styleClass="sectionHeader" text="%Saving"/>
+    <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
+    <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/file/FileTab.java b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
similarity index 53%
rename from src/main/java/org/jabref/gui/preferences/file/FileTab.java
rename to src/main/java/org/jabref/gui/preferences/export/ExportTab.java
index 63778cf91c8..b6fde7f115d 100644
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
@@ -1,14 +1,13 @@
-package org.jabref.gui.preferences.file;
+package org.jabref.gui.preferences.export;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
 
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -17,42 +16,37 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
+public class ExportTab extends AbstractPreferenceTabView<ExportTabViewModel> implements PreferencesTab {
+    @FXML private SaveOrderConfigPanel exportOrderPanel;
 
-    @FXML private TextField noWrapFiles;
-    @FXML private RadioButton doNotResolveStrings;
-    @FXML private RadioButton resolveStrings;
-    @FXML private TextField resolveStringsForFields;
     @FXML private CheckBox alwaysReformatBib;
-
     @FXML private CheckBox autosaveLocalLibraries;
     @FXML private Button autosaveLocalLibrariesHelp;
 
-    public FileTab() {
+    public ExportTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
     }
 
-    public void initialize() {
-        this.viewModel = new FileTabViewModel(preferencesService.getImportExportPreferences(), preferencesService.getFieldPreferences());
+    @Override
+    public String getTabName() {
+        return Localization.lang("Export");
+    }
 
-        noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
+    public void initialize() {
+        this.viewModel = new ExportTabViewModel(preferencesService.getExportPreferences());
 
-        doNotResolveStrings.selectedProperty().bindBidirectional(viewModel.doNotResolveStringsProperty());
-        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
-        resolveStringsForFields.textProperty().bindBidirectional(viewModel.resolveStringsForFieldsProperty());
-        resolveStringsForFields.disableProperty().bind(doNotResolveStrings.selectedProperty());
+        exportOrderPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
+        exportOrderPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportOrderPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        exportOrderPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
+        exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
+        exportOrderPanel.setCriteriaLimit(3);
 
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
         autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
-
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService), autosaveLocalLibrariesHelp);
     }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("File");
-    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
new file mode 100644
index 00000000000..ede1112a65e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -0,0 +1,96 @@
+package org.jabref.gui.preferences.export;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.preferences.ExportPreferences;
+
+public class ExportTabViewModel implements PreferenceTabViewModel {
+
+    // SaveOrderConfigPanel
+    private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
+    private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
+    private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
+    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
+
+    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
+
+    private final ExportPreferences exportPreferences;
+
+    public ExportTabViewModel(ExportPreferences exportPreferences) {
+        this.exportPreferences = exportPreferences;
+    }
+
+    @Override
+    public void setValues() {
+        SaveOrder exportSaveOrder = exportPreferences.getExportSaveOrder();
+        switch (exportSaveOrder.getOrderType()) {
+            case SPECIFIED -> exportInSpecifiedOrderProperty.setValue(true);
+            case ORIGINAL -> exportInOriginalProperty.setValue(true);
+            case TABLE -> exportInTableOrderProperty.setValue(true);
+        }
+        sortCriteriaProperty.addAll(exportSaveOrder.getSortCriteria().stream()
+                                                   .map(SortCriterionViewModel::new)
+                                                   .toList());
+
+        List<Field> fieldNames = new ArrayList<>(FieldFactory.getCommonFields());
+        fieldNames.sort(Comparator.comparing(Field::getDisplayName));
+        sortableFieldsProperty.addAll(fieldNames);
+
+        alwaysReformatBibProperty.setValue(exportPreferences.shouldAlwaysReformatOnSave());
+        autosaveLocalLibraries.setValue(exportPreferences.shouldAutoSave());
+    }
+
+    @Override
+    public void storeSettings() {
+        SaveOrder newSaveOrder = new SaveOrder(
+                SaveOrder.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
+                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+        exportPreferences.setExportSaveOrder(newSaveOrder);
+
+        exportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
+        exportPreferences.setAutoSave(autosaveLocalLibraries.getValue());
+    }
+
+    public BooleanProperty saveInOriginalProperty() {
+        return exportInOriginalProperty;
+    }
+
+    public BooleanProperty saveInTableOrderProperty() {
+        return exportInTableOrderProperty;
+    }
+
+    public BooleanProperty saveInSpecifiedOrderProperty() {
+        return exportInSpecifiedOrderProperty;
+    }
+
+    public ListProperty<Field> sortableFieldsProperty() {
+        return sortableFieldsProperty;
+    }
+
+    public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
+        return sortCriteriaProperty;
+    }
+
+    public BooleanProperty alwaysReformatBibProperty() {
+        return alwaysReformatBibProperty;
+    }
+
+    public BooleanProperty autosaveLocalLibrariesProperty() {
+        return autosaveLocalLibraries;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
deleted file mode 100644
index 52863e25cab..00000000000
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.file.FileTab">
-    <Label text="%File" styleClass="titleHeader"/>
-
-    <Label styleClass="sectionHeader" text="%String constants"/>
-    <fx:define>
-        <ToggleGroup fx:id="stringsResolveToggleGroup"/>
-    </fx:define>
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <RadioButton fx:id="resolveStrings" text="%Resolve BibTeX strings for the following fields"
-                     toggleGroup="$stringsResolveToggleGroup"/>
-        <TextField fx:id="resolveStringsForFields" HBox.hgrow="ALWAYS"/>
-    </HBox>
-    <RadioButton fx:id="doNotResolveStrings" text="%Do not resolve BibTeX strings"
-                 toggleGroup="$stringsResolveToggleGroup"/>
-
-    <Label styleClass="sectionHeader" text="%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>
-
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
-        <Button fx:id="autosaveLocalLibrariesHelp"/>
-    </HBox>
-
-    <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
deleted file mode 100644
index 2be81ba1a83..00000000000
--- a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.jabref.gui.preferences.file;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.logic.bibtex.FieldPreferences;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.ImportExportPreferences;
-
-public class FileTabViewModel implements PreferenceTabViewModel {
-
-    private final StringProperty noWrapFilesProperty = new SimpleStringProperty("");
-    private final BooleanProperty doNotResolveStringsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
-    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
-    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
-
-    private final ImportExportPreferences importExportPreferences;
-    private final FieldPreferences fieldPreferences;
-
-    FileTabViewModel(ImportExportPreferences importExportPreferences, FieldPreferences fieldPreferences) {
-        this.importExportPreferences = importExportPreferences;
-        this.fieldPreferences = fieldPreferences;
-    }
-
-    @Override
-    public void setValues() {
-        noWrapFilesProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
-
-        doNotResolveStringsProperty.setValue(!fieldPreferences.shouldResolveStrings());
-        resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
-        resolveStringsForFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
-        alwaysReformatBibProperty.setValue(importExportPreferences.shouldAlwaysReformatOnSave());
-        autosaveLocalLibraries.setValue(importExportPreferences.shouldAutoSave());
-    }
-
-    @Override
-    public void storeSettings() {
-        fieldPreferences.setResolveStrings(!doNotResolveStringsProperty.getValue());
-        fieldPreferences.setNonWrappableFields(FieldFactory.parseFieldList(noWrapFilesProperty.getValue().trim()));
-        fieldPreferences.setResolvableFields(FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim()));
-        importExportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
-        importExportPreferences.setAutoSave(autosaveLocalLibraries.getValue());
-    }
-
-    // ImportExport
-
-    public StringProperty noWrapFilesProperty() {
-        return noWrapFilesProperty;
-    }
-
-    public BooleanProperty doNotResolveStringsProperty() {
-        return doNotResolveStringsProperty;
-    }
-
-    public BooleanProperty resolveStringsProperty() {
-        return resolveStringsProperty;
-    }
-
-    public StringProperty resolveStringsForFieldsProperty() {
-        return resolveStringsForFieldsProperty;
-    }
-
-    public BooleanProperty alwaysReformatBibProperty() {
-        return alwaysReformatBibProperty;
-    }
-
-    // Autosave
-    public BooleanProperty autosaveLocalLibrariesProperty() {
-        return autosaveLocalLibraries;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
similarity index 86%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index c698a797910..53a3d9c31f1 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -8,11 +8,10 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.importexport.ImportExportTab">
-    <Label styleClass="titleHeader" text="%Import and Export"/>
+         fx:controller="org.jabref.gui.preferences.websearch.WebSearchTab">
+    <Label styleClass="titleHeader" text="%Web search"/>
 
     <Label styleClass="sectionHeader" text="%General"/>
     <CheckBox fx:id="generateNewKeyOnImport" text="%Generate a new key for imported entries (overwriting their default)"/>
@@ -25,9 +24,6 @@
         <TextField fx:id="useCustomDOIName" HBox.hgrow="ALWAYS"/>
     </HBox>
 
-    <Label styleClass="sectionHeader" text="%Export sort order"/>
-    <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
-
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
similarity index 77%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index 3018a76daca..d2690a43d56 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences.importexport;
+package org.jabref.gui.preferences.websearch;
 
 import javafx.beans.InvalidationListener;
 import javafx.fxml.FXML;
@@ -7,7 +7,6 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
-import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -16,26 +15,24 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 
-public class ImportExportTab extends AbstractPreferenceTabView<ImportExportTabViewModel> implements PreferencesTab {
+public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
 
     @FXML private CheckBox generateNewKeyOnImport;
+    @FXML private CheckBox warnAboutDuplicatesOnImport;
+    @FXML private CheckBox downloadLinkedOnlineFiles;
+
     @FXML private CheckBox useCustomDOI;
     @FXML private TextField useCustomDOIName;
 
-    @FXML private SaveOrderConfigPanel exportOrderPanel;
+    @FXML private CheckBox grobidEnabled;
+    @FXML private TextField grobidURL;
 
     @FXML private ComboBox<FetcherApiKey> apiKeySelector;
     @FXML private TextField customApiKey;
     @FXML private CheckBox useCustomApiKey;
     @FXML private Button testCustomApiKey;
 
-    @FXML private CheckBox grobidEnabled;
-    @FXML private TextField grobidURL;
-
-    @FXML private CheckBox warnAboutDuplicatesOnImport;
-    @FXML private CheckBox downloadLinkedOnlineFiles;
-
-    public ImportExportTab() {
+    public WebSearchTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -43,30 +40,23 @@ public ImportExportTab() {
 
     @Override
     public String getTabName() {
-        return Localization.lang("Import and Export");
+        return Localization.lang("Web search");
     }
 
     public void initialize() {
-        this.viewModel = new ImportExportTabViewModel(preferencesService, dialogService);
-
-        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
-        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
-        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
+        this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
 
         generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
-
-        exportOrderPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        exportOrderPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
-        exportOrderPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-        exportOrderPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
-        exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
-        exportOrderPanel.setCriteriaLimit(3);
+        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
+        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
 
         grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
         grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
 
-        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
+        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
+        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
+        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
 
         new ViewModelListCellFactory<FetcherApiKey>()
                 .withText(FetcherApiKey::getName)
@@ -90,8 +80,6 @@ public void initialize() {
 
         // Content is set later
         viewModel.fetcherApiKeys().addListener((InvalidationListener) change -> apiKeySelector.getSelectionModel().selectFirst());
-
-        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
     }
 
     private void updateFetcherApiKey(FetcherApiKey apiKey) {
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
similarity index 70%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 657bb4300e3..b623728413d 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -1,10 +1,7 @@
-package org.jabref.gui.preferences.importexport;
+package org.jabref.gui.preferences.websearch;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
 import java.util.Optional;
 
 import javax.net.ssl.HostnameVerifier;
@@ -22,7 +19,6 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.WebFetchers;
@@ -32,75 +28,47 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.FetcherApiKey;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ImportExportPreferences;
 import org.jabref.preferences.PreferencesService;
 
-public class ImportExportTabViewModel implements PreferenceTabViewModel {
-
-    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
-    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
-
+public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
 
     private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
     private final StringProperty useCustomDOINameProperty = new SimpleStringProperty("");
 
-    // SaveOrderConfigPanel
-    private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
-    private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
-    private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
-
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
-    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
-    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
+
+    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
+    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final DOIPreferences doiPreferences;
     private final GrobidPreferences grobidPreferences;
     private final ImporterPreferences importerPreferences;
-    private final ImportExportPreferences importExportPreferences;
     private final FilePreferences filePreferences;
 
-    public ImportExportTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
+    public WebSearchTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.importerPreferences = preferencesService.getImporterPreferences();
         this.grobidPreferences = preferencesService.getGrobidPreferences();
         this.doiPreferences = preferencesService.getDOIPreferences();
-        this.importExportPreferences = preferencesService.getImportExportPreferences();
         this.filePreferences = preferencesService.getFilePreferences();
     }
 
     @Override
     public void setValues() {
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
-        useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
-        useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
-        warnAboutDuplicatesOnImportProperty.setValue(importExportPreferences.shouldWarnAboutDuplicatesOnImport());
-
+        warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
 
-        SaveOrder exportSaveOrder = importExportPreferences.getExportSaveOrder();
-        switch (exportSaveOrder.getOrderType()) {
-            case SPECIFIED -> exportInSpecifiedOrderProperty.setValue(true);
-            case ORIGINAL -> exportInOriginalProperty.setValue(true);
-            case TABLE -> exportInTableOrderProperty.setValue(true);
-        }
-        sortCriteriaProperty.addAll(exportSaveOrder.getSortCriteria().stream()
-                                                   .map(SortCriterionViewModel::new)
-                                                   .toList());
-
-        List<Field> fieldNames = new ArrayList<>(FieldFactory.getCommonFields());
-        fieldNames.sort(Comparator.comparing(Field::getDisplayName));
-        sortableFieldsProperty.addAll(fieldNames);
+        useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
+        useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
 
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
@@ -111,23 +79,16 @@ public void setValues() {
     @Override
     public void storeSettings() {
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
+        importerPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
+        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
+
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
-        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
-
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
 
-        SaveOrder newSaveOrder = new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
-        preferencesService.getImportExportPreferences().setExportSaveOrder(newSaveOrder);
-
-        importExportPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
-
-        // API keys
         preferencesService.getImporterPreferences().getApiKeys().clear();
         preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
     }
@@ -144,28 +105,6 @@ public StringProperty useCustomDOINameProperty() {
         return this.useCustomDOINameProperty;
     }
 
-    // SaveOrderConfigPanel
-
-    public BooleanProperty saveInOriginalProperty() {
-        return exportInOriginalProperty;
-    }
-
-    public BooleanProperty saveInTableOrderProperty() {
-        return exportInTableOrderProperty;
-    }
-
-    public BooleanProperty saveInSpecifiedOrderProperty() {
-        return exportInSpecifiedOrderProperty;
-    }
-
-    public ListProperty<Field> sortableFieldsProperty() {
-        return sortableFieldsProperty;
-    }
-
-    public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
-        return sortCriteriaProperty;
-    }
-
     public BooleanProperty grobidEnabledProperty() {
         return grobidEnabledProperty;
     }
diff --git a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java b/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
deleted file mode 100644
index f055d0eff75..00000000000
--- a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jabref.gui.util.component;
-
-import javafx.scene.text.TextFlow;
-
-public class DiffHighlightingTextPane extends TextFlow {
-
-    private static final String BODY_STYLE = "body{font:sans-serif}";
-    private static final String ADDITION_STYLE = ".add{color:blue;text-decoration:underline}";
-    private static final String REMOVAL_STYLE = ".del{color:red;text-decoration:line-through;}";
-    private static final String CHANGE_STYLE = ".change{color:#006400;text-decoration:underline}";
-
-    private static final String CONTENT_TYPE = "text/html";
-
-    public DiffHighlightingTextPane() {
-        super();
-//        setContentType(CONTENT_TYPE);
-//        StyleSheet sheet = ((HTMLEditorKit) getEditorKit()).getStyleSheet();
-//        sheet.addRule(BODY_STYLE);
-//        sheet.addRule(ADDITION_STYLE);
-//        sheet.addRule(REMOVAL_STYLE);
-//        sheet.addRule(CHANGE_STYLE);
-//        setEditable(false);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/component/Tag.fxml b/src/main/java/org/jabref/gui/util/component/Tag.fxml
deleted file mode 100644
index 847c44e4060..00000000000
--- a/src/main/java/org/jabref/gui/util/component/Tag.fxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112" styleClass="tag"
-         fx:controller="org.jabref.gui.util.component.Tag">
-    <Label fx:id="text">
-        <HBox.margin>
-            <Insets right="5" left="3"/>
-        </HBox.margin>
-    </Label>
-    <Button
-            styleClass="icon-button"
-            onAction="#removeButtonClicked">
-        <graphic>
-            <JabRefIconView glyph="CLOSE"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Remove"/>
-        </tooltip>
-    </Button>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/util/component/Tag.java b/src/main/java/org/jabref/gui/util/component/Tag.java
deleted file mode 100644
index 998f044eac5..00000000000
--- a/src/main/java/org/jabref/gui/util/component/Tag.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.gui.util.component;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-/**
- * A tag item in a {@link TagBar}.
- */
-public class Tag<T> extends HBox {
-
-    private final ObjectProperty<T> value;
-    private Consumer<T> tagRemovedConsumer;
-    @FXML private Label text;
-
-    public Tag(Function<T, String> toString) {
-        Objects.requireNonNull(toString);
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        value = new SimpleObjectProperty<>();
-        text.textProperty().bind(EasyBind.map(value, toString));
-    }
-
-    public Tag(Function<T, String> toString, T value) {
-        this(toString);
-        setValue(value);
-    }
-
-    public T getValue() {
-        return value.get();
-    }
-
-    public void setValue(T value) {
-        this.value.set(value);
-    }
-
-    public ObjectProperty<T> valueProperty() {
-        return value;
-    }
-
-    @FXML
-    private void removeButtonClicked(ActionEvent event) {
-        if (tagRemovedConsumer != null) {
-            tagRemovedConsumer.accept(value.get());
-        }
-    }
-
-    public final void setOnTagRemoved(Consumer<T> tagRemovedConsumer) {
-        this.tagRemovedConsumer = tagRemovedConsumer;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.css b/src/main/java/org/jabref/gui/util/component/TagBar.css
deleted file mode 100644
index d940858d283..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.tagBar > HBox {
-    -fx-spacing: 3;
-}
-
-.tagBar .tag {
-    -fx-background-color: transparent;
-    -fx-alignment: center;
-    -fx-border-width: 1;
-    -fx-border-color: darkgrey;
-}
-
-.tagBar .tag .button {
-    -fx-background-color: transparent;
-}
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.fxml b/src/main/java/org/jabref/gui/util/component/TagBar.fxml
deleted file mode 100644
index 12af8b3b8d9..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.fxml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112" styleClass="tagBar"
-         fx:controller="org.jabref.gui.util.component.TagBar">
-    <HBox fx:id="tagList"/>
-    <TextField fx:id="inputTextField" onAction="#addTextAsNewTag" HBox.hgrow="ALWAYS" prefHeight="Infinity"/>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.java b/src/main/java/org/jabref/gui/util/component/TagBar.java
deleted file mode 100644
index da63e602893..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.jabref.gui.util.component;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextField;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.util.StringConverter;
-
-import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.strings.StringUtil;
-
-import com.airhacks.afterburner.views.ViewLoader;
-
-/**
- * Field editor that provides various pre-defined options as a drop-down combobox.
- */
-public class TagBar<T> extends HBox {
-
-    private final ListProperty<T> tags;
-    private StringConverter<T> stringConverter;
-    @FXML
-    private TextField inputTextField;
-    @FXML
-    private HBox tagList;
-    private BiConsumer<T, MouseEvent> onTagClicked;
-    private java.util.Set<FieldProperty> properties;
-
-    public TagBar() {
-        tags = new SimpleListProperty<>(FXCollections.observableArrayList());
-        tags.addListener(this::onTagsChanged);
-
-        // Load FXML
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-        getStylesheets().add(0, TagBar.class.getResource("TagBar.css").toExternalForm());
-    }
-
-    public TextField getInputTextField() {
-        return inputTextField;
-    }
-
-    public ObservableList<T> getTags() {
-        return tags.get();
-    }
-
-    public void setTags(Collection<T> newTags) {
-        this.tags.setAll(newTags);
-    }
-
-    public ListProperty<T> tagsProperty() {
-        return tags;
-    }
-
-    private void onTagsChanged(ListChangeListener.Change<? extends T> change) {
-        while (change.next()) {
-            if (change.wasRemoved()) {
-                tagList.getChildren().subList(change.getFrom(), change.getFrom() + change.getRemovedSize()).clear();
-            } else if (change.wasAdded()) {
-                tagList.getChildren().addAll(change.getFrom(), change.getAddedSubList().stream().map(this::createTag).collect(Collectors.toList()));
-            }
-        }
-        if (this.properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-            inputTextField.setDisable(!tags.isEmpty());
-        }
-    }
-
-    private Tag<T> createTag(T item) {
-        Tag<T> tag = new Tag<>(stringConverter::toString);
-        tag.setOnTagRemoved(tags::remove);
-        tag.setValue(item);
-        if (onTagClicked != null) {
-            tag.setOnMouseClicked(event -> onTagClicked.accept(item, event));
-        }
-        return tag;
-    }
-
-    @FXML
-    private void addTextAsNewTag(ActionEvent event) {
-        String inputText = inputTextField.getText();
-        if (StringUtil.isNotBlank(inputText)) {
-            T newTag = stringConverter.fromString(inputText);
-            if ((newTag != null) && !tags.contains(newTag) && (tags.isEmpty() || this.properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK))) {
-                tags.add(newTag);
-                inputTextField.clear();
-            }
-        }
-    }
-
-    public void setStringConverter(StringConverter<T> stringConverter) {
-        this.stringConverter = stringConverter;
-    }
-
-    public void setOnTagClicked(BiConsumer<T, MouseEvent> onTagClicked) {
-        this.onTagClicked = onTagClicked;
-    }
-
-    public void setFieldProperties(Set<FieldProperty> properties) {
-        this.properties = properties;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
index f44cbd66f84..9a8aafacc38 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
@@ -227,7 +227,7 @@ void performBackup(Path backupPath) {
         // code similar to org.jabref.gui.exporter.SaveDatabaseAction.saveDatabase
         SaveConfiguration saveConfiguration = new SaveConfiguration()
                 .withMakeBackup(false)
-                .withReformatOnSave(preferences.getImportExportPreferences().shouldAlwaysReformatOnSave());
+                .withReformatOnSave(preferences.getExportPreferences().shouldAlwaysReformatOnSave());
 
         Charset encoding = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
         // We want to have successful backups only
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index 44d0412c98b..47c0045aec8 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -426,7 +426,7 @@ private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase ta
     private void writeResultToFile(Path pathToFile, BibDatabase entries) throws SaveException {
         try (AtomicFileWriter fileWriter = new AtomicFileWriter(pathToFile, StandardCharsets.UTF_8)) {
             SaveConfiguration saveConfiguration = new SaveConfiguration()
-                    .withReformatOnSave(preferencesService.getImportExportPreferences().shouldAlwaysReformatOnSave());
+                    .withReformatOnSave(preferencesService.getExportPreferences().shouldAlwaysReformatOnSave());
             BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
             BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
                     bibWriter,
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index 198eab8e51e..ce95bfd4354 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -1,9 +1,12 @@
 package org.jabref.logic.importer;
 
+import java.nio.file.Path;
 import java.util.Set;
 
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
@@ -13,13 +16,19 @@
 public class ImporterPreferences {
 
     private final BooleanProperty generateNewKeyOnImport;
+    private final BooleanProperty warnAboutDuplicatesOnImport;
+    private final ObjectProperty<Path> importWorkingDirectory;
     private final ObservableSet<FetcherApiKey> apiKeys;
     private final ObservableSet<CustomImporter> customImportList;
 
     public ImporterPreferences(boolean generateNewKeyOnImport,
+                               Path importWorkingDirectory,
+                               boolean warnAboutDuplicatesOnImport,
                                Set<CustomImporter> customImportList,
                                Set<FetcherApiKey> apiKeys) {
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
+        this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
+        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
         this.customImportList = FXCollections.observableSet(customImportList);
         this.apiKeys = FXCollections.observableSet(apiKeys);
     }
@@ -36,6 +45,30 @@ public void setGenerateNewKeyOnImport(boolean generateNewKeyOnImport) {
         this.generateNewKeyOnImport.set(generateNewKeyOnImport);
     }
 
+    public Path getImportWorkingDirectory() {
+        return importWorkingDirectory.get();
+    }
+
+    public ObjectProperty<Path> importWorkingDirectoryProperty() {
+        return importWorkingDirectory;
+    }
+
+    public void setImportWorkingDirectory(Path importWorkingDirectory) {
+        this.importWorkingDirectory.set(importWorkingDirectory);
+    }
+
+    public boolean shouldWarnAboutDuplicatesOnImport() {
+        return warnAboutDuplicatesOnImport.get();
+    }
+
+    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
+        return warnAboutDuplicatesOnImport;
+    }
+
+    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
+        this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
+    }
+
     public ObservableSet<FetcherApiKey> getApiKeys() {
         return apiKeys;
     }
diff --git a/src/main/java/org/jabref/preferences/ImportExportPreferences.java b/src/main/java/org/jabref/preferences/ExportPreferences.java
similarity index 63%
rename from src/main/java/org/jabref/preferences/ImportExportPreferences.java
rename to src/main/java/org/jabref/preferences/ExportPreferences.java
index 2ee110f4795..71548dbd49e 100644
--- a/src/main/java/org/jabref/preferences/ImportExportPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExportPreferences.java
@@ -11,29 +11,23 @@
 
 import org.jabref.model.metadata.SaveOrder;
 
-public class ImportExportPreferences {
+public class ExportPreferences {
     private final BooleanProperty alwaysReformatOnSave;
-    private final ObjectProperty<Path> importWorkingDirectory;
     private final StringProperty lastExportExtension;
     private final ObjectProperty<Path> exportWorkingDirectory;
     private final ObjectProperty<SaveOrder> exportSaveOrder;
     private final BooleanProperty autoSave;
-    private final BooleanProperty warnAboutDuplicatesOnImport;
-
-    public ImportExportPreferences(boolean alwaysReformatOnSave,
-                                   Path importWorkingDirectory,
-                                   String lastExportExtension,
-                                   Path exportWorkingDirectory,
-                                   SaveOrder exportSaveOrder,
-                                   boolean autoSave,
-                                   boolean warnAboutDuplicatesOnImport) {
+
+    public ExportPreferences(boolean alwaysReformatOnSave,
+                             String lastExportExtension,
+                             Path exportWorkingDirectory,
+                             SaveOrder exportSaveOrder,
+                             boolean autoSave) {
         this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
-        this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
         this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
         this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
         this.exportSaveOrder = new SimpleObjectProperty<>(exportSaveOrder);
         this.autoSave = new SimpleBooleanProperty(autoSave);
-        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
     }
 
     public boolean shouldAlwaysReformatOnSave() {
@@ -48,18 +42,6 @@ public void setAlwaysReformatOnSave(boolean alwaysReformatOnSave) {
         this.alwaysReformatOnSave.set(alwaysReformatOnSave);
     }
 
-    public Path getImportWorkingDirectory() {
-        return importWorkingDirectory.get();
-    }
-
-    public ObjectProperty<Path> importWorkingDirectoryProperty() {
-        return importWorkingDirectory;
-    }
-
-    public void setImportWorkingDirectory(Path importWorkingDirectory) {
-        this.importWorkingDirectory.set(importWorkingDirectory);
-    }
-
     public String getLastExportExtension() {
         return lastExportExtension.get();
     }
@@ -107,16 +89,4 @@ public BooleanProperty autoSaveProperty() {
     public void setAutoSave(boolean shouldAutoSave) {
         this.autoSave.set(shouldAutoSave);
     }
-
-    public boolean shouldWarnAboutDuplicatesOnImport() {
-        return warnAboutDuplicatesOnImport.get();
-    }
-
-    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
-        return warnAboutDuplicatesOnImport;
-    }
-
-    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
-        this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
-    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index dcf13a8cdfb..2ed223792a2 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -444,7 +444,7 @@ public class JabRefPreferences implements PreferencesService {
     private SSLPreferences sslPreferences;
     private SearchPreferences searchPreferences;
     private AutoLinkPreferences autoLinkPreferences;
-    private ImportExportPreferences importExportPreferences;
+    private ExportPreferences exportPreferences;
     private NameFormatterPreferences nameFormatterPreferences;
     private BibEntryPreferences bibEntryPreferences;
     private InternalPreferences internalPreferences;
@@ -2081,7 +2081,7 @@ public FieldPreferences getFieldPreferences() {
         }
 
         fieldPreferences = new FieldPreferences(
-                !getBoolean(DO_NOT_RESOLVE_STRINGS),
+                !getBoolean(DO_NOT_RESOLVE_STRINGS), // mind the !
                 getStringList(RESOLVE_STRINGS_FOR_FIELDS).stream()
                                                          .map(FieldFactory::parseField)
                                                          .collect(Collectors.toList()),
@@ -2177,28 +2177,25 @@ public AutoLinkPreferences getAutoLinkPreferences() {
     //*************************************************************************************************************
 
     @Override
-    public ImportExportPreferences getImportExportPreferences() {
-        if (Objects.nonNull(importExportPreferences)) {
-            return importExportPreferences;
+    public ExportPreferences getExportPreferences() {
+        if (Objects.nonNull(exportPreferences)) {
+            return exportPreferences;
         }
 
-        importExportPreferences = new ImportExportPreferences(
+        exportPreferences = new ExportPreferences(
                 getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
-                Path.of(get(IMPORT_WORKING_DIRECTORY)),
                 get(LAST_USED_EXPORT),
                 Path.of(get(EXPORT_WORKING_DIRECTORY)),
                 getExportSaveOrder(),
-                getBoolean(LOCAL_AUTO_SAVE), getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION));
+                getBoolean(LOCAL_AUTO_SAVE));
 
-        EasyBind.listen(importExportPreferences.alwaysReformatOnSaveProperty(), (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
-        EasyBind.listen(importExportPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(importExportPreferences.lastExportExtensionProperty(), (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
-        EasyBind.listen(importExportPreferences.exportWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(importExportPreferences.exportSaveOrderProperty(), (obs, oldValue, newValue) -> storeExportSaveOrder(newValue));
-        EasyBind.listen(importExportPreferences.autoSaveProperty(), (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
-        EasyBind.listen(importExportPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        EasyBind.listen(exportPreferences.alwaysReformatOnSaveProperty(), (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
+        EasyBind.listen(exportPreferences.lastExportExtensionProperty(), (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
+        EasyBind.listen(exportPreferences.exportWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(exportPreferences.exportSaveOrderProperty(), (obs, oldValue, newValue) -> storeExportSaveOrder(newValue));
+        EasyBind.listen(exportPreferences.autoSaveProperty(), (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
 
-        return importExportPreferences;
+        return exportPreferences;
     }
 
     public SaveOrder getExportSaveOrder() {
@@ -2254,7 +2251,7 @@ public SaveConfiguration getExportConfiguration() {
         return new SaveConfiguration()
                 .withSaveOrder(saveOrder)
                 .withMetadataSaveOrder(false)
-                .withReformatOnSave(getImportExportPreferences().shouldAlwaysReformatOnSave());
+                .withReformatOnSave(getExportPreferences().shouldAlwaysReformatOnSave());
     }
 
     @Override
@@ -2757,11 +2754,15 @@ public ImporterPreferences getImporterPreferences() {
 
         importerPreferences = new ImporterPreferences(
                 getBoolean(GENERATE_KEY_ON_IMPORT),
+                Path.of(get(IMPORT_WORKING_DIRECTORY)),
+                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
                 getCustomImportFormats(),
                 getFetcherKeys()
         );
 
         EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
+        EasyBind.listen(importerPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(importerPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
         importerPreferences.getApiKeys().addListener((InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys()));
         importerPreferences.getCustomImportList().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImportList()));
 
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index c28cd1746c1..ac7b7f94312 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -171,7 +171,7 @@ public interface PreferencesService {
     // Import/Export preferences
     //*************************************************************************************************************
 
-    ImportExportPreferences getImportExportPreferences();
+    ExportPreferences getExportPreferences();
 
     List<TemplateExporter> getCustomExportFormats(JournalAbbreviationRepository repository);
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index fe7284df124..75b6a7a35d9 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -271,7 +271,8 @@ Do\ not\ abbreviate\ names=Do not abbreviate names
 
 Do\ not\ open\ any\ files\ at\ startup=Do not open any files at startup
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Do not wrap the following fields when saving
+Do\ not\ wrap\ when\ saving=Do not wrap when saving
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Do not write the following fields to XMP Metadata
 
 Donate\ to\ JabRef=Donate to JabRef
@@ -740,8 +741,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Replaces Unicode ligat
 
 Required\ fields=Required fields
 
-Do\ not\ resolve\ BibTeX\ strings=Do not resolve BibTeX strings
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Resolve BibTeX strings for the following fields
+Resolve\ BibTeX\ strings=Resolve BibTeX strings
 
 resolved=resolved
 
@@ -2053,7 +2053,7 @@ Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 Open\ files...=Open files...
 
-Affected\ fields\:=Affected fields:
+Affected\ fields=Affected fields
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Show preview as a tab in entry editor
 Font=Font
 Visual\ theme=Visual theme
@@ -2342,7 +2342,7 @@ Unprotect\ terms=Unprotect terms
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Generate a new key for imported entries (overwriting their default)
 Warn\ about\ duplicates\ on\ import=Warn about duplicates on import
-Import\ and\ Export=Import and Export
+
 Custom\ DOI\ URI=Custom DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Use custom DOI base URI for article access
 
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index b2f82ad2a28..0044eb7c877 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -24,9 +24,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.preferences.ExportPreferences;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.GeneralPreferences;
-import org.jabref.preferences.ImportExportPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +49,7 @@ public class ExportToClipboardActionTest {
     private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final PreferencesService preferences = mock(PreferencesService.class);
-    private final ImportExportPreferences importExportPrefs = mock(ImportExportPreferences.class);
+    private final ExportPreferences importExportPrefs = mock(ExportPreferences.class);
     private final StateManager stateManager = mock(StateManager.class);
 
     private ExporterFactory exporterFactory;
@@ -92,7 +92,7 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
         };
 
         when(importExportPrefs.getLastExportExtension()).thenReturn("HTML");
-        when(preferences.getImportExportPreferences()).thenReturn(importExportPrefs);
+        when(preferences.getExportPreferences()).thenReturn(importExportPrefs);
         GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
         FilePreferences filePreferences = mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index 42f6f9fc72e..ba398f743a8 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -28,8 +28,8 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
+import org.jabref.preferences.ExportPreferences;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.ImportExportPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -63,7 +63,7 @@ public void setUp() {
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(filePreferences.getWorkingDirectory()).thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
-        when(preferences.getImportExportPreferences()).thenReturn(mock(ImportExportPreferences.class));
+        when(preferences.getExportPreferences()).thenReturn(mock(ExportPreferences.class));
         when(jabRefFrame.getDialogService()).thenReturn(dialogService);
         saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class)));
     }