diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1b7599d741..669fcc59ee6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where "Copy to" was enabled even if no other library was opened. [#13280](https://github.com/JabRef/jabref/pull/13280)
 - We fixed an issue where the groups were still displayed after closing all libraries. [#13382](https://github.com/JabRef/jabref/issues/13382)
 - Enhanced field selection logic in the Merge Entries dialog when fetching from DOI to prefer valid years and entry types. [#12549](https://github.com/JabRef/jabref/issues/12549)
+- We improved consistency in the Add Buttons. [#13791](https://github.com/JabRef/jabref/pull/13791)
 - We fixed an issue where theme or font size are not respected for all dialogs [#13558](https://github.com/JabRef/jabref/issues/13558)
 - We removed unnecessary spacing and margin in the AutomaticFieldEditor. [#13792](https://github.com/JabRef/jabref/pull/13792)
 
diff --git a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index 12dcd20777f..557f961d424 100644
--- a/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/jabgui/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -32,7 +32,6 @@
 import jakarta.inject.Inject;
 
 public class SaveOrderConfigPanel extends VBox {
-
     @FXML private RadioButton exportInSpecifiedOrder;
     @FXML private RadioButton exportInTableOrder;
     @FXML private RadioButton exportInOriginalOrder;
diff --git a/jabgui/src/main/resources/org/jabref/gui/Base.css b/jabgui/src/main/resources/org/jabref/gui/Base.css
index 62f0ddf5534..1b8f1addc08 100644
--- a/jabgui/src/main/resources/org/jabref/gui/Base.css
+++ b/jabgui/src/main/resources/org/jabref/gui/Base.css
@@ -2710,6 +2710,10 @@ journalInfo .grid-cell-b {
     -fx-border-color: transparent;
 }
 
+.add-certificate {
+    -fx-pref-width: 17em;
+    -fx-min-width: 17em;
+}
 
 /* Quick Settings */
 .quick-settings-container,
diff --git a/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.fxml b/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.fxml
index 38370163c1b..fce40ac6317 100644
--- a/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.fxml
@@ -11,8 +11,8 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel">
+    xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1"
+    fx:controller="org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel">
     <CheckBox fx:id="cleanupsEnabled" text="%Enable field formatters"/>
     <HBox spacing="4.0">
         <VBox spacing="4.0" HBox.hgrow="ALWAYS">
diff --git a/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml b/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
index c23fde51d2f..01a277628ba 100644
--- a/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
@@ -8,6 +8,7 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.HBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
@@ -23,7 +24,7 @@
     <RadioButton fx:id="exportInSpecifiedOrder"
                  text="%Use specified order" toggleGroup="$saveOrderToggleGroup"/>
 
-    <GridPane fx:id="sortCriterionList" hgap="10.0" vgap="4.0" maxWidth="450.0"
+    <GridPane fx:id="sortCriterionList" hgap="10.0" vgap="4.0"
               disable="${!exportInSpecifiedOrder.selected}">
         <columnConstraints>
             <ColumnConstraints hgrow="NEVER" minWidth="40.0" maxWidth="40.0"/>
@@ -35,13 +36,14 @@
             <Insets left="30.0"/>
         </padding>
     </GridPane>
-    <Button fx:id="addButton" onAction="#addCriterion" styleClass="icon-button" disable="${!exportInSpecifiedOrder.selected}"
-            maxWidth="450.0" prefWidth="450.0">
-        <graphic>
-            <JabRefIconView glyph="ADD_NOBOX"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="Add"/>
-        </tooltip>
-    </Button>
+    <HBox alignment="BASELINE_RIGHT" disable="${!exportInSpecifiedOrder.selected}">
+        <Button fx:id="addButton" onAction="#addCriterion" text="%Add">
+            <graphic>
+                <JabRefIconView glyph="ADD_NOBOX"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="Add"/>
+            </tooltip>
+        </Button>
+    </HBox>
 </fx:root>
diff --git a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/constants/ConstantsProperties.fxml b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/constants/ConstantsProperties.fxml
index c7a68892389..0ea11f1d4c9 100644
--- a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/constants/ConstantsProperties.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/constants/ConstantsProperties.fxml
@@ -11,40 +11,36 @@
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.libraryproperties.constants.ConstantsPropertiesView">
-    <Label styleClass="sectionHeader" text="%String constants"/>
-    <HBox spacing="4.0" VBox.vgrow="ALWAYS">
-        <VBox spacing="4.0" HBox.hgrow="ALWAYS">
-            <TableView fx:id="stringsList" VBox.vgrow="ALWAYS">
-                <columns>
-                    <TableColumn fx:id="labelColumn" minWidth="75.0" text="%Label"/>
-                    <TableColumn fx:id="contentColumn" minWidth="75.0" text="%Content"/>
-                    <TableColumn fx:id="actionsColumn" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"
-                                 editable="false" resizable="false" reorderable="false"/>
-                </columns>
-                <columnResizePolicy>
-                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
-                </columnResizePolicy>
-            </TableView>
-        </VBox>
-        <VBox>
-            <Button styleClass="icon-button,narrow" onAction="#openHelp">
-                <graphic>
-                    <JabRefIconView glyph="HELP"/>
-                </graphic>
-                <tooltip>
-                    <Tooltip text="%Open Help page"/>
-                </tooltip>
-            </Button>
-            <VBox VBox.vgrow="ALWAYS"/>
-            <Button styleClass="icon-button,narrow" fx:id="addStringButton" minWidth="-Infinity"
-                    onAction="#addString">
-                <graphic>
-                    <JabRefIconView glyph="ADD_NOBOX"/>
-                </graphic>
-                <tooltip>
-                    <Tooltip text="%Add new String"/>
-                </tooltip>
-            </Button>
-        </VBox>
+    <HBox alignment="BOTTOM_LEFT" spacing="8.0">
+        <Label styleClass="sectionHeader" text="%String constants"/>
+        <Button onAction="#openHelp" styleClass="icon-button,narrow">
+            <graphic>
+                <JabRefIconView glyph="HELP"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Open Help page"/>
+            </tooltip>
+        </Button>
+    </HBox>
+    <TableView fx:id="stringsList" VBox.vgrow="ALWAYS">
+        <columns>
+            <TableColumn fx:id="labelColumn" minWidth="75.0" text="%Label"/>
+            <TableColumn fx:id="contentColumn" minWidth="75.0" text="%Content"/>
+            <TableColumn fx:id="actionsColumn" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"
+                         editable="false" resizable="false" reorderable="false"/>
+        </columns>
+        <columnResizePolicy>
+            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+        </columnResizePolicy>
+    </TableView>
+    <HBox alignment="BASELINE_RIGHT" spacing="4.0">
+        <Button fx:id="addStringButton" text="%Add" onAction="#addString">
+            <graphic>
+                <JabRefIconView glyph="ADD_NOBOX"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Add new String"/>
+            </tooltip>
+        </Button>
     </HBox>
 </fx:root>
diff --git a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/keypattern/KeyPatternProperties.fxml b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/keypattern/KeyPatternProperties.fxml
index 8fc959d4cd6..6004240b2e1 100644
--- a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/keypattern/KeyPatternProperties.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/keypattern/KeyPatternProperties.fxml
@@ -4,16 +4,14 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.commonfxcontrols.CitationKeyPatternsPanel?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.libraryproperties.keypattern.KeyPatternPropertiesView">
-    <HBox>
+    <HBox alignment="BOTTOM_LEFT" spacing="8.0">
         <Label styleClass="sectionHeader" text="%Key patterns"/>
-        <Region HBox.hgrow="ALWAYS"/>
-        <Button fx:id="keyPatternHelp" prefWidth="20.0"/>
+        <Button fx:id="keyPatternHelp" styleClass="icon-button,narrow" />
     </HBox>
     <Label text="%( Note: Press return to commit changes in the table! )"/>
     <AnchorPane VBox.vgrow="ALWAYS">
diff --git a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/saving/SavingProperties.fxml b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/saving/SavingProperties.fxml
index 5775cea3d94..03d828fb2ec 100644
--- a/jabgui/src/main/resources/org/jabref/gui/libraryproperties/saving/SavingProperties.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/libraryproperties/saving/SavingProperties.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
@@ -13,8 +14,11 @@
               text="%Refuse to save the library before external changes have been reviewed."/>
 
     <Label styleClass="sectionHeader" text="%Save sort order"/>
-    <SaveOrderConfigPanel fx:id="saveOrderConfigPanel"/>
+    <SaveOrderConfigPanel fx:id="saveOrderConfigPanel" />
 
     <Label styleClass="sectionHeader" text="%Save actions"/>
-    <FieldFormatterCleanupsPanel fx:id="fieldFormatterCleanupsPanel"/>
+    <FieldFormatterCleanupsPanel fx:id="fieldFormatterCleanupsPanel" />
+    <padding>
+        <Insets bottom="12.0" />
+    </padding>
 </fx:root>
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/network/NetworkTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/network/NetworkTab.fxml
index 2d235717ef5..01a70fd72ec 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -137,7 +137,8 @@
         <Button fx:id="addCertificate"
                 mnemonicParsing="false"
                 onAction="#addCertificateFile"
-                text="%Add certificate"
+                styleClass="add-certificate"
+                text="%Browse for certificate..."
                 GridPane.columnIndex="2"
                 GridPane.halignment="RIGHT"
                 GridPane.rowIndex="1"
@@ -146,7 +147,7 @@
                <Insets right="16.0"/>
            </GridPane.margin>
             <graphic>
-                <JabRefIconView glyph="OPEN_LIST"/>
+                <JabRefIconView glyph="ADD_NOBOX"/>
             </graphic>
         </Button>
     </GridPane>
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 9d265722a83..b6a23a166a6 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -2580,7 +2580,7 @@ Symmetric\ word\ by\ word=Symmetric word by word
 Verbatim=Verbatim
 Word\ by\ word=Word by word
 
-Add\ certificate=Add certificate
+Browse\ for\ certificate...=Browse for certificate...
 Serial\ number=Serial number
 Issuer=Issuer
 Valid\ from=Valid from