Index: src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java
===================================================================
--- src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java	(revision 35649)
+++ src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java	(working copy)
@@ -30,6 +30,7 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
 import org.openstreetmap.josm.plugins.streetside.StreetsidePlugin;
 import org.openstreetmap.josm.plugins.streetside.gui.boilerplate.StreetsideButton;
 import org.openstreetmap.josm.plugins.streetside.io.download.StreetsideDownloader.DOWNLOAD_MODE;
@@ -40,6 +41,7 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
  * Creates the preferences panel for the plugin.
@@ -49,7 +51,7 @@
  */
 public class StreetsidePreferenceSetting implements SubPreferenceSetting, StreetsideLoginListener {
 
-  final static Logger logger = Logger.getLogger(StreetsidePreferenceSetting.class);
+  static final Logger logger = Logger.getLogger(StreetsidePreferenceSetting.class);
 
   private final JComboBox<String> downloadModeComboBox = new JComboBox<>(new String[]{
       DOWNLOAD_MODE.VISIBLE_AREA.getLabel(),
@@ -87,7 +89,7 @@
 
   @Override
   public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
-    return gui.getDisplayPreference();
+    return gui.getPluginPreference();
   }
 
   @Override
@@ -153,17 +155,17 @@
 
     container.add(mainPanel, BorderLayout.CENTER);
 
-    synchronized (gui.getDisplayPreference().getTabPane()) {
-      gui.getDisplayPreference().addSubTab(this, "Streetside", new JScrollPane(container));
-      gui.getDisplayPreference().getTabPane().setIconAt(gui.getDisplayPreference().getTabPane().getTabCount()-1, StreetsidePlugin.LOGO.setSize(12, 12).get());
-    }
+    final PluginPreference pluginPreference = gui.getPluginPreference();
+    pluginPreference.addSubTab(this, "Streetside", new JScrollPane(container));
+    pluginPreference.getTabPane().setIconAt(pluginPreference.getTabPane().getTabCount()-1, StreetsidePlugin.LOGO.setSize(ImageProvider.ImageSizes.MENU).get());
 
-    new Thread(() -> {
+
+    SwingUtilities.invokeLater(() -> {
       String username = StreetsideUser.getUsername();
       if (username != null) {
         SwingUtilities.invokeLater(() -> onLogin(StreetsideUser.getUsername()));
       }
-    }).start();
+    });
   }
 
   @Override