diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
index 60e267605..6eff04add 100644
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -29,6 +29,11 @@ def getStaticBitmap(name, parent, location):
 locationMap = {"pack": os.path.join(config.homePath, "icons")}
 
 def getBitmap(name,location):
+    icon = getImage(name, location)
+    if icon is not None:
+        return icon.ConvertToBitmap()
+
+def getImage(name, location):
     if location in locationMap:
         location = locationMap[location]
         path = os.path.join(location, "icon%s.png" % name)
@@ -37,4 +42,4 @@ def getBitmap(name,location):
         path = os.path.join(location, name + ".png")
 
     if os.path.exists(path):
-        return wx.Image(path).ConvertToBitmap()
+        return wx.Image(path)
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index d39337b06..5ac1868af 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -18,6 +18,7 @@
 #===============================================================================
 
 import wx
+from gui import bitmapLoader
 from gui.mainMenuBar import MainMenuBar
 from gui.mainToolBar import MainToolBar
 from gui.marketBrowser import MarketBrowser
@@ -37,6 +38,9 @@ class MainFrame(wx.Frame):
         wx.Frame.__init__(self, None, wx.ID_ANY, title="pyfa - Python Fitting Assistant")
         MainFrame.__instance = self
 
+        i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "icons"))
+        self.SetIcon(i)
+
         self.SetMinSize((1000, 700))
         self.SetSize((1000, 700))
 
diff --git a/icons/pyfa.png b/icons/pyfa.png
new file mode 100644
index 000000000..08fc938ef
Binary files /dev/null and b/icons/pyfa.png differ