diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml b/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
index d907efcbd4c..e7b9c5b0fed 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
@@ -28,11 +28,13 @@
             xmlns:fx="http://javafx.com/fxml">
     <Tab fx:id="fiatAccountsTab" closable="false">
         <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    fitToHeight="true"
                     AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
     <Tab fx:id="altcoinAccountsTab" closable="false">
         <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                    fitToHeight="true"
                     AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
                     AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </Tab>
diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java
index c00bb275b54..ba0048bccdf 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java
@@ -173,7 +173,7 @@ protected void buildForm() {
 
         Tuple3<Label, ListView<PaymentAccount>, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.altcoin.yourAltcoinAccounts"), Layout.FIRST_ROW_DISTANCE);
         paymentAccountsListView = tuple.second;
-        paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
+        paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
         setPaymentAccountsCellFactory();
 
         Tuple3<Button, Button, Button> tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"),
diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
index ff10dec601b..4edf7508d42 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
@@ -320,7 +320,7 @@ protected void buildForm() {
 
         Tuple3<Label, ListView<PaymentAccount>, VBox> tuple = addTopLabelListView(root, gridRow, Res.get("account.fiat.yourFiatAccounts"), Layout.FIRST_ROW_DISTANCE);
         paymentAccountsListView = tuple.second;
-        paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
+        paymentAccountsListView.setMinHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
         setPaymentAccountsCellFactory();
 
         Tuple3<Button, Button, Button> tuple3 = add3ButtonsAfterGroup(root, ++gridRow, Res.get("shared.addNewAccount"),
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml
index e8aa70c1942..a4f49d59d32 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingView.fxml
@@ -27,6 +27,7 @@
           AnchorPane.topAnchor="15"/>
 
     <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                fitToHeight="true"
                 AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
                 AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java
index 81e210b4501..6bff38ff018 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/bonds/BondsView.java
@@ -45,6 +45,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 
@@ -98,6 +99,7 @@ private BondsView(BsqFormatter bsqFormatter,
     public void initialize() {
         tableView = FormBuilder.addTableViewWithHeader(root, ++gridRow, Res.get("dao.bond.allBonds.header"), "last");
         tableView.setItems(sortedList);
+        GridPane.setVgrow(tableView, Priority.ALWAYS);
         addColumns();
 
         bondedReputationListener = c -> updateList();
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java
index df699ae6b96..db30a5569fe 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/reputation/MyReputationView.java
@@ -58,6 +58,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.value.ChangeListener;
@@ -147,6 +148,7 @@ public void initialize() {
         tableView = FormBuilder.addTableViewWithHeader(root, ++gridRow, Res.get("dao.bond.reputation.table.header"), 20, "last");
         createColumns();
         tableView.setItems(sortedList);
+        GridPane.setVgrow(tableView, Priority.ALWAYS);
 
         createListeners();
     }
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
index f4949f72152..0e8c4078312 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
@@ -46,6 +46,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
 
@@ -96,7 +97,7 @@ public void initialize() {
         tableView = FormBuilder.addTableViewWithHeader(root, gridRow, Res.get("dao.bond.bondedRoles"), "last");
         createColumns();
         tableView.setItems(sortedList);
-
+        GridPane.setVgrow(tableView, Priority.ALWAYS);
         bondedRoleListChangeListener = c -> updateList();
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml
index e582d9d817a..3a5230561f2 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/dao/burnbsq/BurnBsqView.fxml
@@ -27,6 +27,7 @@
           AnchorPane.topAnchor="15"/>
 
     <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                fitToHeight="true"
                 AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
                 AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml b/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml
index c0377d39c31..a2fa0e12ed2 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml
+++ b/desktop/src/main/java/bisq/desktop/main/dao/monitor/MonitorView.fxml
@@ -27,6 +27,7 @@
           AnchorPane.topAnchor="15"/>
 
     <ScrollPane fitToWidth="true" hbarPolicy="NEVER"
+                fitToHeight="true"
                 AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="270.0"
                 AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <AnchorPane fx:id="content" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java b/desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
index 5712219efb0..a35ce970e3b 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java
@@ -247,6 +247,7 @@ private void createTableView() {
         createColumns();
         GridPane.setRowIndex(tableView, gridRow);
         GridPane.setHgrow(tableView, Priority.ALWAYS);
+        GridPane.setVgrow(tableView, Priority.SOMETIMES);
         GridPane.setMargin(tableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, -25, -10));
         root.getChildren().add(tableView);
 
@@ -267,7 +268,8 @@ private void createDetailsView() {
         createConflictColumns();
         GridPane.setRowIndex(conflictTableView, gridRow);
         GridPane.setHgrow(conflictTableView, Priority.ALWAYS);
-        GridPane.setMargin(conflictTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, -25, -10));
+        GridPane.setVgrow(conflictTableView, Priority.SOMETIMES);
+        GridPane.setMargin(conflictTableView, new Insets(Layout.FIRST_ROW_AND_GROUP_DISTANCE, -10, 5, -10));
         root.getChildren().add(conflictTableView);
 
         conflictTableView.setItems(sortedConflictList);