diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py
index 3d552435e..1b26b2662 100644
--- a/gui/builtinStatsViews/firepowerViewFull.py
+++ b/gui/builtinStatsViews/firepowerViewFull.py
@@ -46,7 +46,7 @@ class FirepowerViewFull(StatsView):
 
         sizerFirepower = wx.FlexGridSizer(1, 4)
         sizerFirepower.AddGrowableCol(1)
-
+        
         contentSizer.Add( sizerFirepower, 0, wx.EXPAND, 0)
 
         counter = 0
@@ -98,11 +98,11 @@ class FirepowerViewFull(StatsView):
 
         gridS.Add(lbl, 0, wx.ALIGN_LEFT)
 
-        image = bitmapLoader.getBitmap("mining_big", "icons")
-        miningyield = wx.BitmapButton(contentPanel, -1, image)
-        miningyield.SetToolTip(wx.ToolTip("Click to toggle to Mining Yield "))
-        miningyield.Bind(wx.EVT_BUTTON, self.switchToMiningYieldView)
-        sizerFirepower.Add(miningyield, 0, wx.ALIGN_LEFT)
+        image = bitmapLoader.getBitmap("mining_small", "icons")
+        self.miningyield = wx.BitmapButton(contentPanel, -1, image)
+        self.miningyield.SetToolTip(wx.ToolTip("Click to toggle to Mining Yield "))
+        self.miningyield.Bind(wx.EVT_BUTTON, self.switchToMiningYieldView)
+        sizerFirepower.Add(self.miningyield, 0, wx.ALIGN_LEFT)
 
         self._cachedValues.append(0)
 
@@ -134,6 +134,11 @@ class FirepowerViewFull(StatsView):
                  ("labelFullDpsDrone", lambda: fit.droneDPS, 3, 0, 0, "%s DPS", None),
                  ("labelFullVolleyTotal", lambda: fit.weaponVolley, 3, 0, 0, "%s", "Volley: %.1f"),
                  ("labelFullDpsTotal", lambda: fit.totalDPS, 3, 0, 0, "%s", None))
+        # See GH issue #
+        #if fit is not None and fit.totalYield > 0:
+        #    self.miningyield.Show()
+        #else:
+        #    self.miningyield.Hide()
 
         counter = 0
         for labelName, value, prec, lowest, highest, valueFormat, altFormat in stats:
@@ -147,6 +152,7 @@ class FirepowerViewFull(StatsView):
                 label.SetToolTip(wx.ToolTip(tipStr))
                 self._cachedValues[counter] = value
             counter +=1
+
         self.panel.Layout()
         self.headerPanel.Layout()
 
diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py
index 9d9ec617a..a83800d70 100644
--- a/gui/builtinStatsViews/miningyieldViewFull.py
+++ b/gui/builtinStatsViews/miningyieldViewFull.py
@@ -92,7 +92,7 @@ class MiningYieldViewFull(StatsView):
 
         self._cachedValues.append(0)
 
-        image = bitmapLoader.getBitmap("turret_big", "icons")
+        image = bitmapLoader.getBitmap("turret_small", "icons")
         firepower = wx.BitmapButton(contentPanel, -1, image)
         firepower.SetToolTip(wx.ToolTip("Click to toggle to Firepower View"))
         firepower.Bind(wx.EVT_BUTTON, self.switchToFirepowerView)
diff --git a/icons/mining_small.png b/icons/mining_small.png
new file mode 100644
index 000000000..78357a000
Binary files /dev/null and b/icons/mining_small.png differ
diff --git a/icons/turret_small.png b/icons/turret_small.png
new file mode 100644
index 000000000..e9047086b
Binary files /dev/null and b/icons/turret_small.png differ