diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index cc5d00ef3..040e55d72 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -100,9 +100,8 @@ class MainFrame(wx.Frame):
 
         #Ship browser
         self.Bind(wx.EVT_MENU, self.toggleShipBrowser, id=10)
+        self.Bind(wx.EVT_MENU, self.toggleShipBrowser, id=11)
 
     def toggleShipBrowser(self, event):
-        toolbar = self.GetToolBar()
-        toolbar.ToggleTool(10, not toolbar.GetToolState(10))
-        toolbar.toggleShipBrowser(event)
+        self.GetToolBar().toggleShipBrowser(event)
 
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index d40ea10b0..5ad68cf23 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -40,9 +40,14 @@ class MainMenuBar(wx.MenuBar):
         # Fit menu
         fitMenu = wx.Menu()
         self.Append(fitMenu, "F&it")
-        shipBrowserItem = wx.MenuItem(fitMenu, 10, "Ship &Browser")
-        shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small", "icons"))
-        fitMenu.AppendItem(shipBrowserItem)
+        self.shipBrowserItem = wx.MenuItem(fitMenu, 10, "Activate &Ship Browser")
+        self.shipBrowserItem.SetBitmap(bitmapLoader.getBitmap("ship_small", "icons"))
+        fitMenu.AppendItem(self.shipBrowserItem)
+
+        self.marketBrowserItem = wx.MenuItem(fitMenu, 11, "Activate &Market Browser")
+        self.marketBrowserItem.SetBitmap(bitmapLoader.getBitmap("market_small", "icons"))
+        fitMenu.AppendItem(self.marketBrowserItem)
+        self.marketBrowserItem.Enable(False)
         fitMenu.AppendSeparator()
         fitMenu.Append(wx.ID_EDIT, "&Rename", "Rename this fit.")
         fitMenu.Append(wx.ID_COPY)
diff --git a/gui/mainToolBar.py b/gui/mainToolBar.py
index c7304fe58..965ab3db0 100644
--- a/gui/mainToolBar.py
+++ b/gui/mainToolBar.py
@@ -26,29 +26,41 @@ class MainToolBar(wx.ToolBar):
         style = wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT
         wx.ToolBar.__init__(self, parent, wx.ID_ANY, style=style)
 
-        self.AddCheckLabelTool(10, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"), shortHelp="Ship browser")
+        self.AddLabelTool(10, "Ship Browser", bitmapLoader.getBitmap("ship_big", "icons"), shortHelp="Activate Ship Browser")
         self.AddCheckLabelTool(20, "Character Editor", bitmapLoader.getBitmap("character_big", "icons"), shortHelp="Character editor")
 
         self.Bind(wx.EVT_TOOL, self.toggleShipBrowser, id=10)
         self.Bind(wx.EVT_TOOL, self.toggleCharacterBrowser, id=20)
         self.Realize()
-
+        self.shipBrowserState = False
         gui.mainFrame.MainFrame.getInstance().shipBrowser.Hide()
 
     def toggleShipBrowser(self, event):
-        newState = self.GetToolState(10)
+        self.shipBrowserState = not self.shipBrowserState
+        state = self.shipBrowserState
         mainFrame = gui.mainFrame.MainFrame.getInstance()
+        menuBar = mainFrame.GetMenuBar()
 
-
-        if newState:
+        if self.shipBrowserState:
+            self.SetToolNormalBitmap(10, bitmapLoader.getBitmap("market_big", "icons"))
+            self.SetToolShortHelp(10, "Activate Market Browser")
             mainFrame.shipBrowser.build()
             mainFrame.marketShipBrowserSizer.Replace(mainFrame.marketBrowser, mainFrame.shipBrowser)
         else:
+            self.SetToolNormalBitmap(10, bitmapLoader.getBitmap("ship_big", "icons"))
+            self.SetToolShortHelp(10, "Activate Ship Browser")
             mainFrame.marketShipBrowserSizer.Replace(mainFrame.shipBrowser, mainFrame.marketBrowser)
 
-        mainFrame.shipBrowser.Show(newState)
-        mainFrame.marketBrowser.Show(not newState)
+        menuBar.shipBrowserItem.Enable(not state)
+        menuBar.marketBrowserItem.Enable(state)
+
+        mainFrame.shipBrowser.Show(state)
+        mainFrame.marketBrowser.Show(not state)
+
         mainFrame.marketShipBrowserSizer.Layout()
 
+
+
+
     def toggleCharacterBrowser(self, event):
         print event
diff --git a/icons/market_big.png b/icons/market_big.png
new file mode 100644
index 000000000..67380fa74
Binary files /dev/null and b/icons/market_big.png differ
diff --git a/icons/market_small.png b/icons/market_small.png
new file mode 100644
index 000000000..45fef4117
Binary files /dev/null and b/icons/market_small.png differ