diff --git a/build.xml b/build.xml
index 356fce7a9..304f49932 100755
--- a/build.xml
+++ b/build.xml
@@ -28,9 +28,9 @@
               value="${freecol.src.dir}/overview.html"/>
     <property name="test" value="AllTests"/>
     <property name="miglayout-swing.jar"
-              value="jars/miglayout-swing-5.0.jar"/>
+              value="jars/miglayout-swing-5.3.jar"/>
     <property name="miglayout-core.jar"
-              value="jars/miglayout-core-5.0.jar"/>
+              value="jars/miglayout-core-5.3.jar"/>
     <property name="cli.jar" value="jars/commons-cli-1.4.jar"/>
     <property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>
 
diff --git a/jars/miglayout-core-5.0.jar b/jars/miglayout-core-5.0.jar
deleted file mode 100644
index 1211b7016..000000000
Binary files a/jars/miglayout-core-5.0.jar and /dev/null differ
diff --git a/jars/miglayout-core-5.3.jar b/jars/miglayout-core-5.3.jar
new file mode 100644
index 000000000..9c410ec6a
Binary files /dev/null and b/jars/miglayout-core-5.3.jar differ
diff --git a/jars/miglayout-swing-5.0.jar b/jars/miglayout-swing-5.0.jar
deleted file mode 100644
index 6a4df9687..000000000
Binary files a/jars/miglayout-swing-5.0.jar and /dev/null differ
diff --git a/jars/miglayout-swing-5.3.jar b/jars/miglayout-swing-5.3.jar
new file mode 100644
index 000000000..6aea1c249
Binary files /dev/null and b/jars/miglayout-swing-5.3.jar differ
diff --git a/src/net/sf/freecol/client/gui/panel/BuildingPanel.java b/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
index 6331df346..358300dc7 100644
--- a/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/BuildingPanel.java
@@ -76,7 +76,7 @@ public class BuildingPanel extends MigPanel implements PropertyChangeListener {
      * @param building The building to display information from.
      */
     public BuildingPanel(FreeColClient freeColClient, Building building) {
-        super(new MigLayout("", "[16!][16!][16!]", "[16!][22!]"));
+        super(new MigLayout("", "[32!][32!][32!]", "[32!][44!]"));
 
         this.freeColClient = freeColClient;
         this.building = building;
diff --git a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
index 85ef3352f..bdf276f65 100644
--- a/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
+++ b/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
@@ -512,10 +512,10 @@ public final class ColonyPanel extends PortPanel
         add(buildingsScroll, "span 1 3, grow");
         add(populationPanel, "grow");
         add(constructionPanel, "grow, top");
-        add(inPortScroll, "span, split 3, grow, sg, height 30:80:");
-        add(cargoScroll, "grow, sg, height 30:80:");
-        add(outsideColonyScroll, "grow, sg, height 30:80:");
-        add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height) + ":" + (ImageLibrary.ICON_SIZE.height) + ":" + (2*ImageLibrary.ICON_SIZE.height) + ", growx");
+        add(inPortScroll, "span, split 3, grow, sg, height 60:160:");
+        add(cargoScroll, "grow, sg, height 60:160:");
+        add(outsideColonyScroll, "grow, sg, height 60:160:");
+        add(warehouseScroll, "span, height " + (ImageLibrary.ICON_SIZE.height * 2) + "!, growx");
         int buttonFields = 6;
         if (setGoodsButton != null) buttonFields++;
         if (traceWorkButton != null) buttonFields++;