Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 32580)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 32581)
@@ -8,6 +8,4 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -21,5 +19,4 @@
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
-import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
@@ -60,6 +57,5 @@
 
   private final SideButton nextButton = new SideButton(new NextPictureAction());
-  private final SideButton previousButton = new SideButton(
-          new PreviousPictureAction());
+  private final SideButton previousButton = new SideButton(new PreviousPictureAction());
   /**
    * Button used to jump to the image following the red line
@@ -90,6 +86,4 @@
     WALK;
   }
-
-  private JPanel buttonsPanel;
 
   /**
@@ -112,10 +106,5 @@
     this.redButton.setForeground(Color.RED);
 
-    createLayout(
-            this.mapillaryImageDisplay,
-            Arrays.asList(new SideButton[]{this.blueButton, this.previousButton, this.nextButton, this.redButton}),
-            Main.pref.getBoolean("mapillary.reverse-buttons"));
-    disableAllButtons();
-
+    setMode(MODE.NORMAL);
   }
 
@@ -153,5 +142,5 @@
    * Sets a new mode for the dialog.
    *
-   * @param mode The mode to be set.
+   * @param mode The mode to be set. Must not be {@code null}.
    */
   public void setMode(MODE mode) {
@@ -159,20 +148,20 @@
       case WALK:
         createLayout(
-                this.mapillaryImageDisplay,
-                Arrays.asList(new SideButton[]{playButton, pauseButton, stopButton}),
-                Main.pref.getBoolean("mapillary.reverse-buttons"));
+          this.mapillaryImageDisplay,
+          Arrays.asList(new SideButton[]{playButton, pauseButton, stopButton})
+        );
         break;
       case NORMAL:
       default:
         createLayout(
-                this.mapillaryImageDisplay,
-                Arrays.asList(new SideButton[]{blueButton, previousButton, nextButton, redButton}),
-                Main.pref.getBoolean("mapillary.reverse-buttons"));
+          this.mapillaryImageDisplay,
+          Arrays.asList(new SideButton[]{blueButton, previousButton, nextButton, redButton})
+        );
         break;
     }
     disableAllButtons();
-    if (mode.equals(MODE.NORMAL))
+    if (MODE.NORMAL.equals(mode)) {
       updateImage();
-
+    }
   }
 
@@ -379,6 +368,5 @@
     public PreviousPictureAction() {
       putValue(NAME, tr("Previous picture"));
-      putValue(SHORT_DESCRIPTION,
-              tr("Shows the previous picture in the sequence"));
+      putValue(SHORT_DESCRIPTION, tr("Shows the previous picture in the sequence"));
     }
 
@@ -563,32 +551,9 @@
    * @param data    The content of the dialog
    * @param buttons The buttons where you can click
-   * @param reverse {@code true} if the buttons should go at the top; {@code false}
-   *                otherwise.
-   */
-  public void createLayout(Component data, List<SideButton> buttons,
-                           boolean reverse) {
-    this.removeAll();
-    JPanel panel = new JPanel();
-    panel.setLayout(new BorderLayout());
-    panel.add(data, BorderLayout.CENTER);
-    if (reverse) {
-      this.buttonsPanel = new JPanel(new GridLayout(1, 1));
-      if (!buttons.isEmpty() && buttons.get(0) != null) {
-        final JPanel buttonRowPanel = new JPanel(
-            Main.pref.getBoolean("dialog.align.left", false)
-            ? new FlowLayout(FlowLayout.LEFT)
-            : new GridLayout(1, buttons.size())
-        );
-        this.buttonsPanel.add(buttonRowPanel);
-        for (SideButton button : buttons) {
-          buttonRowPanel.add(button);
-        }
-      }
-      panel.add(this.buttonsPanel, BorderLayout.NORTH);
-      createLayout(panel, true, null);
-    } else {
-      createLayout(panel, true, buttons);
-    }
-    this.add(this.titleBar, BorderLayout.NORTH);
+   */
+  public void createLayout(Component data, List<SideButton> buttons) {
+    removeAll();
+    createLayout(data, true, buttons);
+    add(titleBar, BorderLayout.NORTH);
   }
 
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32580)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32581)
@@ -47,6 +47,4 @@
  */
 public class MapillaryPreferenceSetting implements SubPreferenceSetting, MapillaryLoginListener {
-
-  private final JCheckBox reverseButtons = new JCheckBox(I18n.tr("Reverse buttons position when displaying images."));
   private final JComboBox<String> downloadModeComboBox = new JComboBox<>(new String[]{
       MapillaryDownloader.MODES.Automatic.toString(),
@@ -96,5 +94,4 @@
 
     JPanel mainPanel = new JPanel();
-    reverseButtons.setSelected(Main.pref.getBoolean("mapillary.reverse-buttons"));
     displayHour.setSelected(Main.pref.getBoolean("mapillary.display-hour", true));
     format24.setSelected(Main.pref.getBoolean("mapillary.format-24"));
@@ -117,5 +114,4 @@
     mainPanel.add(downloadModePanel, GBC.eol());
 
-    mainPanel.add(reverseButtons, GBC.eol());
     mainPanel.add(displayHour, GBC.eol());
     mainPanel.add(format24, GBC.eol());
@@ -123,5 +119,5 @@
     mainPanel.add(hoverEnabled, GBC.eol());
     MapillaryColorScheme.styleAsDefaultPanel(
-      mainPanel, downloadModePanel, reverseButtons, displayHour, format24, moveTo
+      mainPanel, downloadModePanel, displayHour, format24, moveTo, hoverEnabled
     );
     mainPanel.add(Box.createVerticalGlue(), GBC.eol().fill(GridBagConstraints.BOTH));
@@ -172,5 +168,4 @@
   public boolean ok() {
     boolean mod = false;
-    Main.pref.put("mapillary.reverse-buttons", this.reverseButtons.isSelected());
 
     MapillaryPlugin.setMenuEnabled(MapillaryPlugin.getDownloadViewMenu(), false);