diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5dfd9432ec..2ef37798a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We added a feature to fix integrity issues one at a time or similar issues by selecting a type, or to fix all at once. [#11419](https://github.com/JabRef/jabref/issues/11419)
 - We added a new functionality that displays a drop-down list of matching suggestions when typing a citation key pattern. [#12502](https://github.com/JabRef/jabref/issues/12502)
 - We added a new CLI that supports txt, csv, and console-based output for consistency in BibTeX entries. [#11984](https://github.com/JabRef/jabref/issues/11984)
 - We added a new dialog for bibliography consistency check. [#11950](https://github.com/JabRef/jabref/issues/11950)
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 506dee530fb..170bcf25325 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -78,7 +78,7 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get()));
+                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get(), dialogService));
             }
         });
         task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
index 7666785b6ad..bc7b4fc9aed 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.fxml
@@ -8,15 +8,18 @@
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.control.ComboBox?>
 <DialogPane xmlns:fx="http://javafx.com/fxml/1" prefHeight="600.0" prefWidth="700.0"
             xmlns="http://javafx.com/javafx/8.0.121" fx:controller="org.jabref.gui.integrity.IntegrityCheckDialog">
     <content>
-        <VBox spacing="4.0">
-            <TableView fx:id="messagesTable" prefHeight="550" prefWidth="700.0" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
+        <VBox spacing="10.0">
+            <TableView fx:id="messagesTable" prefHeight="550" prefWidth="750.0" VBox.vgrow="ALWAYS" HBox.hgrow="ALWAYS">
                 <columns>
                     <TableColumn fx:id="keyColumn" prefWidth="150.0" maxWidth="200"  text="%Citation key"/>
-                    <TableColumn fx:id="fieldColumn" prefWidth="110.0" maxWidth="200" text="%Field"/>
-                    <TableColumn fx:id="messageColumn" prefWidth="400" text="%Message"/>
+                    <TableColumn fx:id="fieldColumn" prefWidth="100.0" maxWidth="200" text="%Field"/>
+                    <TableColumn fx:id="messageColumn" prefWidth="300" text="%Message"/>
+                    <TableColumn fx:id="fixesColumn" prefWidth="200.0" maxWidth="200" text="%Fixes"/>
                 </columns>
                 <columnResizePolicy>
                     <TableView fx:constant="CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN"/>
@@ -26,7 +29,12 @@
                 <MenuButton fx:id="keyFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Citation key filters"/>
                 <MenuButton fx:id="fieldFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Field filters"/>
                 <MenuButton fx:id="messageFilterButton" prefHeight="30.0" maxHeight="30.0" text="%Message filters"/>
-                <Button onAction="#clearFilters" text="%Clear filters"/>
+            </HBox>
+            <HBox maxHeight="30" spacing="4.0" alignment="CENTER">
+                <Button onAction="#fixAll" prefHeight="20.0" text="%Fix all"/>
+                <Region HBox.hgrow="ALWAYS" />
+                <ComboBox fx:id="entryTypeCombo" maxWidth="400"  />
+                <Button onAction="#fixByType" alignment="CENTER_RIGHT" prefHeight="20.0" text="%Fix by type"/>
             </HBox>
         </VBox>
     </content>
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 00b3cc32bc9..48e1965c51d 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,22 +1,34 @@
 package org.jabref.gui.integrity;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 
+import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuButton;
+import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.MouseButton;
 import javafx.stage.Modality;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
+import org.jabref.logic.integrity.IntegrityIssue;
 import org.jabref.logic.integrity.IntegrityMessage;
 import org.jabref.logic.l10n.Localization;
 
@@ -30,20 +42,28 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     @FXML private TableColumn<IntegrityMessage, String> keyColumn;
     @FXML private TableColumn<IntegrityMessage, String> fieldColumn;
     @FXML private TableColumn<IntegrityMessage, String> messageColumn;
+    @FXML private TableColumn<IntegrityMessage, String> fixesColumn;
     @FXML private MenuButton keyFilterButton;
     @FXML private MenuButton fieldFilterButton;
     @FXML private MenuButton messageFilterButton;
+    @FXML private ComboBox<String> entryTypeCombo;
 
     @Inject private ThemeManager themeManager;
 
     private final List<IntegrityMessage> messages;
     private final LibraryTab libraryTab;
+    private final DialogService dialogService;
+
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
-    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
+    public IntegrityCheckDialog(List<IntegrityMessage> messages,
+                                LibraryTab libraryTab,
+                                DialogService dialogService) {
         this.messages = messages;
         this.libraryTab = libraryTab;
+        this.dialogService = dialogService;
+
         this.setTitle(Localization.lang("Check integrity"));
         this.initModality(Modality.NONE);
 
@@ -71,10 +91,51 @@ private void initialize() {
 
         messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
+        updateEntryTypeCombo();
         keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().entry().getCitationKey().orElse("")));
         fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().field().getDisplayName()));
         messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().message()));
 
+        fixesColumn.setCellFactory(row -> new TableCell<>() {
+            private final Button button = new Button();
+
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || getTableRow() == null || getTableRow().getItem() == null) {
+                    setGraphic(null);
+                    return;
+                }
+                IntegrityMessage rowData = getTableRow().getItem();
+                configureAction(rowData);
+            }
+
+            /**
+             * Configures the action for the button based on the provided {@link IntegrityMessage}.
+             * If a fix is available for the message, the button is configured to apply the fix when clicked.
+             *
+             * @param message the {@link IntegrityMessage} to check for available fixes
+             */
+            private void configureAction(IntegrityMessage message) {
+                Optional<IntegrityIssue> issue = IntegrityIssue.fromMessage(message);
+                if (issue.isPresent() && issue.get().getFix() != null) {
+                    configureButton(issue.get().getFix(), () -> {
+                        viewModel.fix(issue.get(), message);
+                        viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                    });
+                    setGraphic(button);
+                    return;
+                }
+                setGraphic(null);
+            }
+
+            private void configureButton(String text, Runnable action) {
+                button.setText(text);
+                button.setPrefHeight(20.0);
+                button.setOnAction(event -> action.run());
+            }
+        });
+
         new ValueTableCellFactory<IntegrityMessage, String>()
                 .withText(Function.identity())
                 .withTooltip(Function.identity())
@@ -86,6 +147,8 @@ private void initialize() {
         addMessageColumnFilter(keyColumn, keyFilterButton);
         addMessageColumnFilter(fieldColumn, fieldFilterButton);
         addMessageColumnFilter(messageColumn, messageFilterButton);
+
+       messagesTable.itemsProperty().bind(viewModel.columnsListProperty());
     }
 
     private void addMessageColumnFilter(TableColumn<IntegrityMessage, String> messageColumn, MenuButton messageFilterButton) {
@@ -116,4 +179,82 @@ public void clearFilters() {
             });
         }
     }
+
+    private void updateEntryTypeCombo() {
+        Set<String> entryTypes = viewModel.getEntryTypes();
+        Set<String> uniqueTexts = new HashSet<>();
+        entryTypeCombo.getItems().clear();
+
+        Arrays.stream(IntegrityIssue.values())
+              .filter(issue -> entryTypes.contains(issue.getText()))
+              .filter(issue -> uniqueTexts.add(issue.getText()))
+              .forEach(issue -> entryTypeCombo.getItems().add(issue.getText()));
+
+        if (!entryTypeCombo.getItems().isEmpty()) {
+            entryTypeCombo.getSelectionModel().selectFirst();
+        }
+    }
+
+    /**
+     * Checks if a given {@link IntegrityMessage} has a fix available.
+     *
+     * @param message the {@link IntegrityMessage} to check
+     * @return {@code true} if a fix is available, {@code false} otherwise
+     */
+    private boolean hasFix(IntegrityMessage message) {
+        return message != null && message.field() != null && IntegrityIssue.fromMessage(message)
+                                                                           .map(issue -> issue.getFix() != null)
+                                                                           .orElse(false);
+    }
+
+    /**
+     * Attempts to fix all {@link IntegrityMessage} objects of the selected type.
+     * If fixes are available, they are applied, and the fixed messages are removed.
+     * A notification is shown to indicate success or failure.
+     */
+    @FXML
+    private void fixByType() {
+        AtomicBoolean fixed = new AtomicBoolean(false);
+
+        String selectedType = entryTypeCombo.getSelectionModel().getSelectedItem();
+        Optional<IntegrityIssue> selectedIssue = Arrays.stream(IntegrityIssue.values())
+                                                       .filter(issue -> issue.getText().equals(selectedType))
+                                                       .findFirst();
+
+        selectedIssue.ifPresent(issue -> {
+            messagesTable.getItems().stream()
+                    .filter(message -> message.message().equals(issue.getText()) && hasFix(message)) // Filter messages matching the selected issue type and have a fix
+                    .forEach(message -> {
+                        viewModel.fix(issue, message);
+                        viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                        Platform.runLater(() -> viewModel.columnsListProperty().getValue().removeIf(column -> Objects.equals(column.message(), message.message())));
+                        fixed.set(true);
+                    });
+        });
+
+        updateEntryTypeCombo();
+
+        if (fixed.get()) {
+            dialogService.notify(Localization.lang("Fixed successfully!"));
+        } else {
+            dialogService.notify(Localization.lang("No fixes available!"));
+        }
+    }
+
+    /**
+     * Attempts to fix all {@link IntegrityMessage} objects that have a fix available.
+     * Messages with applicable fixes are processed, and the corresponding UI elements are updated.
+     */
+    @FXML
+    private void fixAll() {
+        messagesTable.getItems().stream()
+                .filter(this::hasFix)   // Filter all messages that have a fix
+                .forEach(message -> IntegrityIssue.fromMessage(message).ifPresent(issue -> {
+                    viewModel.fix(issue, message);
+                    viewModel.removeFromEntryTypes(message.field().getDisplayName());
+                    Platform.runLater(() -> viewModel.columnsListProperty().getValue().removeIf(column -> Objects.equals(column.message(), message.message())));
+                }));
+
+        updateEntryTypeCombo();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
index 1313417642e..861cdb93293 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -1,22 +1,177 @@
 package org.jabref.gui.integrity;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.collections.ObservableSet;
 
 import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.integrity.IntegrityIssue;
 import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IntegrityCheckDialogViewModel extends AbstractViewModel {
 
+    private final Logger LOGGER = LoggerFactory.getLogger(IntegrityCheckDialogViewModel.class);
+
+    private final ListProperty<IntegrityMessage> columnsListProperty;
     private final ObservableList<IntegrityMessage> messages;
+    private final ObservableSet<String> entryTypes;
 
     public IntegrityCheckDialogViewModel(List<IntegrityMessage> messages) {
         this.messages = FXCollections.observableArrayList(messages);
+
+        Set<String> types = messages.stream()
+                                    .map(IntegrityMessage::message)
+                                    .collect(Collectors.toSet());
+        this.entryTypes = FXCollections.observableSet(types);
+
+        this.columnsListProperty = new SimpleListProperty<>(FXCollections.observableArrayList(messages));
+    }
+
+    public ListProperty<IntegrityMessage> columnsListProperty() {
+        return this.columnsListProperty;
     }
 
     public ObservableList<IntegrityMessage> getMessages() {
         return messages;
     }
+
+    public Set<String> getEntryTypes() {
+        return entryTypes;
+    }
+
+    public void removeFromEntryTypes(String entry) {
+        entryTypes.remove(entry);
+    }
+
+    public void fix(IntegrityIssue issue, IntegrityMessage message) {
+        switch (issue) {
+            case CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS:
+                maskTitle(message);
+                break;
+            case BIBTEX_FIELD_ONLY:
+                removeField(message, message.field());
+                break;
+            case INCORRECT_FORMAT:
+                correctDateFormat(message);
+                break;
+            case NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED:
+                removeNonIntegerEdition(message);
+                break;
+            case SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL:
+                ensureValidEdition(message);
+                break;
+            case SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED:
+                capitalizeFirstLetter(message, StandardField.EDITION);
+                break;
+            case REFERENCED_CITATION_KEY_DOES_NOT_EXIST:
+                handleMissingCitationKey(message);
+                break;
+            case NON_ASCII_ENCODED_CHARACTER_FOUND:
+                replaceNonASCIICharacters(message);
+                break;
+            case SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE:
+                formatPageNumberRange(message);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void maskTitle(IntegrityMessage message) {
+        String title = message.entry().getTitle().get();
+        if (title.isEmpty()) {
+            return;
+        }
+        StringBuilder result = new StringBuilder();
+        for (char ch : title.toCharArray()) {
+            if (Character.isUpperCase(ch)) {
+                result.append("{").append(ch).append("}");
+            } else {
+                result.append(ch);
+            }
+        }
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(StandardField.TITLE, result.toString());
+        message.entry().setField(fields);
+    }
+
+    public void removeField(IntegrityMessage message, Field field) {
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(field, "");
+        message.entry().setField(fields);
+    }
+
+    public void correctDateFormat(IntegrityMessage message) {
+        String date = message.entry().getField(StandardField.DATE).orElse("");
+        DateTimeFormatter inputFormat = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+        DateTimeFormatter targetFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        try {
+            LocalDate parsedDate = LocalDate.parse(date, inputFormat);
+            updateField(message, StandardField.DATE, parsedDate.format(targetFormat));
+        } catch (DateTimeParseException e) {
+            LOGGER.error("Invalid date format: {}", date);
+        }
+    }
+
+    public void formatPageNumberRange(IntegrityMessage message) {
+        String pages = message.entry().getField(StandardField.PAGES).orElse("");
+        if (!pages.matches("\\d+(-\\d+)?")) {
+            updateField(message, StandardField.PAGES, "1-10");
+        }
+    }
+
+    public void replaceNonASCIICharacters(IntegrityMessage message) {
+        String value = message.entry().getField(StandardField.ABSTRACT).orElse("");
+        String normalized = value.replaceAll("[^\\x00-\\x7F]", "");
+        updateField(message, StandardField.ABSTRACT, normalized);
+    }
+
+    public void handleMissingCitationKey(IntegrityMessage message) {
+        updateField(message, StandardField.CROSSREF, "UnknownKey");
+    }
+
+    public void capitalizeFirstLetter(IntegrityMessage message, Field field) {
+        String value = message.entry().getField(field).orElse("");
+        if (!value.isEmpty()) {
+            String capitalized = value.substring(0, 1).toUpperCase() + value.substring(1).toLowerCase();
+            updateField(message, field, capitalized);
+        }
+    }
+
+    public void ensureValidEdition(IntegrityMessage message) {
+        String edition = message.entry().getField(StandardField.EDITION).orElse("");
+        if (!edition.matches("\\d+|First|Second|Third")) {
+            updateField(message, StandardField.EDITION, "First");
+        }
+    }
+
+    public void removeNonIntegerEdition(IntegrityMessage message) {
+        String edition = message.entry().getField(StandardField.EDITION).orElse("");
+        if (!edition.matches("\\d+")) {
+            updateField(message, StandardField.EDITION, "");
+        }
+    }
+
+    public void updateField(IntegrityMessage message, Field field, String newValue) {
+        Map<Field, String> fields = new HashMap<>();
+        fields.put(field, newValue);
+        message.entry().setField(fields);
+    }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 4072b35b8b9..472cc67740f 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -21,7 +20,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
-                results.add(new IntegrityMessage(Localization.lang("Non-ASCII encoded character found"), entry,
+                results.add(new IntegrityMessage(IntegrityIssue.NON_ASCII_ENCODED_CHARACTER_FOUND.getText(), entry,
                         field.getKey()));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
index 0c456ad5ba9..39bf1591600 100644
--- a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -26,7 +25,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Field field : fields) {
             Optional<String> value = entry.getFieldLatexFree(field);
             value.filter(abbreviationRepository::isAbbreviatedName)
-                 .ifPresent(val -> messages.add(new IntegrityMessage(Localization.lang("abbreviation detected"), entry, field)));
+                 .ifPresent(val -> messages.add(new IntegrityMessage(IntegrityIssue.ABBREVIATION_DETECTED.getText(), entry, field)));
         }
         return messages;
     }
diff --git a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
index 6581e929658..f955910bcf2 100644
--- a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
@@ -7,7 +7,6 @@
 import java.util.regex.Pattern;
 
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
@@ -35,7 +34,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 }
                 if ((hashCount & 1) == 1) { // Check if odd
                     // # is FieldWriter.BIBTEX_STRING_START_END_SYMBOL
-                    results.add(new IntegrityMessage(Localization.lang("odd number of unescaped '#'"), entry,
+                    results.add(new IntegrityMessage(IntegrityIssue.ODD_NUMBER_OF_UNESCAPED.getText(), entry,
                             field.getKey()));
                 }
             }
diff --git a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
index b83e3039e93..05f9b474a64 100644
--- a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
@@ -3,7 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.types.EntryTypeFactory;
@@ -20,7 +19,7 @@ public class BibTeXEntryTypeChecker implements EntryChecker {
     public List<IntegrityMessage> check(BibEntry entry) {
         if (EntryTypeFactory.isExclusiveBiblatex(entry.getType())) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Entry type %0 is only defined for Biblatex but not for BibTeX", entry.getType().getDisplayName()), entry, InternalField.KEY_FIELD)
+                    new IntegrityMessage(IntegrityIssue.ENTRY_TYPE_IS_ONLY_DEFINED_FOR_BIBLATEX_BUT_NOT_FOR_BIBTEX.getText(), entry, InternalField.KEY_FIELD)
             );
         }
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
index 3ed8b36a6e7..ff4106b93f9 100644
--- a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
@@ -3,7 +3,6 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class BooktitleChecker implements ValueChecker {
@@ -15,7 +14,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.toLowerCase(Locale.ENGLISH).endsWith("conference on")) {
-            return Optional.of(Localization.lang("booktitle ends with 'conference on'"));
+            return Optional.of(IntegrityIssue.BOOKTITLE_ENDS_WITH_CONFERENCE_ON.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
index bff56b03770..cf1df000c44 100644
--- a/src/main/java/org/jabref/logic/integrity/BracketChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class BracketChecker implements ValueChecker {
@@ -20,7 +19,7 @@ public Optional<String> checkValue(String value) {
                 counter++;
             } else if (a == '}') {
                 if (counter == 0) {
-                    return Optional.of(Localization.lang("unexpected closing curly bracket"));
+                    return Optional.of(IntegrityIssue.UNEXPECTED_CLOSING_CURLY_BRACKET.getText());
                 } else {
                     counter--;
                 }
@@ -28,7 +27,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (counter > 0) {
-            return Optional.of(Localization.lang("unexpected opening curly bracket"));
+            return Optional.of(IntegrityIssue.UNEXPECTED_OPENING_CURLY_BRACKET.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index 47d7bff811a..3f36f090934 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -7,7 +7,6 @@
 
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -36,7 +35,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(new IntegrityMessage(
-                    Localization.lang("Citation key deviates from generated key"), entry, InternalField.KEY_FIELD));
+                    IntegrityIssue.CITATION_KEY_DEVIATES_FROM_GENERATED_KEY.getText(), entry, InternalField.KEY_FIELD));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
index ae222225e26..0cf122f59bf 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
@@ -5,7 +5,6 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -28,7 +27,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         boolean isDuplicate = database.isDuplicateCitationKeyExisting(citeKey.get());
         if (isDuplicate) {
             return Collections.singletonList(
-                    new IntegrityMessage(Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
+                    new IntegrityMessage(IntegrityIssue.DUPLICATE_CITATION_KEY.getText(), entry, StandardField.KEY));
         }
         return Collections.emptyList();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index a79e37994e8..f0319a7ebc7 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.Date;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +15,7 @@ public Optional<String> checkValue(String value) {
 
         Optional<Date> parsedDate = Date.parse(value);
         if (parsedDate.isEmpty()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
index a59c07c2905..65fc5d2a250 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
@@ -7,7 +7,6 @@
 
 import javafx.collections.ObservableList;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -30,7 +29,7 @@ public List<IntegrityMessage> check(BibDatabase database) {
         return duplicateMap.inverse().keySet().stream()
                            .filter(list -> list.size() > 1)
                            .flatMap(Collection::stream)
-                           .map(item -> new IntegrityMessage(Localization.lang("Same DOI used in multiple entries"), item, StandardField.DOI))
+                           .map(item -> new IntegrityMessage(IntegrityIssue.SAME_DOI_USED_IN_MULTIPLE_ENTRIES.getText(), item, StandardField.DOI))
                            .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
index a78c8b4d0ea..74400370365 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,7 +15,7 @@ public Optional<String> checkValue(String value) {
         if (DOI.isValid(value)) {
             return Optional.empty();
         } else {
-            return Optional.of(Localization.lang("DOI %0 is invalid", value));
+            return Optional.of(IntegrityIssue.DOI_IS_INVALID.getText());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 3fb6ec5b89b..f073aa7d4e9 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -46,15 +46,15 @@ public Optional<String> checkValue(String value) {
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(Localization.lang("should contain an integer or a literal"));
+                return Optional.of(IntegrityIssue.SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL.getText());
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(Localization.lang("no integer as values for edition allowed"));
+                return Optional.of(IntegrityIssue.NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED.getText());
             }
         }
         if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index 8827e8a2169..344944e427c 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -6,7 +6,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -29,7 +28,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
                 entry.getEntryLinkList(field.getKey(), database).stream()
                      .filter(parsedEntryLink -> parsedEntryLink.getLinkedEntry().isEmpty())
                      .forEach(parsedEntryLink -> result.add(new IntegrityMessage(
-                             Localization.lang("Referenced citation key '%0' does not exist", parsedEntryLink.getKey()),
+                             IntegrityIssue.REFERENCED_CITATION_KEY_DOES_NOT_EXIST.getText(),
                              entry, field.getKey())));
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index d59e3c5d1ea..646c0a790a0 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -8,7 +8,6 @@
 
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.importer.util.FileFieldParser;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.strings.StringUtil;
@@ -37,7 +36,7 @@ public Optional<String> checkValue(String value) {
         for (LinkedFile file : linkedFiles) {
             Optional<Path> linkedFile = file.findIn(context, filePreferences);
             if ((linkedFile.isEmpty()) || !Files.exists(linkedFile.get())) {
-                return Optional.of(Localization.lang("link should refer to a correct file path"));
+                return Optional.of(IntegrityIssue.LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH.getText());
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
index b987a1f541a..c30c4074ffa 100644
--- a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.FieldProperty;
 
@@ -19,7 +18,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         return entry.getFieldMap().entrySet().stream()
                     .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
                     .filter(field -> HTML_CHARACTER_PATTERN.matcher(field.getValue()).find())
-                    .map(field -> new IntegrityMessage(Localization.lang("HTML encoded character found"), entry, field.getKey()))
+                    .map(field -> new IntegrityMessage(IntegrityIssue.HTML_ENCODED_CHARACTER_FOUND.getText(), entry, field.getKey()))
                     .toList();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
index 75e358732fa..52ed340d4cf 100644
--- a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -33,7 +32,7 @@ public Optional<String> checkValue(String value) {
 
         // BibTeX
         if (!databaseContext.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index c774dc9148a..f1876dfb812 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
 
@@ -18,11 +17,11 @@ public Optional<String> checkValue(String value) {
         ISBN isbn = new ISBN(value);
 
         if (!isbn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         if (!isbn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index f7205d195b5..0ed73369bb8 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISSN;
 import org.jabref.model.strings.StringUtil;
 
@@ -19,11 +18,11 @@ public Optional<String> checkValue(String value) {
 
         ISSN issn = new ISSN(issnString);
         if (!issn.isValidFormat()) {
-            return Optional.of(Localization.lang("incorrect format"));
+            return Optional.of(IntegrityIssue.INCORRECT_FORMAT.getText());
         }
 
         if (!issn.isValidChecksum()) {
-            return Optional.of(Localization.lang("incorrect control digit"));
+            return Optional.of(IntegrityIssue.INCORRECT_CONTROL_DIGIT.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
new file mode 100644
index 00000000000..808b6fab2b1
--- /dev/null
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityIssue.java
@@ -0,0 +1,72 @@
+package org.jabref.logic.integrity;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.jabref.logic.l10n.Localization;
+
+/**
+ * Represents various integrity issues that can occur in a bibliography entry.
+ * Each issue has an associated message describing the problem, and some may provide
+ * a suggested fix.
+ */
+public enum IntegrityIssue {
+    CITATION_KEY_DEVIATES_FROM_GENERATED_KEY(Localization.lang("Citation key deviates from generated key")),
+    BIBTEX_FIELD_ONLY(Localization.lang("bibtex field only"), Localization.lang("Remove field")),
+    BIBLATEX_FIELD_ONLY(Localization.lang("biblatex field only"), Localization.lang("Remove field")),
+    JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST(Localization.lang("journal not found in abbreviation list")),
+    NO_INTEGER_AS_VALUE_FOR_EDITION_ALLOWED(Localization.lang("no integer as values for edition allowed")),
+    SHOULD_CONTAIN_AN_INTEGER_OR_A_LITERAL(Localization.lang("should contain an integer or a literal")),
+    SHOULD_HAVE_THE_FIRST_LETTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
+    REFERENCED_CITATION_KEY_DOES_NOT_EXIST(Localization.lang("Referenced citation key does not exist")),
+    NON_ASCII_ENCODED_CHARACTER_FOUND(Localization.lang("Non-ASCII encoded character found")),
+    SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE(Localization.lang("should contain a valid page number range")),
+    CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS(Localization.lang("capital letters are not masked using curly brackets {}"), Localization.lang("Mask letters")),
+    BOOKTITLE_ENDS_WITH_CONFERENCE_ON(Localization.lang("booktitle ends with 'conference on'")),
+    INCORRECT_FORMAT(Localization.lang("incorrect format")),
+    INCORRECT_CONTROL_DIGIT(Localization.lang("incorrect control digit")),
+    ABBREVIATION_DETECTED(Localization.lang("abbreviation detected")),
+    ODD_NUMBER_OF_UNESCAPED(Localization.lang("odd number of unescaped '#'")),
+    ENTRY_TYPE_IS_ONLY_DEFINED_FOR_BIBLATEX_BUT_NOT_FOR_BIBTEX(Localization.lang("Entry type %0 is only defined for Biblatex but not for BibTeX")),
+    UNEXPECTED_OPENING_CURLY_BRACKET(Localization.lang("unexpected opening curly bracket")),
+    UNEXPECTED_CLOSING_CURLY_BRACKET(Localization.lang("unexpected closing curly bracket")),
+    DUPLICATE_CITATION_KEY(Localization.lang("Duplicate citation key")),
+    SAME_DOI_USED_IN_MULTIPLE_ENTRIES(Localization.lang("Same DOI used in multiple entries")),
+    DOI_IS_INVALID(Localization.lang("DOI is invalid")),
+    LINK_SHOULD_REFER_TO_A_CORRECT_FILE_PATH(Localization.lang("link should refer to a correct file path")),
+    SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED(Localization.lang("should have the first letter capitalized")),
+    HTML_ENCODED_CHARACTER_FOUND(Localization.lang("HTML encoded character found")),
+    LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS(Localization.lang("last four nonpunctuation characters should be numerals")),
+    SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER(Localization.lang("should contain a four digit number")),
+    EMPTY_CITATION_KEY(Localization.lang("empty citation key")),
+    INVALID_CITATION_KEY(Localization.lang("Invalid citation key")),
+    SHOULD_BE_NORMALIZED(Localization.lang("should be normalized")),
+    SHOULD_BE_AN_INTEGER_OR_NORMALIZED(Localization.lang("should be an integer or normalized"));
+
+    private final String text;
+    private final String fix;
+
+    IntegrityIssue(String text, String fix) {
+        this.text = text;
+        this.fix = fix;
+    }
+
+    IntegrityIssue(String text) {
+        this.text = text;
+        this.fix = null;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public String getFix() {
+        return fix;
+    }
+
+    public static Optional<IntegrityIssue> fromMessage(IntegrityMessage message) {
+        return Arrays.stream(IntegrityIssue.values())
+                     .filter(symbol -> symbol.getText().equals(message.message()))
+                     .findFirst();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
index 88269b27dd7..2b7f76b71cf 100644
--- a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
@@ -6,7 +6,6 @@
 import java.util.Optional;
 
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -29,7 +28,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
 
         final String journal = value.get();
         if (!abbreviationRepository.isKnownName(journal)) {
-            return Collections.singletonList(new IntegrityMessage(Localization.lang("journal not found in abbreviation list"), entry, field));
+            return Collections.singletonList(new IntegrityMessage(IntegrityIssue.JOURNAL_NOT_FOUND_IN_ABBREVIATION_LIST.getText(), entry, field));
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/org/jabref/logic/integrity/MonthChecker.java b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
index f3b34b8f901..0a00bd135b6 100644
--- a/src/main/java/org/jabref/logic/integrity/MonthChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -40,12 +39,12 @@ public Optional<String> checkValue(String value) {
         // biblatex
         if (bibDatabaseContextMonth.isBiblatexMode()
                 && !(ONLY_AN_INTEGER.test(value.trim()) || MONTH_NORMALIZED.test(value.trim()))) {
-            return Optional.of(Localization.lang("should be an integer or normalized"));
+            return Optional.of(IntegrityIssue.SHOULD_BE_AN_INTEGER_OR_NORMALIZED.getText());
         }
 
         // BibTeX
         if (!bibDatabaseContextMonth.isBiblatexMode() && !MONTH_NORMALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should be normalized"));
+            return Optional.of(IntegrityIssue.SHOULD_BE_NORMALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index feb29ad750d..68b0e1e5eb4 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -4,7 +4,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
@@ -36,6 +35,6 @@ public List<IntegrityMessage> check(BibEntry entry) {
         final Set<Field> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFields().stream()
                     .filter(allBiblatexOnlyFields::contains)
-                    .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
+                    .map(name -> new IntegrityMessage(IntegrityIssue.BIBLATEX_FIELD_ONLY.getText(), entry, name)).collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/NoteChecker.java b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
index db80442d1e9..25289d88705 100644
--- a/src/main/java/org/jabref/logic/integrity/NoteChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -33,7 +32,7 @@ public Optional<String> checkValue(String value) {
 
         // BibTeX
         if (!bibDatabaseContextEdition.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+            return Optional.of(IntegrityIssue.SHOULD_HAVE_THE_FIRST_CHARACTER_CAPITALIZED.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index d21caa310ff..6d50b3074bf 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -5,7 +5,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -58,7 +57,7 @@ public Optional<String> checkValue(String value) {
         if (Arrays.stream(value.split(","))
                 .map(String::trim)
                 .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
-            return Optional.of(Localization.lang("should contain a valid page number range"));
+            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_VALID_PAGE_NUMBER_RANGE.getText());
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 824c8673f46..afd23dc91c2 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -4,7 +4,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.strings.StringUtil;
 
@@ -48,7 +47,7 @@ public Optional<String> checkValue(String value) {
             if (!subTitle.isEmpty()) {
                 subTitle = subTitle.substring(1);
                 if (HAS_CAPITAL_LETTERS.test(subTitle)) {
-                    return Optional.of(Localization.lang("capital letters are not masked using curly brackets {}"));
+                    return Optional.of(IntegrityIssue.CAPITAL_LETTER_ARE_NOT_MASKED_USING_CURLY_BRACKETS.getText());
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
index e23fcb2b41e..2dc870fd7eb 100644
--- a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
@@ -3,7 +3,6 @@
 import java.util.Optional;
 
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -14,7 +13,7 @@ public class ValidCitationKeyChecker implements ValueChecker {
     @Override
     public Optional<String> checkValue(String value) {
         if (StringUtil.isNullOrEmpty(value)) {
-            return Optional.of(Localization.lang("empty citation key"));
+            return Optional.of(IntegrityIssue.EMPTY_CITATION_KEY.getText());
         }
 
         String cleaned = CitationKeyGenerator.cleanKey(value, "");
@@ -22,7 +21,7 @@ public Optional<String> checkValue(String value) {
         if (cleaned.equals(value)) {
             return Optional.empty();
         } else {
-            return Optional.of(Localization.lang("Invalid citation key"));
+            return Optional.of(IntegrityIssue.INVALID_CITATION_KEY.getText());
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/src/main/java/org/jabref/logic/integrity/YearChecker.java
index 3dc98f75d2d..3a6b2501992 100644
--- a/src/main/java/org/jabref/logic/integrity/YearChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/YearChecker.java
@@ -4,7 +4,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
 public class YearChecker implements ValueChecker {
@@ -28,11 +27,11 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!CONTAINS_FOUR_DIGIT.test(value.trim())) {
-            return Optional.of(Localization.lang("should contain a four digit number"));
+            return Optional.of(IntegrityIssue.SHOULD_CONTAIN_A_FOUR_DIGIT_NUMBER.getText());
         }
 
         if (!ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))) {
-            return Optional.of(Localization.lang("last four nonpunctuation characters should be numerals"));
+            return Optional.of(IntegrityIssue.LAST_FOUR_NONPUNCTUATION_CHARACTERS_SHOULD_BE_NUMERALS.getText());
         }
 
         return Optional.empty();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 37eeb2d5ff2..555abd18aa3 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1411,6 +1411,8 @@ unexpected\ opening\ curly\ bracket=unexpected opening curly bracket
 capital\ letters\ are\ not\ masked\ using\ curly\ brackets\ {}=capital letters are not masked using curly brackets {}
 should\ contain\ a\ four\ digit\ number=should contain a four digit number
 should\ contain\ a\ valid\ page\ number\ range=should contain a valid page number range
+Mask\ letters=Mask letters
+DOI\ is\ invalid=DOI is invalid
 
 Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually.
 
@@ -1839,7 +1841,7 @@ Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ent
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=However, a new database was created alongside the pre-3.6 one.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opens a link where the current development version can be downloaded
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=See what has been changed in the JabRef versions
-Referenced\ citation\ key\ '%0'\ does\ not\ exist=Referenced citation key '%0' does not exist
+Referenced\ citation\ key\ does\ not\ exist=Referenced citation key does not exist
 Full\ text\ document\ for\ entry\ %0\ already\ linked.=Full text document for entry %0 already linked.
 Download\ full\ text\ documents=Download full text documents
 You\ are\ attempting\ to\ download\ full\ text\ documents\ for\ %0\ entries.\nJabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=You are attempting to download full text documents for %0 entries.\nJabRef will send at least one request per entry to a publisher.
@@ -1889,13 +1891,13 @@ Update\ with\ bibliographic\ information\ from\ the\ web=Update with bibliograph
 
 Could\ not\ find\ any\ bibliographic\ information.=Could not find any bibliographic information.
 Citation\ key\ deviates\ from\ generated\ key=Citation key deviates from generated key
-DOI\ %0\ is\ invalid=DOI %0 is invalid
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Select all customized types to be stored in local preferences\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Different customization, current settings will be overwritten
 %0\ (from\ file)\n%1\ (current\ setting)=%0 (from file)\n%1 (current setting)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Entry type %0 is only defined for Biblatex but not for BibTeX
+bibtex\ field\ only=bibtex field only
 
 Copied\ %0\ citations.=Copied %0 citations.
 
@@ -2189,7 +2191,11 @@ Grobid=Grobid
 Citation\ key\ filters=Citation key filters
 Field\ filters=Field filters
 Message\ filters=Message filters
-Clear\ filters=Clear filters
+Fixes=Fixes
+Fix\ all=Fix all
+Fix\ by\ type=Fix by type
+Fixed\ successfully!=Fixed successfully!
+No\ fixes\ available!=No fixes available!
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type
@@ -2201,6 +2207,7 @@ Optional=Optional
 Required=Required
 Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Entry type cannot be empty. Please enter a name.
 Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Field cannot be empty. Please enter a name.
+Remove\ field=Remove field
 
 Capitalize\ current\ word=Capitalize current word
 Delete\ text=Delete text
diff --git a/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
new file mode 100644
index 00000000000..b4669e11630
--- /dev/null
+++ b/src/test/java/org/jabref/gui/integrity/IntegrityDialogViewModelTest.java
@@ -0,0 +1,104 @@
+package org.jabref.gui.integrity;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class IntegrityCheckDialogViewModelTest {
+
+    private BibEntry entry;
+    private IntegrityMessage message;
+    private IntegrityCheckDialogViewModel viewModel;
+
+    @BeforeEach
+    void setUp() {
+        entry = Mockito.mock(BibEntry.class);
+        message = Mockito.mock(IntegrityMessage.class);
+        viewModel = new IntegrityCheckDialogViewModel(Collections.emptyList());
+
+        when(message.entry()).thenReturn(entry);
+    }
+
+    @Test
+    void maskTitle() {
+        when(entry.getTitle()).thenReturn(Optional.of("Proceedings of the 40th International Conference on Machine Learning"));
+        viewModel.maskTitle(message);
+        verify(entry).setField(Map.of(StandardField.TITLE, "{P}roceedings of the 40th {I}nternational {C}onference on {M}achine {L}earning"));
+    }
+
+    @Test
+    void removeField() {
+        viewModel.removeField(message, StandardField.AUTHOR);
+        verify(entry).setField(Map.of(StandardField.AUTHOR, ""));
+    }
+
+    @Test
+    void correctDateFormat() {
+        when(message.entry()).thenReturn(entry);
+        when(entry.getField(StandardField.DATE)).thenReturn(Optional.of("25-02-2025"));
+        viewModel.correctDateFormat(message);
+        verify(entry).setField(Map.of(StandardField.DATE, "2025-02-25"));
+    }
+
+    @Test
+    void formatPageNumberRange() {
+        when(entry.getField(StandardField.PAGES)).thenReturn(Optional.of("abc"));
+        viewModel.formatPageNumberRange(message);
+        verify(entry).setField(Map.of(StandardField.PAGES, "1-10"));
+    }
+
+    @Test
+    void ttestReplaceNonASCIICharacters() {
+        when(entry.getField(StandardField.ABSTRACT)).thenReturn(Optional.of("Thé abstract"));
+        viewModel.replaceNonASCIICharacters(message);
+        verify(entry).setField(Map.of(StandardField.ABSTRACT, "Th abstract"));
+    }
+
+    @Test
+    void replaceNonASCIICharacters() {
+        when(message.entry()).thenReturn(entry);
+        when(entry.getField(StandardField.ABSTRACT)).thenReturn(Optional.of("Thé abstract"));
+        viewModel.replaceNonASCIICharacters(message);
+        verify(entry).setField(Map.of(StandardField.ABSTRACT, "Th abstract"));
+    }
+
+    @Test
+    void handleMissingCitationKey() {
+        viewModel.handleMissingCitationKey(message);
+        verify(entry).setField(Map.of(StandardField.CROSSREF, "UnknownKey"));
+    }
+
+    @Test
+    void capitalizeFirstLetter() {
+        Field field = StandardField.AUTHOR;
+        when(entry.getField(field)).thenReturn(Optional.of("john doe"));
+        viewModel.capitalizeFirstLetter(message, field);
+        verify(entry).setField(Map.of(field, "John doe"));
+    }
+
+    @Test
+    void ensureValidEdition() {
+        when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("Fourth"));
+        viewModel.ensureValidEdition(message);
+        verify(entry).setField(Map.of(StandardField.EDITION, "First"));
+    }
+
+    @Test
+    void removeNonIntegerEdition() {
+        when(entry.getField(StandardField.EDITION)).thenReturn(Optional.of("First"));
+        viewModel.removeNonIntegerEdition(message);
+        verify(entry).setField(Map.of(StandardField.EDITION, ""));
+    }
+}