Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 16916)
+++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 16917)
@@ -24,4 +24,5 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Box;
 import javax.swing.Icon;
 import javax.swing.JButton;
@@ -164,13 +165,18 @@
         cbStartup.addActionListener(e -> DOWNLOAD_AUTORUN.put(cbStartup.isSelected()));
 
+        JLabel iconZoomToDownloadedData = new JLabel(ImageProvider.get("dialogs/autoscale/data", ImageProvider.ImageSizes.SMALLICON));
         cbZoomToDownloadedData = new JCheckBox(tr("Zoom to downloaded data"));
         cbZoomToDownloadedData.setToolTipText(tr("Select to zoom to entire newly downloaded data."));
 
-        mainPanel.add(cbStartup, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
-        mainPanel.add(cbZoomToDownloadedData, GBC.std().anchor(GBC.WEST).insets(15, 5, 5, 5));
+        JPanel checkboxPanel = new JPanel(new FlowLayout());
+        checkboxPanel.add(cbStartup);
+        checkboxPanel.add(Box.createHorizontalStrut(6));
+        checkboxPanel.add(iconZoomToDownloadedData);
+        checkboxPanel.add(cbZoomToDownloadedData);
+        mainPanel.add(checkboxPanel, GBC.eol());
 
         ExpertToggleAction.addVisibilitySwitcher(cbZoomToDownloadedData);
-
-        mainPanel.add(new JLabel(), GBC.eol()); // place info label at a new line
+        ExpertToggleAction.addVisibilitySwitcher(iconZoomToDownloadedData);
+
         JLabel infoLabel = new JLabel(
                 tr("Use left click&drag to select area, arrows or right mouse button to scroll map, wheel or +/- to zoom."));