diff --git a/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
index b0428c93c8..907082f23b 100644
--- a/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
+++ b/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
@@ -17,18 +17,6 @@
 
 package bisq.desktop.main.account.content.fiataccounts;
 
-import bisq.common.UserThread;
-import bisq.common.util.Tuple2;
-import bisq.common.util.Tuple3;
-import bisq.core.app.BisqEnvironment;
-import bisq.core.locale.Res;
-import bisq.core.payment.AccountAgeWitnessService;
-import bisq.core.payment.ClearXchangeAccount;
-import bisq.core.payment.PaymentAccount;
-import bisq.core.payment.PaymentAccountFactory;
-import bisq.core.payment.WesternUnionAccount;
-import bisq.core.payment.payload.PaymentMethod;
-import bisq.core.util.validation.InputValidator;
 import bisq.desktop.common.view.ActivatableViewAndModel;
 import bisq.desktop.common.view.FxmlView;
 import bisq.desktop.components.AutoTooltipButton;
@@ -110,20 +98,21 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.text.TextAlignment;
+
+import javafx.geometry.VPos;
+
+import javafx.beans.value.ChangeListener;
+
+import javafx.collections.FXCollections;
+
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import org.bitcoinj.core.Coin;
 
-import javax.inject.Inject;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
-import static bisq.desktop.util.FormBuilder.add3ButtonsAfterGroup;
-import static bisq.desktop.util.FormBuilder.addLabelComboBox;
-import static bisq.desktop.util.FormBuilder.addLabelListView;
-import static bisq.desktop.util.FormBuilder.addTitledGroupBg;
+import static bisq.desktop.util.FormBuilder.*;
 
 @FxmlView
 public class FiatAccountsView extends ActivatableViewAndModel<GridPane, FiatAccountsViewModel> {
diff --git a/src/main/java/bisq/desktop/main/offer/EditableOfferView.java b/src/main/java/bisq/desktop/main/offer/EditableOfferView.java
index b9b2a25157..2e4dad5c3d 100644
--- a/src/main/java/bisq/desktop/main/offer/EditableOfferView.java
+++ b/src/main/java/bisq/desktop/main/offer/EditableOfferView.java
@@ -71,6 +71,8 @@ import org.bitcoinj.core.Coin;
 import net.glxn.qrgen.QRCode;
 import net.glxn.qrgen.image.ImageType;
 
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
+
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
@@ -120,10 +122,6 @@ import org.jetbrains.annotations.NotNull;
 import static bisq.desktop.util.FormBuilder.*;
 import static javafx.beans.binding.Bindings.createStringBinding;
 
-
-
-import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-
 public abstract class EditableOfferView<M extends EditableOfferViewModel> extends ActivatableViewAndModel<AnchorPane, M> {
     protected final Navigation navigation;
     private final Preferences preferences;
diff --git a/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java b/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
index 0630b02102..d283fc7d33 100644
--- a/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
+++ b/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
@@ -38,6 +38,8 @@ import bisq.core.user.DontShowAgainLookup;
 
 import javax.inject.Inject;
 
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
+
 import javafx.fxml.FXML;
 
 import javafx.scene.control.Button;
@@ -59,10 +61,6 @@ import org.jetbrains.annotations.NotNull;
 
 import static bisq.desktop.util.FormBuilder.getIconButton;
 
-
-
-import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
-
 @FxmlView
 public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersViewModel> {
 
diff --git a/src/main/java/bisq/desktop/util/FormBuilder.java b/src/main/java/bisq/desktop/util/FormBuilder.java
index 5e406a445d..70ecc01291 100644
--- a/src/main/java/bisq/desktop/util/FormBuilder.java
+++ b/src/main/java/bisq/desktop/util/FormBuilder.java
@@ -44,6 +44,8 @@ import bisq.common.util.Tuple4;
 
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
+import de.jensd.fx.glyphs.GlyphIcons;
+import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
 
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -77,11 +79,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
-import de.jensd.fx.glyphs.GlyphIcons;
-import de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory;
-
 public class FormBuilder {
     private static final Logger log = LoggerFactory.getLogger(FormBuilder.class);
     public static final String MATERIAL_DESIGN_ICONS = "'Material Design Icons'";