From e89a71064951669d073658fb4c56fcc26a9ff686 Mon Sep 17 00:00:00 2001
From: NicholasBian <n381636597@gmail.com>
Date: Fri, 21 May 2021 17:44:24 +0800
Subject: [PATCH 01/14] Add a button for icon picker in GroupDialog.fxml, and
 leave openIconPicker functions in GroupDialogView.java and
 GroupDialogViewModel.java for further backend use.

---
 src/main/java/org/jabref/gui/actions/StandardActions.java  | 3 ++-
 src/main/java/org/jabref/gui/groups/GroupDialog.fxml       | 7 +++++++
 src/main/java/org/jabref/gui/groups/GroupDialogView.java   | 5 +++++
 .../java/org/jabref/gui/groups/GroupDialogViewModel.java   | 4 ++++
 src/main/java/org/jabref/gui/icon/IconTheme.java           | 3 ++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 7687ce82990..705ed8d3852 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -167,7 +167,8 @@ public enum StandardActions implements Action {
     OPEN_FORUM(Localization.lang("Online help forum"), Localization.lang("Online help forum"), IconTheme.JabRefIcons.FORUM),
     ERROR_CONSOLE(Localization.lang("View event log"), Localization.lang("Display all error messages")),
     SEARCH_FOR_UPDATES(Localization.lang("Check for updates")),
-    ABOUT(Localization.lang("About JabRef"), Localization.lang("About JabRef"));
+    ABOUT(Localization.lang("About JabRef"), Localization.lang("About JabRef")),
+    SELECT_ICONS(Localization.lang("Open icon panel"), IconTheme.JabRefIcons.SELECT_ICONS);
 
     private final String text;
     private final String description;
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 75053c2749b..48d332cb7bf 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -41,6 +41,13 @@
                     <Label text="%Icon"/>
                     <TextField fx:id="iconField"/>
                 </VBox>
+                <VBox>
+                    <Button onAction="#openIconPicker">
+                        <graphic>
+                                <JabRefIconView glyph="SELECT_ICONS" glyphSize="25"/>
+                        </graphic>
+                    </Button>
+                </VBox>
                 <VBox layoutX="10.0" layoutY="10.0" minWidth="130.0" maxWidth="130.0" prefWidth="130.0">
                     <Label text="%Color"/>
                     <ColorPicker fx:id="colorField"/>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 92883417a99..77699b99bf1 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -165,4 +165,9 @@ private void texGroupBrowse() {
     private void openHelp() {
         viewModel.openHelpPage();
     }
+
+    @FXML
+    private void openIconPicker(){
+        viewModel.openIconPicker();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 05233f2abdc..30f91cef207 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -434,6 +434,10 @@ public void openHelpPage() {
         HelpAction.openHelpPage(HelpFile.GROUPS);
     }
 
+    public void openIconPicker(){
+
+    }
+
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 7389e233c04..a315d55a384 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -331,7 +331,8 @@ public enum JabRefIcons implements JabRefIcon {
         HOME(MaterialDesignH.HOME),
         LINK(MaterialDesignL.LINK),
         LINK_VARIANT(MaterialDesignL.LINK_VARIANT),
-        PROTECT_STRING(MaterialDesignC.CODE_BRACES);
+        PROTECT_STRING(MaterialDesignC.CODE_BRACES),
+        SELECT_ICONS(MaterialDesignA.ALPHA_I_CIRCLE);
 
         private final JabRefIcon icon;
 

From 0c5c8d35106fad6f113fdfa3881da1a0d1908fbe Mon Sep 17 00:00:00 2001
From: NicholasBian <n381636597@gmail.com>
Date: Sat, 22 May 2021 11:43:33 +0800
Subject: [PATCH 02/14] Add a modal dialog box when clicking the icon picker
 button, the controller is coding in GroupDialogView.java, openIconPicker().

---
 .../org/jabref/gui/groups/GroupDialog.fxml    |  2 +-
 .../jabref/gui/groups/GroupDialogView.java    | 45 ++++++++++++++++++-
 .../gui/groups/GroupDialogViewModel.java      |  4 --
 3 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 48d332cb7bf..5c516f2a043 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -42,7 +42,7 @@
                     <TextField fx:id="iconField"/>
                 </VBox>
                 <VBox>
-                    <Button onAction="#openIconPicker">
+                    <Button fx:id="openIconPicker" onAction="#openIconPicker">
                         <graphic>
                                 <JabRefIconView glyph="SELECT_ICONS" glyphSize="25"/>
                         </graphic>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 77699b99bf1..75240859f79 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -1,10 +1,15 @@
 package org.jabref.gui.groups;
 
+import java.io.IOException;
 import java.util.EnumMap;
 
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
+import javafx.scene.Cursor;
+import javafx.scene.Group;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
@@ -12,6 +17,9 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
@@ -32,6 +40,7 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     @FXML private TextField nameField;
     @FXML private TextField descriptionField;
     @FXML private TextField iconField;
+    @FXML private Button openIconPicker;
     @FXML private ColorPicker colorField;
     @FXML private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
 
@@ -167,7 +176,39 @@ private void openHelp() {
     }
 
     @FXML
-    private void openIconPicker(){
-        viewModel.openIconPicker();
+    void openIconPicker(ActionEvent event) throws IOException {
+        System.out.println("clicking the icon picker button");
+        Stage s = new Stage();
+        s.initModality(Modality.APPLICATION_MODAL);
+        s.initStyle(StageStyle.UNDECORATED);
+        s.setHeight(150);
+        s.setWidth(250);
+        s.setX(700);
+        s.setY(550);
+        s.setTitle("Icon Picker");
+
+        //create buttion
+        Button button = new Button();
+        button.setCursor(Cursor.MOVE);//设置鼠标移动到button按钮上的样式
+        button.setText("Close");
+        button.setPrefHeight(60);
+        button.setPrefWidth(150);
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent event) {
+                s.close();
+            }
+        });
+
+        //create Group
+        Group group = new Group();
+        group.getChildren().add(button);
+        //create Scene
+        Scene scene = new Scene(group);
+        scene.setCursor(Cursor.CLOSED_HAND);//设置鼠标移动到scene场景里面的样式
+
+
+        s.setScene(scene);
+        s.show();
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 30f91cef207..05233f2abdc 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -434,10 +434,6 @@ public void openHelpPage() {
         HelpAction.openHelpPage(HelpFile.GROUPS);
     }
 
-    public void openIconPicker(){
-
-    }
-
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();

From ec4c63f333f721a2f2bb8a896b6efef4a879ca33 Mon Sep 17 00:00:00 2001
From: NicholasBian <n381636597@gmail.com>
Date: Sun, 23 May 2021 19:53:28 +0800
Subject: [PATCH 03/14] Modified the structure of the icon picker modal box to
 make it scroll.

---
 .../jabref/gui/groups/GroupDialogView.java    | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 75240859f79..e7f82cbc2f9 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -16,7 +16,11 @@
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.GridPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
@@ -179,34 +183,39 @@ private void openHelp() {
     void openIconPicker(ActionEvent event) throws IOException {
         System.out.println("clicking the icon picker button");
         Stage s = new Stage();
-        s.initModality(Modality.APPLICATION_MODAL);
+//        s.initModality(Modality.APPLICATION_MODAL);
         s.initStyle(StageStyle.UNDECORATED);
-        s.setHeight(150);
-        s.setWidth(250);
+//        s.setHeight(150);
+//        s.setWidth(250);
         s.setX(700);
         s.setY(550);
         s.setTitle("Icon Picker");
 
-        //create buttion
-        Button button = new Button();
-        button.setCursor(Cursor.MOVE);//设置鼠标移动到button按钮上的样式
-        button.setText("Close");
-        button.setPrefHeight(60);
-        button.setPrefWidth(150);
-        button.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                s.close();
-            }
-        });
+        //create FlowPane
+        FlowPane flowPane = new FlowPane();
+        flowPane.setHgap(20);// 设置水平间隙
+        flowPane.setVgap(20);// 设置竖直间隙
+
+        //create ScrollPane
+        ScrollPane scroll = new ScrollPane();
+        scroll.setContent(flowPane);
+        scroll.setPrefSize(300,200);
+
+        //create AnchorPane
+        AnchorPane anchorPane = new AnchorPane();
+        anchorPane.setPrefSize(300, 200);
+        anchorPane.getChildren().add(scroll);
+
+        //create a number of icon buttons on the flowPane
+        for(int i = 0; i < 60; i++){
+            Button tmpbutton = new Button("icon");
+            tmpbutton.setCursor(Cursor.MOVE);
+            flowPane.getChildren().add(tmpbutton);
+        }
 
-        //create Group
-        Group group = new Group();
-        group.getChildren().add(button);
         //create Scene
-        Scene scene = new Scene(group);
-        scene.setCursor(Cursor.CLOSED_HAND);//设置鼠标移动到scene场景里面的样式
-
+        Scene scene = new Scene(anchorPane);
+        scene.setCursor(Cursor.CLOSED_HAND);
 
         s.setScene(scene);
         s.show();

From eafdca515b5e938af40ccd9e493ddade8d32d406 Mon Sep 17 00:00:00 2001
From: NicholasBian <n381636597@gmail.com>
Date: Thu, 27 May 2021 01:36:43 +0800
Subject: [PATCH 04/14] Use TabPane to restructure the icon picker modal box,
 show all icon buttons

---
 .../jabref/gui/groups/GroupDialogView.java    | 142 +++++++++++++-----
 1 file changed, 108 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index e7f82cbc2f9..853de2c6736 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -1,12 +1,16 @@
 package org.jabref.gui.groups;
 
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.util.EnumMap;
+import java.util.EnumSet;
 
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
 import javafx.scene.Cursor;
 import javafx.scene.Group;
 import javafx.scene.Scene;
@@ -17,15 +21,20 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.GridPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -37,6 +46,36 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.javafx.FontIcon;
+import java.util.EnumSet;
+import static java.util.EnumSet.allOf;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignB;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignC;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignD;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignE;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignF;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignG;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignH;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignI;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignJ;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignK;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignL;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignM;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignN;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignO;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignP;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignQ;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignR;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignS;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignT;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignU;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignV;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignW;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignX;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignY;
+import org.kordamp.ikonli.materialdesign2.MaterialDesignZ;
 
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
@@ -179,45 +218,80 @@ private void openHelp() {
         viewModel.openHelpPage();
     }
 
+//    private static int fieldsNum;
     @FXML
-    void openIconPicker(ActionEvent event) throws IOException {
+    void openIconPicker(ActionEvent event) throws Exception {
         System.out.println("clicking the icon picker button");
-        Stage s = new Stage();
-//        s.initModality(Modality.APPLICATION_MODAL);
-        s.initStyle(StageStyle.UNDECORATED);
-//        s.setHeight(150);
-//        s.setWidth(250);
-        s.setX(700);
-        s.setY(550);
-        s.setTitle("Icon Picker");
-
-        //create FlowPane
-        FlowPane flowPane = new FlowPane();
-        flowPane.setHgap(20);// 设置水平间隙
-        flowPane.setVgap(20);// 设置竖直间隙
-
-        //create ScrollPane
-        ScrollPane scroll = new ScrollPane();
-        scroll.setContent(flowPane);
-        scroll.setPrefSize(300,200);
-
-        //create AnchorPane
-        AnchorPane anchorPane = new AnchorPane();
-        anchorPane.setPrefSize(300, 200);
-        anchorPane.getChildren().add(scroll);
-
-        //create a number of icon buttons on the flowPane
-        for(int i = 0; i < 60; i++){
-            Button tmpbutton = new Button("icon");
-            tmpbutton.setCursor(Cursor.MOVE);
-            flowPane.getChildren().add(tmpbutton);
-        }
+
+        TabPane tabPane = new TabPane();
+
+        tabPane.getTabs().add(new IconTab(MaterialDesignA.class, allOf(MaterialDesignA.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignB.class, allOf(MaterialDesignB.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignC.class, allOf(MaterialDesignC.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignD.class, allOf(MaterialDesignD.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignE.class, allOf(MaterialDesignE.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignF.class, allOf(MaterialDesignF.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignG.class, allOf(MaterialDesignG.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignH.class, allOf(MaterialDesignH.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignI.class, allOf(MaterialDesignI.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignJ.class, allOf(MaterialDesignJ.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignK.class, allOf(MaterialDesignK.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignL.class, allOf(MaterialDesignL.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignM.class, allOf(MaterialDesignM.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignN.class, allOf(MaterialDesignN.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignO.class, allOf(MaterialDesignO.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignP.class, allOf(MaterialDesignP.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignQ.class, allOf(MaterialDesignQ.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignR.class, allOf(MaterialDesignR.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignS.class, allOf(MaterialDesignS.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignT.class, allOf(MaterialDesignT.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignU.class, allOf(MaterialDesignU.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignV.class, allOf(MaterialDesignV.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignW.class, allOf(MaterialDesignW.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignX.class, allOf(MaterialDesignX.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignY.class, allOf(MaterialDesignY.class)));
+        tabPane.getTabs().add(new IconTab(MaterialDesignZ.class, allOf(MaterialDesignZ.class)));
 
         //create Scene
-        Scene scene = new Scene(anchorPane);
+        Scene scene = new Scene(tabPane);
         scene.setCursor(Cursor.CLOSED_HAND);
 
-        s.setScene(scene);
-        s.show();
+        Stage stage = new Stage();
+//        s.initModality(Modality.APPLICATION_MODAL);
+        stage.initStyle(StageStyle.UNDECORATED);
+        stage.setX(700);
+        stage.setY(550);
+        stage.setTitle("Icon Picker");
+        stage.setScene(scene);
+        stage.setWidth(512);
+        stage.setHeight(400);
+        stage.show();
     }
+
+    private static class IconTab extends Tab {
+        private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) throws Exception {
+            super(iconFontClass.getSimpleName());
+            setClosable(false);
+            GridPane pane = new GridPane();
+
+            int column = 0;
+            int row = 0;
+            int index = 0;
+            for (Ikon value : enumSet) {
+                FontIcon icon = FontIcon.of(value);
+                icon.getStyleClass().setAll("font-icon");
+                Button button = new Button();
+                button.setGraphic(icon);
+                pane.add(button, column++, row);
+                GridPane.setMargin(button, new Insets(10, 10, 10, 10));
+                if (++index % 10 == 0) {
+                    column = 0;
+                    row++;
+                }
+            }
+            ScrollPane scrollPane = new ScrollPane(pane);
+            setContent(scrollPane);
+        }
+    }
+
 }

From dc3fd825f53d471a1ca3775d8dc4cc7dda6bc3b7 Mon Sep 17 00:00:00 2001
From: NicholasBian <n381636597@gmail.com>
Date: Thu, 27 May 2021 16:11:19 +0800
Subject: [PATCH 05/14] Finished the icon picker function and waiting to be
 tested.

---
 .../org/jabref/gui/groups/GroupDialogView.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 853de2c6736..7d5717f2c38 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -218,9 +218,8 @@ private void openHelp() {
         viewModel.openHelpPage();
     }
 
-//    private static int fieldsNum;
     @FXML
-    void openIconPicker(ActionEvent event) throws Exception {
+    private void openIconPicker(ActionEvent event) throws Exception {
         System.out.println("clicking the icon picker button");
 
         TabPane tabPane = new TabPane();
@@ -257,7 +256,6 @@ void openIconPicker(ActionEvent event) throws Exception {
         scene.setCursor(Cursor.CLOSED_HAND);
 
         Stage stage = new Stage();
-//        s.initModality(Modality.APPLICATION_MODAL);
         stage.initStyle(StageStyle.UNDECORATED);
         stage.setX(700);
         stage.setY(550);
@@ -268,7 +266,7 @@ void openIconPicker(ActionEvent event) throws Exception {
         stage.show();
     }
 
-    private static class IconTab extends Tab {
+    private class IconTab extends Tab {
         private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) throws Exception {
             super(iconFontClass.getSimpleName());
             setClosable(false);
@@ -282,6 +280,14 @@ private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enu
                 icon.getStyleClass().setAll("font-icon");
                 Button button = new Button();
                 button.setGraphic(icon);
+                button.setOnAction(new EventHandler<ActionEvent>() {
+                    @Override
+                    public void handle(ActionEvent event) {
+                        iconField.textProperty().setValue(String.valueOf(icon.getIconCode()));
+                        Stage stage = (Stage) button.getScene().getWindow();
+                        stage.close();
+                    }
+                });
                 pane.add(button, column++, row);
                 GridPane.setMargin(button, new Insets(10, 10, 10, 10));
                 if (++index % 10 == 0) {

From 1bb2f3683ddf0db96a7968b98ef3bc374be22454 Mon Sep 17 00:00:00 2001
From: Basil <62039344+BasilDimopoulos@users.noreply.github.com>
Date: Sun, 30 May 2021 21:52:18 +0930
Subject: [PATCH 06/14] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ccffeeca5..72c81a25a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added a feature that allows the user to choose whether to trust the target site when unable to find a valid certification path from the file download site. [#7616](https://github.com/JabRef/jabref/issues/7616)
 - We added a feature that allows the user to open all linked files of multiple selected entries by "Open file" option. [#6966](https://github.com/JabRef/jabref/issues/6966)
 - We added a keybinding preset for new entries. [#7705](https://github.com/JabRef/jabref/issues/7705)
+- We added an icon picker in group edit dialog that fills out the text field for generating icons automatically. [#6142](https://github.com/JabRef/jabref/issues/6142)
 
 ### Changed
 

From 208941c2c678d44b44bf2e6681aee4da8c124f06 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 16 Aug 2021 22:08:42 +0200
Subject: [PATCH 07/14] Fixed imports, applied intellij suggestions

---
 .../jabref/gui/groups/GroupDialogView.java    | 41 +++++--------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 3bc7782974d..1439c261ca0 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -1,18 +1,13 @@
 package org.jabref.gui.groups;
 
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.EnumMap;
 import java.util.EnumSet;
 
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Insets;
 import javafx.scene.Cursor;
-import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -24,17 +19,11 @@
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.GridPane;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -50,8 +39,6 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.javafx.FontIcon;
-import java.util.EnumSet;
-import static java.util.EnumSet.allOf;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignB;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignC;
@@ -79,13 +66,14 @@
 import org.kordamp.ikonli.materialdesign2.MaterialDesignY;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignZ;
 
+import static java.util.EnumSet.allOf;
+
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
     // Basic Settings
     @FXML private TextField nameField;
     @FXML private TextField descriptionField;
     @FXML private TextField iconField;
-    @FXML private Button openIconPicker;
     @FXML private ColorPicker colorField;
     @FXML private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
 
@@ -221,13 +209,8 @@ public void initialize() {
         });
 
         // Binding to the button throws a NPE, since it doesn't exist yet. Working around.
-        viewModel.validationStatus().validProperty().addListener((obs, _oldValue, validationStatus) -> {
-            if (validationStatus) {
-                getDialogPane().lookupButton(ButtonType.OK).setDisable(false);
-            } else {
-                getDialogPane().lookupButton(ButtonType.OK).setDisable(true);
-            }
-        });
+        viewModel.validationStatus().validProperty().addListener((obs, _oldValue, validationStatus) ->
+                getDialogPane().lookupButton(ButtonType.OK).setDisable(!validationStatus));
     }
 
     @FXML
@@ -241,7 +224,7 @@ private void openHelp() {
     }
 
     @FXML
-    private void openIconPicker(ActionEvent event) throws Exception {
+    private void openIconPicker() {
         System.out.println("clicking the icon picker button");
 
         TabPane tabPane = new TabPane();
@@ -289,7 +272,7 @@ private void openIconPicker(ActionEvent event) throws Exception {
     }
 
     private class IconTab extends Tab {
-        private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) throws Exception {
+        private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) {
             super(iconFontClass.getSimpleName());
             setClosable(false);
             GridPane pane = new GridPane();
@@ -302,13 +285,10 @@ private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enu
                 icon.getStyleClass().setAll("font-icon");
                 Button button = new Button();
                 button.setGraphic(icon);
-                button.setOnAction(new EventHandler<ActionEvent>() {
-                    @Override
-                    public void handle(ActionEvent event) {
-                        iconField.textProperty().setValue(String.valueOf(icon.getIconCode()));
-                        Stage stage = (Stage) button.getScene().getWindow();
-                        stage.close();
-                    }
+                button.setOnAction(event -> {
+                    iconField.textProperty().setValue(String.valueOf(icon.getIconCode()));
+                    Stage stage = (Stage) button.getScene().getWindow();
+                    stage.close();
                 });
                 pane.add(button, column++, row);
                 GridPane.setMargin(button, new Insets(10, 10, 10, 10));
@@ -321,5 +301,4 @@ public void handle(ActionEvent event) {
             setContent(scrollPane);
         }
     }
-
 }

From 7f8929cda32e4cac96ae74aa389ee177f91afae3 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 16 Aug 2021 23:49:50 +0200
Subject: [PATCH 08/14] Integrated controlsfx GridView

---
 .../jabref/gui/groups/GroupDialogView.java    | 111 ++++++++----------
 1 file changed, 50 insertions(+), 61 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 1439c261ca0..b11d0a44881 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -4,9 +4,9 @@
 import java.util.EnumSet;
 
 import javafx.application.Platform;
+import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.geometry.Insets;
 import javafx.scene.Cursor;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -15,11 +15,7 @@
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
 import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 
@@ -37,6 +33,8 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import org.controlsfx.control.GridCell;
+import org.controlsfx.control.GridView;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
@@ -225,39 +223,38 @@ private void openHelp() {
 
     @FXML
     private void openIconPicker() {
-        System.out.println("clicking the icon picker button");
-
-        TabPane tabPane = new TabPane();
-
-        tabPane.getTabs().add(new IconTab(MaterialDesignA.class, allOf(MaterialDesignA.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignB.class, allOf(MaterialDesignB.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignC.class, allOf(MaterialDesignC.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignD.class, allOf(MaterialDesignD.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignE.class, allOf(MaterialDesignE.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignF.class, allOf(MaterialDesignF.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignG.class, allOf(MaterialDesignG.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignH.class, allOf(MaterialDesignH.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignI.class, allOf(MaterialDesignI.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignJ.class, allOf(MaterialDesignJ.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignK.class, allOf(MaterialDesignK.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignL.class, allOf(MaterialDesignL.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignM.class, allOf(MaterialDesignM.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignN.class, allOf(MaterialDesignN.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignO.class, allOf(MaterialDesignO.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignP.class, allOf(MaterialDesignP.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignQ.class, allOf(MaterialDesignQ.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignR.class, allOf(MaterialDesignR.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignS.class, allOf(MaterialDesignS.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignT.class, allOf(MaterialDesignT.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignU.class, allOf(MaterialDesignU.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignV.class, allOf(MaterialDesignV.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignW.class, allOf(MaterialDesignW.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignX.class, allOf(MaterialDesignX.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignY.class, allOf(MaterialDesignY.class)));
-        tabPane.getTabs().add(new IconTab(MaterialDesignZ.class, allOf(MaterialDesignZ.class)));
+        GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
+        ikonGridView.setCellFactory(gridView -> new IkonliCell());
+
+        ikonGridView.getItems().addAll(allOf(MaterialDesignA.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignB.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignC.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignD.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignE.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignF.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignG.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignH.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignI.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignJ.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignK.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignL.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignM.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignN.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignO.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignP.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignQ.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignR.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignS.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignT.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignU.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignV.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignW.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignX.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignY.class));
+        ikonGridView.getItems().addAll(allOf(MaterialDesignZ.class));
 
         //create Scene
-        Scene scene = new Scene(tabPane);
+        Scene scene = new Scene(ikonGridView);
         scene.setCursor(Cursor.CLOSED_HAND);
 
         Stage stage = new Stage();
@@ -271,34 +268,26 @@ private void openIconPicker() {
         stage.show();
     }
 
-    private class IconTab extends Tab {
-        private IconTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) {
-            super(iconFontClass.getSimpleName());
-            setClosable(false);
-            GridPane pane = new GridPane();
-
-            int column = 0;
-            int row = 0;
-            int index = 0;
-            for (Ikon value : enumSet) {
-                FontIcon icon = FontIcon.of(value);
-                icon.getStyleClass().setAll("font-icon");
-                Button button = new Button();
-                button.setGraphic(icon);
-                button.setOnAction(event -> {
-                    iconField.textProperty().setValue(String.valueOf(icon.getIconCode()));
-                    Stage stage = (Stage) button.getScene().getWindow();
+    public class IkonliCell extends GridCell<Ikon> {
+        @Override
+        protected void updateItem(Ikon ikon, boolean empty) {
+            super.updateItem(ikon, empty);
+            if (empty || ikon == null) {
+                setText(null);
+                setGraphic(null);
+            } else {
+                FontIcon fontIcon = FontIcon.of(ikon);
+                setGraphic(fontIcon);
+                fontIcon.getStyleClass().setAll("font-icon");
+
+                // setText(ikon.getDescription());
+                // setStyle("-fx-background-color: #ffffff; -fx-background-radius: 15; -fx-border-radius: 15; -fx-border-width: 0; -fx-padding: 10; -fx-pref-width: 145; -fx-max-width: 145; -fx-max-width: 145; -fx-pref-height: 130; -fx-max-height: 130; -fx-effect: dropshadow(three-pass-box, #93948d, 10, 0, 0, 0);");
+                setOnMouseClicked(event -> {
+                    iconField.textProperty().setValue(String.valueOf(fontIcon.getIconCode()));
+                    Stage stage = (Stage) this.getGridView().getScene().getWindow();
                     stage.close();
                 });
-                pane.add(button, column++, row);
-                GridPane.setMargin(button, new Insets(10, 10, 10, 10));
-                if (++index % 10 == 0) {
-                    column = 0;
-                    row++;
-                }
             }
-            ScrollPane scrollPane = new ScrollPane(pane);
-            setContent(scrollPane);
         }
     }
 }

From 0369a2be72f9c07ff64c1b38eb3d678ca962db6e Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 00:13:57 +0200
Subject: [PATCH 09/14] WIP

---
 .../java/org/jabref/gui/groups/GroupDialog.fxml  | 16 ++++++++--------
 .../org/jabref/gui/groups/GroupDialogView.java   |  7 +++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 5c516f2a043..3e350a8f080 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -39,14 +39,14 @@
             <HBox spacing="10.0">
                 <VBox HBox.hgrow="ALWAYS">
                     <Label text="%Icon"/>
-                    <TextField fx:id="iconField"/>
-                </VBox>
-                <VBox>
-                    <Button fx:id="openIconPicker" onAction="#openIconPicker">
-                        <graphic>
-                                <JabRefIconView glyph="SELECT_ICONS" glyphSize="25"/>
-                        </graphic>
-                    </Button>
+                    <HBox>
+                        <TextField fx:id="iconField"/>
+                        <Button onAction="#openIconPicker" styleClass="icon-button">
+                            <graphic>
+                                <JabRefIconView glyph="SELECT_ICONS"/>
+                            </graphic>
+                        </Button>
+                    </HBox>
                 </VBox>
                 <VBox layoutX="10.0" layoutY="10.0" minWidth="130.0" maxWidth="130.0" prefWidth="130.0">
                     <Label text="%Color"/>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index b11d0a44881..d46e73a9f23 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -253,7 +253,6 @@ private void openIconPicker() {
         ikonGridView.getItems().addAll(allOf(MaterialDesignY.class));
         ikonGridView.getItems().addAll(allOf(MaterialDesignZ.class));
 
-        //create Scene
         Scene scene = new Scene(ikonGridView);
         scene.setCursor(Cursor.CLOSED_HAND);
 
@@ -277,11 +276,11 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 setGraphic(null);
             } else {
                 FontIcon fontIcon = FontIcon.of(ikon);
-                setGraphic(fontIcon);
                 fontIcon.getStyleClass().setAll("font-icon");
+                fontIcon.setIconSize(22);
+                //fontIcon.setStyle("-fx-background-color: #ffffff; -fx-background-radius: 15; -fx-border-radius: 15; -fx-border-width: 0; -fx-padding: 10; -fx-pref-width: 145; -fx-max-width: 145; -fx-pref-height: 130; -fx-max-height: 130; -fx-effect: dropshadow(three-pass-box, #93948d, 10, 0, 0, 0);");
+                setGraphic(fontIcon);
 
-                // setText(ikon.getDescription());
-                // setStyle("-fx-background-color: #ffffff; -fx-background-radius: 15; -fx-border-radius: 15; -fx-border-width: 0; -fx-padding: 10; -fx-pref-width: 145; -fx-max-width: 145; -fx-max-width: 145; -fx-pref-height: 130; -fx-max-height: 130; -fx-effect: dropshadow(three-pass-box, #93948d, 10, 0, 0, 0);");
                 setOnMouseClicked(event -> {
                     iconField.textProperty().setValue(String.valueOf(fontIcon.getIconCode()));
                     Stage stage = (Stage) this.getGridView().getScene().getWindow();

From 1b64debd8151926737f7f84451ca40300a2efa0b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 00:25:34 +0200
Subject: [PATCH 10/14] Fixed old workaround

---
 .../java/org/jabref/gui/groups/GroupDialogView.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index d46e73a9f23..cd0fb326980 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -107,7 +107,11 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
     private final GroupDialogViewModel viewModel;
 
-    public GroupDialogView(DialogService dialogService, BibDatabaseContext currentDatabase, PreferencesService preferencesService, AbstractGroup editedGroup, GroupDialogHeader groupDialogHeader) {
+    public GroupDialogView(DialogService dialogService,
+                           BibDatabaseContext currentDatabase,
+                           PreferencesService preferencesService,
+                           AbstractGroup editedGroup,
+                           GroupDialogHeader groupDialogHeader) {
         viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, groupDialogHeader);
 
         ViewLoader.view(this)
@@ -128,6 +132,7 @@ public GroupDialogView(DialogService dialogService, BibDatabaseContext currentDa
         getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
+        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
         // handle validation before closing dialog and calling resultConverter
         confirmDialogButton.addEventFilter(ActionEvent.ACTION, viewModel::validationHandler);
     }
@@ -205,10 +210,6 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
             nameField.requestFocus();
         });
-
-        // Binding to the button throws a NPE, since it doesn't exist yet. Working around.
-        viewModel.validationStatus().validProperty().addListener((obs, _oldValue, validationStatus) ->
-                getDialogPane().lookupButton(ButtonType.OK).setDisable(!validationStatus));
     }
 
     @FXML
@@ -278,7 +279,6 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 FontIcon fontIcon = FontIcon.of(ikon);
                 fontIcon.getStyleClass().setAll("font-icon");
                 fontIcon.setIconSize(22);
-                //fontIcon.setStyle("-fx-background-color: #ffffff; -fx-background-radius: 15; -fx-border-radius: 15; -fx-border-width: 0; -fx-padding: 10; -fx-pref-width: 145; -fx-max-width: 145; -fx-pref-height: 130; -fx-max-height: 130; -fx-effect: dropshadow(three-pass-box, #93948d, 10, 0, 0, 0);");
                 setGraphic(fontIcon);
 
                 setOnMouseClicked(event -> {

From 656b154d0067e487f7d132a07a76abacbff84c7b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 18:28:14 +0200
Subject: [PATCH 11/14] Added searchbox and converted stage to popover

---
 .../org/jabref/gui/groups/GroupDialog.fxml    |   2 +-
 .../jabref/gui/groups/GroupDialogView.java    | 104 ++++++++++--------
 2 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 3e350a8f080..502d54354d6 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -41,7 +41,7 @@
                     <Label text="%Icon"/>
                     <HBox>
                         <TextField fx:id="iconField"/>
-                        <Button onAction="#openIconPicker" styleClass="icon-button">
+                        <Button fx:id="iconPickerButton" onAction="#openIconPicker" styleClass="icon-button">
                             <graphic>
                                 <JabRefIconView glyph="SELECT_ICONS"/>
                             </graphic>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index cd0fb326980..0f0554e7b1c 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -5,10 +5,12 @@
 
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.transformation.FilteredList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.Cursor;
-import javafx.scene.Scene;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
@@ -16,10 +18,10 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
+import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -35,6 +37,8 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.GridCell;
 import org.controlsfx.control.GridView;
+import org.controlsfx.control.PopOver;
+import org.controlsfx.control.textfield.CustomTextField;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
@@ -72,6 +76,7 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     @FXML private TextField nameField;
     @FXML private TextField descriptionField;
     @FXML private TextField iconField;
+    @FXML private Button iconPickerButton;
     @FXML private ColorPicker colorField;
     @FXML private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
 
@@ -224,48 +229,56 @@ private void openHelp() {
 
     @FXML
     private void openIconPicker() {
+        ObservableList<Ikon> ikonList = FXCollections.observableArrayList();
+        FilteredList<Ikon> filteredList = new FilteredList<>(ikonList);
+
+        ikonList.addAll(allOf(MaterialDesignA.class));
+        ikonList.addAll(allOf(MaterialDesignB.class));
+        ikonList.addAll(allOf(MaterialDesignC.class));
+        ikonList.addAll(allOf(MaterialDesignD.class));
+        ikonList.addAll(allOf(MaterialDesignE.class));
+        ikonList.addAll(allOf(MaterialDesignF.class));
+        ikonList.addAll(allOf(MaterialDesignG.class));
+        ikonList.addAll(allOf(MaterialDesignI.class));
+        ikonList.addAll(allOf(MaterialDesignJ.class));
+        ikonList.addAll(allOf(MaterialDesignH.class));
+        ikonList.addAll(allOf(MaterialDesignK.class));
+        ikonList.addAll(allOf(MaterialDesignL.class));
+        ikonList.addAll(allOf(MaterialDesignM.class));
+        ikonList.addAll(allOf(MaterialDesignN.class));
+        ikonList.addAll(allOf(MaterialDesignO.class));
+        ikonList.addAll(allOf(MaterialDesignP.class));
+        ikonList.addAll(allOf(MaterialDesignQ.class));
+        ikonList.addAll(allOf(MaterialDesignR.class));
+        ikonList.addAll(allOf(MaterialDesignS.class));
+        ikonList.addAll(allOf(MaterialDesignT.class));
+        ikonList.addAll(allOf(MaterialDesignU.class));
+        ikonList.addAll(allOf(MaterialDesignV.class));
+        ikonList.addAll(allOf(MaterialDesignW.class));
+        ikonList.addAll(allOf(MaterialDesignX.class));
+        ikonList.addAll(allOf(MaterialDesignY.class));
+        ikonList.addAll(allOf(MaterialDesignZ.class));
+
+        CustomTextField searchBox = new CustomTextField();
+        searchBox.setPromptText(Localization.lang("Search") + "...");
+        searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
+        searchBox.textProperty().addListener((obs, oldValue, newValue) ->
+                filteredList.setPredicate(ikon -> newValue.isEmpty() || ikon.getDescription().toLowerCase()
+                                                                            .contains(newValue.toLowerCase())));
+
         GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
         ikonGridView.setCellFactory(gridView -> new IkonliCell());
+        ikonGridView.setPrefWidth(540);
+        ikonGridView.setPrefHeight(400);
+        ikonGridView.setItems(filteredList);
+
+        VBox vBox = new VBox(10, searchBox, ikonGridView);
+        vBox.setPadding(new Insets(10, 10, 10, 10));
 
-        ikonGridView.getItems().addAll(allOf(MaterialDesignA.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignB.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignC.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignD.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignE.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignF.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignG.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignH.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignI.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignJ.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignK.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignL.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignM.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignN.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignO.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignP.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignQ.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignR.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignS.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignT.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignU.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignV.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignW.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignX.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignY.class));
-        ikonGridView.getItems().addAll(allOf(MaterialDesignZ.class));
-
-        Scene scene = new Scene(ikonGridView);
-        scene.setCursor(Cursor.CLOSED_HAND);
-
-        Stage stage = new Stage();
-        stage.initStyle(StageStyle.UNDECORATED);
-        stage.setX(700);
-        stage.setY(550);
-        stage.setTitle("Icon Picker");
-        stage.setScene(scene);
-        stage.setWidth(512);
-        stage.setHeight(400);
-        stage.show();
+        PopOver popOver = new PopOver(vBox);
+        popOver.setDetachable(false);
+        popOver.setTitle("Icon picker");
+        popOver.show(iconPickerButton);
     }
 
     public class IkonliCell extends GridCell<Ikon> {
@@ -280,11 +293,12 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 fontIcon.getStyleClass().setAll("font-icon");
                 fontIcon.setIconSize(22);
                 setGraphic(fontIcon);
+                setAlignment(Pos.BASELINE_CENTER);
 
                 setOnMouseClicked(event -> {
                     iconField.textProperty().setValue(String.valueOf(fontIcon.getIconCode()));
-                    Stage stage = (Stage) this.getGridView().getScene().getWindow();
-                    stage.close();
+                    PopOver stage = (PopOver) this.getGridView().getParent().getScene().getWindow();
+                    stage.hide();
                 });
             }
         }

From 33b36d2956a811a4a4a3d95c5a4315cf0740149e Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 19:00:17 +0200
Subject: [PATCH 12/14] Added borders to icons, fixed changelog and l10n

---
 CHANGELOG.md                                          |  2 +-
 .../java/org/jabref/gui/actions/StandardActions.java  |  3 +--
 src/main/java/org/jabref/gui/groups/GroupDialog.fxml  |  2 +-
 .../java/org/jabref/gui/groups/GroupDialogView.java   | 11 ++++++++++-
 src/main/java/org/jabref/gui/icon/IconTheme.java      |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bb3022e4f..be815db3ce3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826)
 - We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838)
 - We added unprotect_terms to the list of bracketed pattern modifiers [#7826](https://github.com/JabRef/jabref/pull/7960)
+- We added an icon picker in group edit dialog. [#6142](https://github.com/JabRef/jabref/issues/6142)
 
 ### Changed
 
@@ -150,7 +151,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added a feature that allows the user to choose whether to trust the target site when unable to find a valid certification path from the file download site. [#7616](https://github.com/JabRef/jabref/issues/7616)
 - We added a feature that allows the user to open all linked files of multiple selected entries by "Open file" option. [#6966](https://github.com/JabRef/jabref/issues/6966)
 - We added a keybinding preset for new entries. [#7705](https://github.com/JabRef/jabref/issues/7705)
-- We added an icon picker in group edit dialog that fills out the text field for generating icons automatically. [#6142](https://github.com/JabRef/jabref/issues/6142)
 - We added a select all button for the library import function. [#7786](https://github.com/JabRef/jabref/issues/7786)
 - We added a search feature for journal abbreviations. [#7804](https://github.com/JabRef/jabref/pull/7804)
 - We added auto-key-generation progress to the background task list. [#7267](https://github.com/JabRef/jabref/issues/72)
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 77e4156ec62..2aca942782f 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -173,8 +173,7 @@ public enum StandardActions implements Action {
     OPEN_FORUM(Localization.lang("Online help forum"), Localization.lang("Online help forum"), IconTheme.JabRefIcons.FORUM),
     ERROR_CONSOLE(Localization.lang("View event log"), Localization.lang("Display all error messages")),
     SEARCH_FOR_UPDATES(Localization.lang("Check for updates")),
-    ABOUT(Localization.lang("About JabRef"), Localization.lang("About JabRef")),
-    SELECT_ICONS(Localization.lang("Open icon panel"), IconTheme.JabRefIcons.SELECT_ICONS);
+    ABOUT(Localization.lang("About JabRef"), Localization.lang("About JabRef"));
 
     private final String text;
     private final String description;
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 502d54354d6..3d12f80abbc 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -41,7 +41,7 @@
                     <Label text="%Icon"/>
                     <HBox>
                         <TextField fx:id="iconField"/>
-                        <Button fx:id="iconPickerButton" onAction="#openIconPicker" styleClass="icon-button">
+                        <Button fx:id="iconPickerButton" onAction="#openIconPicker" styleClass="icon-button,narrow">
                             <graphic>
                                 <JabRefIconView glyph="SELECT_ICONS"/>
                             </graphic>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 0f0554e7b1c..ed2c1b9bc04 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -18,7 +18,12 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.Border;
+import javafx.scene.layout.BorderStroke;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
@@ -270,10 +275,12 @@ private void openIconPicker() {
         ikonGridView.setCellFactory(gridView -> new IkonliCell());
         ikonGridView.setPrefWidth(540);
         ikonGridView.setPrefHeight(400);
+        ikonGridView.setHorizontalCellSpacing(4);
+        ikonGridView.setVerticalCellSpacing(4);
         ikonGridView.setItems(filteredList);
 
         VBox vBox = new VBox(10, searchBox, ikonGridView);
-        vBox.setPadding(new Insets(10, 10, 10, 10));
+        vBox.setPadding(new Insets(10));
 
         PopOver popOver = new PopOver(vBox);
         popOver.setDetachable(false);
@@ -294,6 +301,8 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 fontIcon.setIconSize(22);
                 setGraphic(fontIcon);
                 setAlignment(Pos.BASELINE_CENTER);
+                setPadding(new Insets(1));
+                setBorder(new Border(new BorderStroke(Color.BLACK, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderStroke.THIN)));
 
                 setOnMouseClicked(event -> {
                     iconField.textProperty().setValue(String.valueOf(fontIcon.getIconCode()));
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index d9de8b1f97b..da489a20c47 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -334,7 +334,7 @@ public enum JabRefIcons implements JabRefIcon {
         LINK(MaterialDesignL.LINK),
         LINK_VARIANT(MaterialDesignL.LINK_VARIANT),
         PROTECT_STRING(MaterialDesignC.CODE_BRACES),
-        SELECT_ICONS(MaterialDesignA.ALPHA_I_CIRCLE);
+        SELECT_ICONS(MaterialDesignA.APPS);
 
         private final JabRefIcon icon;
 

From d1ec503324cd7b9a7cf22008947fdfa7b5f8bd71 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 19:04:08 +0200
Subject: [PATCH 13/14] Removed corner radius for consistency

---
 src/main/java/org/jabref/gui/groups/GroupDialogView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index ed2c1b9bc04..12b12f799d0 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -273,7 +273,7 @@ private void openIconPicker() {
 
         GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
         ikonGridView.setCellFactory(gridView -> new IkonliCell());
-        ikonGridView.setPrefWidth(540);
+        ikonGridView.setPrefWidth(520);
         ikonGridView.setPrefHeight(400);
         ikonGridView.setHorizontalCellSpacing(4);
         ikonGridView.setVerticalCellSpacing(4);
@@ -284,6 +284,8 @@ private void openIconPicker() {
 
         PopOver popOver = new PopOver(vBox);
         popOver.setDetachable(false);
+        popOver.setArrowSize(0);
+        popOver.setCornerRadius(0);
         popOver.setTitle("Icon picker");
         popOver.show(iconPickerButton);
     }

From ec0b7e8349e1a9ac33cd6b03656eb565cc60cb85 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 17 Aug 2021 21:22:34 +0200
Subject: [PATCH 14/14] Load ikons directly from the IkonProvider

Co-authored-by: siedlerchr siedlerkiller@gmail.com
---
 .../jabref/gui/groups/GroupDialogView.java    | 62 +++----------------
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 12b12f799d0..c03d9476945 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -2,6 +2,7 @@
 
 import java.util.EnumMap;
 import java.util.EnumSet;
+import java.util.ServiceLoader;
 
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -27,6 +28,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabrefIconProvider;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -45,35 +47,8 @@
 import org.controlsfx.control.PopOver;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.javafx.FontIcon;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignB;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignC;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignD;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignE;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignF;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignG;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignH;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignI;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignJ;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignK;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignL;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignM;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignN;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignO;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignP;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignQ;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignR;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignS;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignT;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignU;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignV;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignW;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignX;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignY;
-import org.kordamp.ikonli.materialdesign2.MaterialDesignZ;
-
-import static java.util.EnumSet.allOf;
 
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
@@ -237,32 +212,11 @@ private void openIconPicker() {
         ObservableList<Ikon> ikonList = FXCollections.observableArrayList();
         FilteredList<Ikon> filteredList = new FilteredList<>(ikonList);
 
-        ikonList.addAll(allOf(MaterialDesignA.class));
-        ikonList.addAll(allOf(MaterialDesignB.class));
-        ikonList.addAll(allOf(MaterialDesignC.class));
-        ikonList.addAll(allOf(MaterialDesignD.class));
-        ikonList.addAll(allOf(MaterialDesignE.class));
-        ikonList.addAll(allOf(MaterialDesignF.class));
-        ikonList.addAll(allOf(MaterialDesignG.class));
-        ikonList.addAll(allOf(MaterialDesignI.class));
-        ikonList.addAll(allOf(MaterialDesignJ.class));
-        ikonList.addAll(allOf(MaterialDesignH.class));
-        ikonList.addAll(allOf(MaterialDesignK.class));
-        ikonList.addAll(allOf(MaterialDesignL.class));
-        ikonList.addAll(allOf(MaterialDesignM.class));
-        ikonList.addAll(allOf(MaterialDesignN.class));
-        ikonList.addAll(allOf(MaterialDesignO.class));
-        ikonList.addAll(allOf(MaterialDesignP.class));
-        ikonList.addAll(allOf(MaterialDesignQ.class));
-        ikonList.addAll(allOf(MaterialDesignR.class));
-        ikonList.addAll(allOf(MaterialDesignS.class));
-        ikonList.addAll(allOf(MaterialDesignT.class));
-        ikonList.addAll(allOf(MaterialDesignU.class));
-        ikonList.addAll(allOf(MaterialDesignV.class));
-        ikonList.addAll(allOf(MaterialDesignW.class));
-        ikonList.addAll(allOf(MaterialDesignX.class));
-        ikonList.addAll(allOf(MaterialDesignY.class));
-        ikonList.addAll(allOf(MaterialDesignZ.class));
+        for (IkonProvider provider : ServiceLoader.load(IkonProvider.class.getModule().getLayer(), IkonProvider.class)) {
+            if (provider.getClass() != JabrefIconProvider.class) {
+                ikonList.addAll(EnumSet.allOf(provider.getIkon()));
+            }
+        }
 
         CustomTextField searchBox = new CustomTextField();
         searchBox.setPromptText(Localization.lang("Search") + "...");