diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index c9674fc18..90603bd0e 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -27,10 +27,6 @@ class MainMenuBar(wx.MenuBar):
         # File menu
         fileMenu = wx.Menu()
         self.Append(fileMenu, "&File")
-
-        fileMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.")
-        fileMenu.Append(wx.ID_SAVEAS, "&Export", "Export the fit to another format.")
-        fileMenu.AppendSeparator()
         fileMenu.Append(wx.ID_EXIT)
 
 
@@ -45,18 +41,22 @@ class MainMenuBar(wx.MenuBar):
         # Fit menu
         fitMenu = wx.Menu()
         self.Append(fitMenu, "F&it")
-
-        fitMenu.Append(wx.ID_NEW)
+        shipBrowserItem = wx.MenuItem(fitMenu, wx.ID_ANY, "Ship &Browser")
+        shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small"))
+        fitMenu.AppendItem(shipBrowserItem)
         fitMenu.Append(wx.ID_EDIT, "&Rename", "Rename this fit.")
         fitMenu.Append(wx.ID_COPY)
         fitMenu.Append(wx.ID_DELETE)
+        fitMenu.AppendSeparator()
+        fitMenu.Append(wx.ID_OPEN, "&Import", "Import a fit into pyfa.")
+        fitMenu.Append(wx.ID_SAVEAS, "&Export", "Export the fit to another format.")
 
         # Character menu
         charMenu = wx.Menu()
         self.Append(charMenu, "&Character")
 
-        charEditItem = wx.MenuItem(charMenu, wx.ID_ANY, "Character Editor")
-        charEditItem.SetBitmap(bitmapLoader.getBitmap("character"))
+        charEditItem = wx.MenuItem(charMenu, wx.ID_ANY, "Character &Editor")
+        charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small"))
         charMenu.AppendItem(charEditItem)
 
         # Help menu
diff --git a/gui/mainToolBar.py b/gui/mainToolBar.py
index e129af298..efda17fa7 100644
--- a/gui/mainToolBar.py
+++ b/gui/mainToolBar.py
@@ -24,8 +24,6 @@ class MainToolBar(wx.ToolBar):
     def __init__(self, parent):
         wx.ToolBar.__init__(self, parent, wx.ID_ANY)
 
-        self.AddControl(bitmapLoader.getStaticBitmap("ship", self))
-        self.AddLabelTool(wx.ID_NEW, "New fit", wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR))
         self.AddLabelTool(wx.ID_COPY, "Copy fit", wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR))
         self.AddLabelTool(wx.ID_DELETE, "Delete fit", wx.ArtProvider.GetBitmap(wx.ART_DELETE, wx.ART_TOOLBAR))
 
@@ -33,5 +31,7 @@ class MainToolBar(wx.ToolBar):
         self.AddLabelTool(wx.ID_OPEN, "Import fit", wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR))
         self.AddLabelTool(wx.ID_SAVEAS, "Export fit", wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE_AS, wx.ART_TOOLBAR))
 
-
+        self.AddSeparator()
+        self.AddLabelTool(wx.ID_ANY, "Ship Browser", bitmapLoader.getBitmap("ship_big"))
+        self.AddLabelTool(wx.ID_ANY, "Character Editor", bitmapLoader.getBitmap("character_big"))
         self.Realize()
diff --git a/icons/character_big.png b/icons/character_big.png
new file mode 100644
index 000000000..67f3b6d93
Binary files /dev/null and b/icons/character_big.png differ
diff --git a/icons/character.png b/icons/character_small.png
similarity index 100%
rename from icons/character.png
rename to icons/character_small.png
diff --git a/icons/ship.png b/icons/ship_big.png
similarity index 100%
rename from icons/ship.png
rename to icons/ship_big.png
diff --git a/icons/ship_small.png b/icons/ship_small.png
new file mode 100644
index 000000000..640feae12
Binary files /dev/null and b/icons/ship_small.png differ