diff --git a/gui/PFSearchBox.py b/gui/PFSearchBox.py
index c09d7b9d2..88c67617b 100644
--- a/gui/PFSearchBox.py
+++ b/gui/PFSearchBox.py
@@ -1,7 +1,7 @@
 import wx
 import gui.utils.colorUtils as colorUtils
 import gui.utils.drawUtils as drawUtils
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 
 SearchButton, EVT_SEARCH_BTN = wx.lib.newevent.NewEvent()
diff --git a/gui/additionsPane.py b/gui/additionsPane.py
index d88e0eea8..bf38d9bb9 100644
--- a/gui/additionsPane.py
+++ b/gui/additionsPane.py
@@ -26,7 +26,7 @@ from gui.implantView import ImplantView
 from gui.projectedView import ProjectedView
 from gui.pyfatogglepanel import TogglePanel
 from gui.gangView import GangView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 import gui.chromeTabs
 
@@ -51,12 +51,12 @@ class AdditionsPane(TogglePanel):
         self.notebook.SetMinSize(size)
         baseSizer.Add(self.notebook, 1, wx.EXPAND)
 
-        droneImg = bitmapLoader.getImage("drone_small", "gui")
-        implantImg = bitmapLoader.getImage("implant_small", "gui")
-        boosterImg = bitmapLoader.getImage("booster_small", "gui")
-        projectedImg = bitmapLoader.getImage("projected_small", "gui")
-        gangImg = bitmapLoader.getImage("fleet_fc_small", "gui")
-        cargoImg = bitmapLoader.getImage("cargo_small", "gui")
+        droneImg = BitmapLoader.getImage("drone_small", "gui")
+        implantImg = BitmapLoader.getImage("implant_small", "gui")
+        boosterImg = BitmapLoader.getImage("booster_small", "gui")
+        projectedImg = BitmapLoader.getImage("projected_small", "gui")
+        gangImg = BitmapLoader.getImage("fleet_fc_small", "gui")
+        cargoImg = BitmapLoader.getImage("cargo_small", "gui")
 
         self.notebook.AddPage(DroneView(self.notebook), "Drones", tabImage = droneImg, showClose = False)
         self.notebook.AddPage(CargoView(self.notebook), "Cargo", tabImage = cargoImg, showClose = False)
diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py
index 816eefa00..79493d7d4 100644
--- a/gui/builtinContextMenus/changeAffectingSkills.py
+++ b/gui/builtinContextMenus/changeAffectingSkills.py
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import service
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from eos.types import Skill
 import gui.globalEvents as GE
 
@@ -74,7 +74,7 @@ class ChangeAffectingSkills(ContextMenu):
             grandSub = wx.Menu()
             skillItem.SetSubMenu(grandSub)
             if skill.learned:
-                bitmap = bitmapLoader.getBitmap("lvl%s" % skill.level, "gui")
+                bitmap = BitmapLoader.getBitmap("lvl%s" % skill.level, "gui")
                 if bitmap is not None:
                     skillItem.SetBitmap(bitmap)
 
diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py
index 5171be8e6..3238b9b43 100644
--- a/gui/builtinContextMenus/damagePattern.py
+++ b/gui/builtinContextMenus/damagePattern.py
@@ -3,7 +3,7 @@ import gui.mainFrame
 import service
 import gui.globalEvents as GE
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 try:
     from collections import OrderedDict
@@ -65,7 +65,7 @@ class DamagePattern(ContextMenu):
         dp = f.damagePattern
 
         if dp == pattern:
-            bitmap = bitmapLoader.getBitmap("state_active_small", "gui")
+            bitmap = BitmapLoader.getBitmap("state_active_small", "gui")
             menuItem.SetBitmap(bitmap)
         return menuItem
 
@@ -80,7 +80,7 @@ class DamagePattern(ContextMenu):
             self.patternIds[id] = self.singles[i]
             rootMenu.Bind(wx.EVT_MENU, self.handlePatternSwitch, pitem)
             if self.patternIds[id] == self.fit.damagePattern:
-                bitmap = bitmapLoader.getBitmap("state_active_small", "gui")
+                bitmap = BitmapLoader.getBitmap("state_active_small", "gui")
                 pitem.SetBitmap(bitmap)
             return False
 
diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py
index 3495cad6e..c258240ea 100644
--- a/gui/builtinContextMenus/factorReload.py
+++ b/gui/builtinContextMenus/factorReload.py
@@ -3,7 +3,7 @@ import gui.mainFrame
 import service
 import gui.globalEvents as GE
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 class FactorReload(ContextMenu):
     def __init__(self):
@@ -27,7 +27,7 @@ class FactorReload(ContextMenu):
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
         if fit.factorReload:
-            return bitmapLoader.getBitmap("state_active_small", "gui")
+            return BitmapLoader.getBitmap("state_active_small", "gui")
         else:
             return None
 
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index 7532be63d..24250b7de 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import service
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from eos.types import Hardpoint
 import gui.globalEvents as GE
 
@@ -105,7 +105,7 @@ class ModuleAmmoPicker(ContextMenu):
         menu.Bind(wx.EVT_MENU, self.handleAmmoSwitch, item)
         item.charge = charge
         if charge is not None and charge.icon is not None:
-            bitmap = bitmapLoader.getBitmap(charge.icon.iconFile, "icons")
+            bitmap = BitmapLoader.getBitmap(charge.icon.iconFile, "icons")
             if bitmap is not None:
                 item.SetBitmap(bitmap)
 
@@ -181,7 +181,7 @@ class ModuleAmmoPicker(ContextMenu):
 
                     type = currType
                     item = wx.MenuItem(m, wx.ID_ANY, type.capitalize())
-                    bitmap = bitmapLoader.getBitmap("%s_small" % type, "gui")
+                    bitmap = BitmapLoader.getBitmap("%s_small" % type, "gui")
                     if bitmap is not None:
                         item.SetBitmap(bitmap)
 
diff --git a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
index ad520e8ff..41f969b35 100644
--- a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import service
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from eos.types import Hardpoint
 import gui.globalEvents as GE
 from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py
index 6d7651db5..4aeb10ffd 100644
--- a/gui/builtinContextMenus/targetResists.py
+++ b/gui/builtinContextMenus/targetResists.py
@@ -3,7 +3,7 @@ import gui.mainFrame
 import service
 import gui.globalEvents as GE
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 try:
     from collections import OrderedDict
@@ -56,7 +56,7 @@ class TargetResists(ContextMenu):
         tr = f.targetResists
 
         if tr == pattern:
-            bitmap = bitmapLoader.getBitmap("state_active_small", "gui")
+            bitmap = BitmapLoader.getBitmap("state_active_small", "gui")
             item.SetBitmap(bitmap)
         return item
 
diff --git a/gui/builtinGraphs/fitDps.py b/gui/builtinGraphs/fitDps.py
index b15a995f6..ef2782674 100644
--- a/gui/builtinGraphs/fitDps.py
+++ b/gui/builtinGraphs/fitDps.py
@@ -19,7 +19,7 @@
 
 from gui.graph import Graph
 import service
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from eos.graph.fitDps import FitDpsGraph as FitDps
 from eos.graph import Data
 import gui.mainFrame
@@ -56,7 +56,7 @@ class FitDpsGraph(Graph):
         sAttr = service.Attribute.getInstance()
         for key, attrName in self.propertyAttributeMap.iteritems():
             iconFile = sAttr.getAttributeInfo(attrName).icon.iconFile
-            bitmap = bitmapLoader.getBitmap(iconFile, "icons")
+            bitmap = BitmapLoader.getBitmap(iconFile, "icons")
             if bitmap:
                 icons[key] = bitmap
 
diff --git a/gui/builtinPreferenceViews/dummyView.py b/gui/builtinPreferenceViews/dummyView.py
index 8cdb606a1..5b8822d1c 100644
--- a/gui/builtinPreferenceViews/dummyView.py
+++ b/gui/builtinPreferenceViews/dummyView.py
@@ -19,7 +19,7 @@
 
 import wx
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 class DummyView(PreferenceView):
     title = "Dummy"
 
diff --git a/gui/builtinPreferenceViews/pyfaGaugePreferences.py b/gui/builtinPreferenceViews/pyfaGaugePreferences.py
index 26015b03f..4163eeaf4 100644
--- a/gui/builtinPreferenceViews/pyfaGaugePreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGaugePreferences.py
@@ -6,7 +6,7 @@ import wx
 import copy
 
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils import colorUtils
 import gui.utils.drawUtils as drawUtils
 
@@ -313,7 +313,7 @@ class PFGaugePref ( PreferenceView):
         self.cp103105E.Bind( wx.EVT_COLOURPICKER_CHANGED, self.OnColourChanged )
 
     def getImage(self):
-        return bitmapLoader.getBitmap("pref-gauges_big", "gui")
+        return BitmapLoader.getBitmap("pref-gauges_big", "gui")
 
     def InitDefaultColours(self):
         self.c0100S = wx.Colour(191, 191, 191, 255)
diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 2b5505cd7..75d1273c0 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -1,7 +1,7 @@
 import wx
 
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 import gui.mainFrame
 import service
@@ -144,6 +144,6 @@ class PFGeneralPref ( PreferenceView):
         self.sFit.serviceFittingOptions["showMarketShortcuts"] = self.cbMarketShortcuts.GetValue()
 
     def getImage(self):
-        return bitmapLoader.getBitmap("prefs_settings", "gui")
+        return BitmapLoader.getBitmap("prefs_settings", "gui")
 
 PFGeneralPref.register()
diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
index e19d072b9..e028ef478 100644
--- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py
@@ -2,7 +2,7 @@ import wx
 import os
 
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 import gui.mainFrame
 import service
@@ -76,6 +76,6 @@ class PFHTMLExportPref ( PreferenceView):
         self.HTMLExportSettings.setEnabled(self.exportEnabled.GetValue())
 
     def getImage(self):
-        return bitmapLoader.getBitmap("prefs_html", "gui")
+        return BitmapLoader.getBitmap("prefs_html", "gui")
 
 PFHTMLExportPref.register()
diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
index aea5a4905..b4c0dedae 100644
--- a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
@@ -1,7 +1,7 @@
 import wx
 
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 import gui.mainFrame
 import service
@@ -223,6 +223,6 @@ class PFNetworkPref ( PreferenceView):
             self.editProxySettingsPort.Disable()
 
     def getImage(self):
-        return bitmapLoader.getBitmap("prefs_proxy", "gui")
+        return BitmapLoader.getBitmap("prefs_proxy", "gui")
 
 PFNetworkPref.register()
diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
index 4dd6ebe95..260987287 100644
--- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
+++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
@@ -3,7 +3,7 @@ import service
 import os
 
 from gui.preferenceView import PreferenceView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 import service
 import gui.globalEvents as GE
@@ -99,6 +99,6 @@ class PFUpdatePref (PreferenceView):
         wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.UpdateSettings.get('version'))
 
     def getImage(self):
-        return bitmapLoader.getBitmap("prefs_update", "gui")
+        return BitmapLoader.getBitmap("prefs_update", "gui")
 
 PFUpdatePref.register()
diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py
index 79f98551d..c07045199 100644
--- a/gui/builtinStatsViews/capacitorViewFull.py
+++ b/gui/builtinStatsViews/capacitorViewFull.py
@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
 class CapacitorViewFull(StatsView):
@@ -48,7 +48,7 @@ class CapacitorViewFull(StatsView):
         baseBox = wx.BoxSizer(wx.HORIZONTAL)
 
         sizerCapacitor.Add(baseBox, 0, wx.ALIGN_LEFT)
-        bitmap = bitmapLoader.getStaticBitmap("capacitorInfo_big", parent, "gui")
+        bitmap = BitmapLoader.getStaticBitmap("capacitorInfo_big", parent, "gui")
         tooltip = wx.ToolTip("Capacitor stability")
         bitmap.SetToolTip(tooltip)
         baseBox.Add(bitmap, 0, wx.ALIGN_CENTER)
@@ -83,7 +83,7 @@ class CapacitorViewFull(StatsView):
         sizerCapacitor.Add(baseBox, 0, wx.ALIGN_CENTER_HORIZONTAL)
 
         tooltip = wx.ToolTip("Capacitor throughput")
-        bitmap = bitmapLoader.getStaticBitmap("capacitorRecharge_big", parent, "gui")
+        bitmap = BitmapLoader.getStaticBitmap("capacitorRecharge_big", parent, "gui")
         bitmap.SetToolTip(tooltip)
         baseBox.Add(bitmap, 0, wx.ALIGN_CENTER)
 
diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py
index b99e14257..0e8d1c070 100644
--- a/gui/builtinStatsViews/firepowerViewFull.py
+++ b/gui/builtinStatsViews/firepowerViewFull.py
@@ -21,7 +21,7 @@ import wx
 import service
 import gui.mainFrame
 from gui.statsView import StatsView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
 class FirepowerViewFull(StatsView):
@@ -61,7 +61,7 @@ class FirepowerViewFull(StatsView):
             baseBox = wx.BoxSizer(wx.HORIZONTAL)
             sizerFirepower.Add(baseBox, 1, wx.ALIGN_LEFT if counter == 0 else wx.ALIGN_CENTER_HORIZONTAL)
 
-            baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER)
+            baseBox.Add(BitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER)
 
             box = wx.BoxSizer(wx.VERTICAL)
             baseBox.Add(box, 0, wx.ALIGN_CENTER)
@@ -82,7 +82,7 @@ class FirepowerViewFull(StatsView):
         baseBox = wx.BoxSizer(wx.HORIZONTAL)
         targetSizer.Add(baseBox, 0, wx.ALIGN_RIGHT)
 
-        baseBox.Add(bitmapLoader.getStaticBitmap("volley_big", parent, "gui"), 0, wx.ALIGN_CENTER)
+        baseBox.Add(BitmapLoader.getStaticBitmap("volley_big", parent, "gui"), 0, wx.ALIGN_CENTER)
 
         gridS = wx.GridSizer(2,2,0,0)
 
@@ -103,7 +103,7 @@ class FirepowerViewFull(StatsView):
 
         gridS.Add(lbl, 0, wx.ALIGN_LEFT)
 
-        image = bitmapLoader.getBitmap("mining_small", "gui")
+        image = BitmapLoader.getBitmap("mining_small", "gui")
         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)
diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py
index b9c8f9e69..ab4df69e9 100644
--- a/gui/builtinStatsViews/miningyieldViewFull.py
+++ b/gui/builtinStatsViews/miningyieldViewFull.py
@@ -21,7 +21,7 @@ import wx
 import service
 import gui.mainFrame
 from gui.statsView import StatsView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
 class MiningYieldViewFull(StatsView):
@@ -55,7 +55,7 @@ class MiningYieldViewFull(StatsView):
             baseBox = wx.BoxSizer(wx.HORIZONTAL)
             sizerMiningYield.Add(baseBox, 1, wx.ALIGN_LEFT if counter == 0 else wx.ALIGN_CENTER_HORIZONTAL)
 
-            baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER)
+            baseBox.Add(BitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER)
 
             box = wx.BoxSizer(wx.VERTICAL)
             baseBox.Add(box, 0, wx.ALIGN_CENTER)
@@ -76,7 +76,7 @@ class MiningYieldViewFull(StatsView):
         baseBox = wx.BoxSizer(wx.HORIZONTAL)
         targetSizer.Add(baseBox, 0, wx.ALIGN_LEFT)
 
-        baseBox.Add(bitmapLoader.getStaticBitmap("cargoBay_big", parent, "gui"), 0, wx.ALIGN_CENTER)
+        baseBox.Add(BitmapLoader.getStaticBitmap("cargoBay_big", parent, "gui"), 0, wx.ALIGN_CENTER)
 
         box = wx.BoxSizer(wx.VERTICAL)
         baseBox.Add(box, 0, wx.EXPAND)
@@ -92,7 +92,7 @@ class MiningYieldViewFull(StatsView):
 
         self._cachedValues.append(0)
 
-        image = bitmapLoader.getBitmap("turret_small", "gui")
+        image = BitmapLoader.getBitmap("turret_small", "gui")
         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/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py
index 06c1fd8ae..ea7d53340 100644
--- a/gui/builtinStatsViews/priceViewFull.py
+++ b/gui/builtinStatsViews/priceViewFull.py
@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import service
 import locale
@@ -56,7 +56,7 @@ class PriceViewFull(StatsView):
             box = wx.BoxSizer(wx.HORIZONTAL)
             gridPrice.Add(box, 0, wx.ALIGN_TOP)
 
-            box.Add(bitmapLoader.getStaticBitmap(image, contentPanel, "gui"), 0, wx.ALIGN_CENTER)
+            box.Add(BitmapLoader.getStaticBitmap(image, contentPanel, "gui"), 0, wx.ALIGN_CENTER)
 
             vbox = wx.BoxSizer(wx.VERTICAL)
             box.Add(vbox, 1, wx.EXPAND)
diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py
index 3cd7b5138..c73aaf0b4 100644
--- a/gui/builtinStatsViews/rechargeViewFull.py
+++ b/gui/builtinStatsViews/rechargeViewFull.py
@@ -19,7 +19,7 @@
 
 import wx
 from gui.statsView import StatsView
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import gui.mainFrame
 import gui.builtinStatsViews.resistancesViewFull as rvf
@@ -62,14 +62,14 @@ class RechargeViewFull(StatsView):
         sizerTankStats.Add(wx.StaticText(contentPanel, wx.ID_ANY, ""), 0)
         toolTipText = {"shieldPassive" : "Passive shield recharge", "shieldActive" : "Active shield boost", "armorActive" : "Armor repair amount", "hullActive" : "Hull repair amount"}
         for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"):
-            bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui")
+            bitmap = BitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui")
             tooltip = wx.ToolTip(toolTipText[tankType])
             bitmap.SetToolTip(tooltip)
             sizerTankStats.Add(bitmap, 0, wx.ALIGN_CENTER)
 
         toolTipText = {"reinforced" : "Reinforced", "sustained" : "Sustained"}
         for stability in ("reinforced", "sustained"):
-            bitmap = bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), contentPanel, "gui")
+            bitmap = BitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), contentPanel, "gui")
             tooltip = wx.ToolTip(toolTipText[stability])
             bitmap.SetToolTip(tooltip)
             sizerTankStats.Add(bitmap, 0, wx.ALIGN_CENTER)
diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py
index d014aab29..85f9dbd06 100644
--- a/gui/builtinStatsViews/resistancesViewFull.py
+++ b/gui/builtinStatsViews/resistancesViewFull.py
@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui import pygauge as PG
 from gui.utils.numberFormatter import formatAmount
 import service
@@ -82,7 +82,7 @@ class ResistancesViewFull(StatsView):
         col+=1
         toolTipText = {"em" : "Electromagnetic resistance", "thermal" : "Thermal resistance", "kinetic" : "Kinetic resistance", "explosive" : "Explosive resistance"}
         for damageType in ("em", "thermal", "kinetic", "explosive"):
-            bitmap = bitmapLoader.getStaticBitmap("%s_big" % damageType, contentPanel, "gui")
+            bitmap = BitmapLoader.getStaticBitmap("%s_big" % damageType, contentPanel, "gui")
             tooltip = wx.ToolTip(toolTipText[damageType])
             bitmap.SetToolTip(tooltip)
             sizerResistances.Add(bitmap, wx.GBPosition( row, col ), wx.GBSpan( 1, 1 ), wx.ALIGN_CENTER)
@@ -104,7 +104,7 @@ class ResistancesViewFull(StatsView):
         toolTipText = {"shield" : "Shield resistance", "armor" : "Armor resistance", "hull" : "Hull resistance", "damagePattern" : "Incoming damage pattern"}
         for tankType in ("shield", "armor", "hull", "separator", "damagePattern"):
             if tankType != "separator":
-                bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui")
+                bitmap = BitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui")
                 tooltip = wx.ToolTip(toolTipText[tankType])
                 bitmap.SetToolTip(tooltip)
                 sizerResistances.Add(bitmap, wx.GBPosition( row, col ), wx.GBSpan( 1, 1 ), wx.ALIGN_CENTER)
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
index ce995d7ac..24497ecfc 100644
--- a/gui/builtinStatsViews/resourcesViewFull.py
+++ b/gui/builtinStatsViews/resourcesViewFull.py
@@ -20,7 +20,7 @@
 import wx
 from gui.statsView import StatsView
 from gui import builtinStatsViews
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui import pygauge as PG
 import gui.mainFrame
 import gui.chromeTabs
@@ -91,7 +91,7 @@ class ResourcesViewFull(StatsView):
         for type in ("turret", "launcher", "drones", "calibration"):
             box = wx.BoxSizer(wx.HORIZONTAL)
 
-            bitmap = bitmapLoader.getStaticBitmap("%s_big" % type, parent, "gui")
+            bitmap = BitmapLoader.getStaticBitmap("%s_big" % type, parent, "gui")
             tooltip = wx.ToolTip(tooltipText[type])
             bitmap.SetToolTip(tooltip)
 
@@ -119,7 +119,7 @@ class ResourcesViewFull(StatsView):
 
             for type in group:
                 capitalizedType = type[0].capitalize() + type[1:]
-                bitmap = bitmapLoader.getStaticBitmap(type + "_big", parent, "gui")
+                bitmap = BitmapLoader.getStaticBitmap(type + "_big", parent, "gui")
                 tooltip = wx.ToolTip(tooltipText[type])
                 bitmap.SetToolTip(tooltip)
 
diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py
index 1c5e02ca4..57e18c113 100644
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -19,7 +19,7 @@
 
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import wx
 
 class Ammo(ViewColumn):
@@ -28,7 +28,7 @@ class Ammo(ViewColumn):
         ViewColumn.__init__(self, fittingView)
         self.mask = wx.LIST_MASK_IMAGE
         self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "gui")
-        self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "gui")
+        self.bitmap = BitmapLoader.getBitmap("damagePattern_small", "gui")
 
     def getText(self, stuff):
         if getattr(stuff, "charge", None) is not None:
diff --git a/gui/builtinViewColumns/ammoIcon.py b/gui/builtinViewColumns/ammoIcon.py
index 2e6378e9e..262f01efa 100644
--- a/gui/builtinViewColumns/ammoIcon.py
+++ b/gui/builtinViewColumns/ammoIcon.py
@@ -19,7 +19,7 @@
 
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import wx
 from eos.types import Module
 
diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py
index db5d6d41b..47d9aa043 100644
--- a/gui/builtinViewColumns/attributeDisplay.py
+++ b/gui/builtinViewColumns/attributeDisplay.py
@@ -19,7 +19,7 @@
 
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 
 import service
@@ -41,7 +41,7 @@ class AttributeDisplay(ViewColumn):
                 iconType = "icons"
             if iconFile:
                 self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
-                self.bitmap = bitmapLoader.getBitmap(iconFile, iconType)
+                self.bitmap = BitmapLoader.getBitmap(iconFile, iconType)
             else:
                 self.imageId = -1
 
diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py
index bb7f5efa0..30cbf6fb2 100644
--- a/gui/builtinViewColumns/baseIcon.py
+++ b/gui/builtinViewColumns/baseIcon.py
@@ -1,6 +1,6 @@
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import wx
 from eos.types import Drone, Fit, Module, Slot, Rack
 
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index edf461313..4a3407ab9 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -22,7 +22,7 @@ import service
 
 from gui.utils.numberFormatter import formatAmount
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from eos.types import Mode
 
 class CapacitorUse(ViewColumn):
@@ -35,7 +35,7 @@ class CapacitorUse(ViewColumn):
         sAttr = service.Attribute.getInstance()
         info = sAttr.getAttributeInfo("capacitorNeed")
         self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
-        self.bitmap = bitmapLoader.getBitmap("capacitorRecharge_small", "gui")
+        self.bitmap = BitmapLoader.getBitmap("capacitorRecharge_small", "gui")
 
     def getText(self, mod):
         if isinstance(mod, Mode):
diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py
index a55090552..eb8f8d693 100644
--- a/gui/builtinViewColumns/maxRange.py
+++ b/gui/builtinViewColumns/maxRange.py
@@ -19,7 +19,7 @@
 
 from gui import builtinViewColumns
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import service
 from gui.utils.numberFormatter import formatAmount
 import wx
@@ -40,7 +40,7 @@ class MaxRange(ViewColumn):
             iconFile = info.icon.iconFile if info.icon else None
             if iconFile:
                 self.imageId = fittingView.imageList.GetImageIndex(iconFile, "icons")
-                self.bitmap = bitmapLoader.getBitmap(iconFile, "icons")
+                self.bitmap = BitmapLoader.getBitmap(iconFile, "icons")
             else:
                 self.imageId = -1
             self.mask = wx.LIST_MASK_IMAGE
diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index 1bb8269c6..11a255a21 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -20,7 +20,7 @@
 
 import gui.mainFrame
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 from gui.utils.listFormatter import formatList
 from service.fit import Fit, Market
@@ -36,7 +36,7 @@ class Miscellanea(ViewColumn):
         ViewColumn.__init__(self, fittingView)
         if params["showIcon"]:
             self.imageId = fittingView.imageList.GetImageIndex("column_misc", "gui")
-            self.bitmap = bitmapLoader.getBitmap("column_misc", "gui")
+            self.bitmap = BitmapLoader.getBitmap("column_misc", "gui")
             self.mask = wx.LIST_MASK_IMAGE
         else:
             self.imageId = -1
diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py
index e9b117050..74d2fc890 100644
--- a/gui/builtinViewColumns/price.py
+++ b/gui/builtinViewColumns/price.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 from eos.types import Drone, Cargo
 import wx
@@ -29,7 +29,7 @@ class Price(ViewColumn):
     def __init__(self, fittingView, params):
         ViewColumn.__init__(self, fittingView)
         self.mask = wx.LIST_MASK_IMAGE
-        self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "gui")
+        self.bitmap = BitmapLoader.getBitmap("totalPrice_small", "gui")
         self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui")
 
     def getText(self, stuff):
diff --git a/gui/builtinViewColumns/propertyDisplay.py b/gui/builtinViewColumns/propertyDisplay.py
index 8cdd9a50f..0bfee5899 100644
--- a/gui/builtinViewColumns/propertyDisplay.py
+++ b/gui/builtinViewColumns/propertyDisplay.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import wx
 import service
diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py
index 263d5b892..c12db54df 100644
--- a/gui/builtinViewColumns/state.py
+++ b/gui/builtinViewColumns/state.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 from gui.viewColumn import ViewColumn
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.mainFrame
 
 import wx
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index d7c995c2f..74e6a888e 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -28,7 +28,7 @@ import gui.shipBrowser
 import gui.multiSwitch
 from eos.types import Slot, Rack, Module
 from gui.builtinViewColumns.state import State
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.builtinViews.emptyView
 from gui.utils.exportHtml import exportHtml
 
@@ -294,7 +294,7 @@ class FittingView(d.Display):
         sFit = service.Fit.getInstance()
         fit = sFit.getFit(self.getActiveFit())
 
-        bitmap = bitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "gui")
+        bitmap = BitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "gui")
         text = "%s: %s" % (fit.ship.item.name, fit.name)
 
         pageIndex = self.parent.GetPageIndex(self)
diff --git a/gui/builtinViews/fleetView.py b/gui/builtinViews/fleetView.py
index 8124dd119..bc6eef9a2 100644
--- a/gui/builtinViews/fleetView.py
+++ b/gui/builtinViews/fleetView.py
@@ -1,7 +1,7 @@
 import wx.gizmos
 import gui.fleetBrowser
 import service
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 #Tab spawning handler
 class FleetSpawner(gui.multiSwitch.TabSpawner):
@@ -28,7 +28,7 @@ class FleetView(wx.gizmos.TreeListCtrl):
         self.tabManager = parent
 
         self.fleetId = None
-        self.fleetImg = bitmapLoader.getImage("53_16", "icons")
+        self.fleetImg = BitmapLoader.getImage("53_16", "icons")
 
         self.imageList = wx.ImageList(16, 16)
         self.SetImageList(self.imageList)
@@ -38,9 +38,9 @@ class FleetView(wx.gizmos.TreeListCtrl):
 
         self.SetMainColumn(1)
         self.icons = {}
-        self.addImage = self.imageList.Add(bitmapLoader.getBitmap("add_small", "gui"))
+        self.addImage = self.imageList.Add(BitmapLoader.getBitmap("add_small", "gui"))
         for icon in ("fb", "fc", "sb", "sc", "wb", "wc"):
-            self.icons[icon] = self.imageList.Add(bitmapLoader.getBitmap("fleet_%s_small" % icon, "gui"))
+            self.icons[icon] = self.imageList.Add(BitmapLoader.getBitmap("fleet_%s_small" % icon, "gui"))
 
         self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.checkNew)
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/cachingImageList.py b/gui/cachingImageList.py
index 904a2c4a8..4ec0b2f69 100644
--- a/gui/cachingImageList.py
+++ b/gui/cachingImageList.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 class CachingImageList(wx.ImageList):
     def __init__(self, width, height):
@@ -28,7 +28,7 @@ class CachingImageList(wx.ImageList):
     def GetImageIndex(self, *loaderArgs):
         id = self.map.get(loaderArgs)
         if id is None:
-            bitmap = bitmapLoader.getBitmap(*loaderArgs)
+            bitmap = BitmapLoader.getBitmap(*loaderArgs)
             if bitmap is None:
                 return -1
             id = self.map[loaderArgs] = wx.ImageList.Add(self,bitmap)
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index a35349d5c..cf2b23ea8 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -22,7 +22,7 @@ import wx
 import gui.mainFrame
 import wx.lib.newevent
 import wx.gizmos
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import service
 import gui.display as d
 from gui.contextMenu import ContextMenu
@@ -34,7 +34,7 @@ class CharacterEditor(wx.Frame):
         wx.Frame.__init__ (self, parent, id=wx.ID_ANY, title=u"pyfa: Character Editor", pos=wx.DefaultPosition,
                             size=wx.Size(641, 600), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL)
 
-        i = wx.IconFromBitmap(bitmapLoader.getBitmap("character_small", "gui"))
+        i = wx.IconFromBitmap(BitmapLoader.getBitmap("character_small", "gui"))
         self.SetIcon(i)
 
         self.disableWin=  wx.WindowDisabler(self)
@@ -67,7 +67,7 @@ class CharacterEditor(wx.Frame):
         self.navSizer.Add(self.btnSave, 0, wx.ALIGN_CENTER)
 
         buttons = (("new", wx.ART_NEW),
-                   ("rename", bitmapLoader.getBitmap("rename", "gui")),
+                   ("rename", BitmapLoader.getBitmap("rename", "gui")),
                    ("copy", wx.ART_COPY),
                    ("delete", wx.ART_DELETE))
 
@@ -281,7 +281,7 @@ class SkillTreeView (wx.Panel):
 
         self.imageList = wx.ImageList(16, 16)
         tree.SetImageList(self.imageList)
-        self.skillBookImageId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "gui"))
+        self.skillBookImageId = self.imageList.Add(BitmapLoader.getBitmap("skill_small", "gui"))
 
         tree.AddColumn("Skill")
         tree.AddColumn("Level")
@@ -388,7 +388,7 @@ class ImplantsTreeView (wx.Panel):
     def addMarketViewImage(self, iconFile):
         if iconFile is None:
             return -1
-        bitmap = bitmapLoader.getBitmap(iconFile, "icons")
+        bitmap = BitmapLoader.getBitmap(iconFile, "icons")
         if bitmap is None:
             return -1
         else:
@@ -416,9 +416,9 @@ class ImplantsTreeView (wx.Panel):
         buttonSizer = wx.BoxSizer(wx.VERTICAL)
         pmainSizer.Add(buttonSizer, 0, wx.TOP, 5)
 
-        self.btnAdd = GenBitmapButton(self, wx.ID_ADD, bitmapLoader.getBitmap("fit_add_small", "gui"), style = wx.BORDER_NONE)
+        self.btnAdd = GenBitmapButton(self, wx.ID_ADD, BitmapLoader.getBitmap("fit_add_small", "gui"), style = wx.BORDER_NONE)
         buttonSizer.Add(self.btnAdd, 0)
-        self.btnRemove = GenBitmapButton(self, wx.ID_REMOVE, bitmapLoader.getBitmap("fit_delete_small", "gui"), style = wx.BORDER_NONE)
+        self.btnRemove = GenBitmapButton(self, wx.ID_REMOVE, BitmapLoader.getBitmap("fit_delete_small", "gui"), style = wx.BORDER_NONE)
         buttonSizer.Add(self.btnRemove, 0)
 
         self.pluggedImplantsTree = AvailableImplantsView(self, style=wx.LC_SINGLE_SEL)
diff --git a/gui/characterSelection.py b/gui/characterSelection.py
index f49bc103c..2860493ea 100644
--- a/gui/characterSelection.py
+++ b/gui/characterSelection.py
@@ -19,7 +19,7 @@
 
 import wx
 import service
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.globalEvents as GE
 import gui.mainFrame
 
@@ -41,10 +41,10 @@ class CharacterSelection(wx.Panel):
 
         self.refreshCharacterList()
 
-        self.cleanSkills = bitmapLoader.getBitmap("skill_big", "gui")
-        self.redSkills   = bitmapLoader.getBitmap("skillRed_big", "gui")
-        self.greenSkills = bitmapLoader.getBitmap("skillGreen_big", "gui")
-        self.refresh     = bitmapLoader.getBitmap("refresh", "gui")
+        self.cleanSkills = BitmapLoader.getBitmap("skill_big", "gui")
+        self.redSkills   = BitmapLoader.getBitmap("skillRed_big", "gui")
+        self.greenSkills = BitmapLoader.getBitmap("skillGreen_big", "gui")
+        self.refresh     = BitmapLoader.getBitmap("refresh", "gui")
 
         self.btnRefresh = wx.BitmapButton(self, wx.ID_ANY, self.refresh)
         size = self.btnRefresh.GetSize()
diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py
index 3115737b5..27f077d58 100644
--- a/gui/chromeTabs.py
+++ b/gui/chromeTabs.py
@@ -22,7 +22,7 @@ import wx.lib.newevent
 import gui.utils.colorUtils as colorUtils
 import gui.utils.drawUtils as drawUtils
 import gui.utils.fonts as fonts
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.utils.fonts as fonts
 
 import service
@@ -336,10 +336,10 @@ class PFTabRenderer:
         closeButton -- True if tab can be closed
         """
         # tab left/right zones inclination
-        self.ctabLeft = bitmapLoader.getImage("ctableft", "gui")
-        self.ctabMiddle = bitmapLoader.getImage("ctabmiddle", "gui")
-        self.ctabRight = bitmapLoader.getImage("ctabright", "gui")
-        self.ctabClose = bitmapLoader.getImage("ctabclose", "gui")
+        self.ctabLeft = BitmapLoader.getImage("ctableft", "gui")
+        self.ctabMiddle = BitmapLoader.getImage("ctabmiddle", "gui")
+        self.ctabRight = BitmapLoader.getImage("ctabright", "gui")
+        self.ctabClose = BitmapLoader.getImage("ctabclose", "gui")
 
         self.leftWidth = self.ctabLeft.GetWidth()
         self.rightWidth = self.ctabRight.GetWidth()
@@ -595,7 +595,7 @@ class PFTabRenderer:
 class PFAddRenderer:
     def __init__(self):
         """Renders the add tab button"""
-        self.addImg = bitmapLoader.getImage("ctabadd", "gui")
+        self.addImg = BitmapLoader.getImage("ctabadd", "gui")
         self.width = self.addImg.GetWidth()
         self.height = self.addImg.GetHeight()
 
diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py
index 7a509bd23..7476d7d7f 100644
--- a/gui/fleetBrowser.py
+++ b/gui/fleetBrowser.py
@@ -1,6 +1,6 @@
 import wx
 import copy
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.mainFrame
 from gui.PFListPane import PFListPane
 import service.fleet
@@ -135,7 +135,7 @@ class FleetBrowserHeader (wx.Panel):
         wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 24), style=wx.TAB_TRAVERSAL)
         self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
 
-        self.newBmp = bitmapLoader.getBitmap("fit_add_small","gui")
+        self.newBmp = BitmapLoader.getBitmap("fit_add_small","gui")
         bmpSize = (16,16)
 
         mainSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -264,11 +264,11 @@ class FleetItem(SFItem.SFBrowserItem):
         self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
         self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False)
 
-        self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "gui")
-        self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "gui")
-        self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","gui")
-        self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "gui")
-        self.fleetBmp = bitmapLoader.getBitmap("fleet_item_big", "gui")
+        self.copyBmp = BitmapLoader.getBitmap("fit_add_small", "gui")
+        self.renameBmp = BitmapLoader.getBitmap("fit_rename_small", "gui")
+        self.deleteBmp = BitmapLoader.getBitmap("fit_delete_small","gui")
+        self.acceptBmp = BitmapLoader.getBitmap("faccept_small", "gui")
+        self.fleetBmp = BitmapLoader.getBitmap("fleet_item_big", "gui")
 
         fleetImg = self.fleetBmp.ConvertToImage()
         fleetImg = fleetImg.Blur(2)
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index ad001447d..2cedc84d1 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -19,7 +19,7 @@
 
 import wx
 import os
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.display
 import gui.globalEvents as GE
 
@@ -70,7 +70,7 @@ class GraphFrame(wx.Frame):
 
         wx.Frame.__init__(self, parent, title=u"pyfa: Graph Generator", style=style, size=(520, 390))
 
-        i = wx.IconFromBitmap(bitmapLoader.getBitmap("graphs_small", "gui"))
+        i = wx.IconFromBitmap(BitmapLoader.getBitmap("graphs_small", "gui"))
         self.SetIcon(i)
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.CreateStatusBar()
diff --git a/gui/itemStats.py b/gui/itemStats.py
index b6a39166e..6efb9af29 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -20,7 +20,7 @@
 import wx
 import re
 import gui.mainFrame
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import sys
 import wx.lib.mixins.listctrl as listmix
 import wx.html
@@ -77,7 +77,7 @@ class ItemStatsDialog(wx.Dialog):
         if item.icon is not None:
             before,sep,after = item.icon.iconFile.rpartition("_")
             iconFile = "%s%s%s" % (before,sep,"0%s" % after if len(after) < 2 else after)
-            itemImg = bitmapLoader.getBitmap(iconFile, "icons")
+            itemImg = BitmapLoader.getBitmap(iconFile, "icons")
             if itemImg is not None:
                 self.SetIcon(wx.IconFromBitmap(itemImg))
         self.SetTitle("%s: %s" % ("%s Stats" % itmContext if itmContext is not None else "Stats", item.name))
@@ -364,16 +364,16 @@ class ItemParams (wx.Panel):
             if info:
                 if info.icon is not None:
                     iconFile = info.icon.iconFile
-                    icon = bitmapLoader.getBitmap(iconFile, "icons")
+                    icon = BitmapLoader.getBitmap(iconFile, "icons")
 
                     if icon is None:
-                        icon = bitmapLoader.getBitmap("transparent16x16", "gui")
+                        icon = BitmapLoader.getBitmap("transparent16x16", "gui")
 
                     attrIcon = self.imageList.Add(icon)
                 else:
-                    attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                    attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
             else:
-                attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
 
 
             index = self.paramList.InsertImageStringItem(sys.maxint, attrName,attrIcon)
@@ -461,7 +461,7 @@ class ItemRequirements ( wx.Panel ):
 
         self.imageList = wx.ImageList(16, 16)
         self.reqTree.SetImageList(self.imageList)
-        skillBookId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "gui"))
+        skillBookId = self.imageList.Add(BitmapLoader.getBitmap("skill_small", "gui"))
 
         self.getFullSkillTree(item,self.root,skillBookId)
 
@@ -753,7 +753,7 @@ class ItemAffectedBy (wx.Panel):
             if thing == self.stuff:
                 parent = root
             else:  # projected fit
-                icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui"))
+                icon = self.imageList.Add(BitmapLoader.getBitmap("ship_small", "gui"))
                 child = self.affectedBy.AppendItem(root, "{} ({})".format(thing.name, thing.ship.item.name), icon)
                 parent = child
 
@@ -767,14 +767,14 @@ class ItemAffectedBy (wx.Panel):
                 if attrInfo:
                     if attrInfo.icon is not None:
                         iconFile = attrInfo.icon.iconFile
-                        icon = bitmapLoader.getBitmap(iconFile, "icons")
+                        icon = BitmapLoader.getBitmap(iconFile, "icons")
                         if icon is None:
-                            icon = bitmapLoader.getBitmap("transparent16x16", "gui")
+                            icon = BitmapLoader.getBitmap("transparent16x16", "gui")
                         attrIcon = self.imageList.Add(icon)
                     else:
-                        attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                        attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
                 else:
-                    attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                    attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
 
                 if self.showRealNames:
                     display = attrName
@@ -794,9 +794,9 @@ class ItemAffectedBy (wx.Panel):
                     afflictorType, afflictor, item, attrModifier, attrAmount, projected = itemInfo
 
                     if afflictorType == Ship:
-                        itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui"))
+                        itemIcon = self.imageList.Add(BitmapLoader.getBitmap("ship_small", "gui"))
                     elif item.icon:
-                        bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "icons")
+                        bitmap = BitmapLoader.getBitmap(item.icon.iconFile, "icons")
                         itemIcon = self.imageList.Add(bitmap) if bitmap else -1
                     else:
                         itemIcon = -1
@@ -884,7 +884,7 @@ class ItemAffectedBy (wx.Panel):
             if thing == self.stuff:
                 parent = root
             else:  # projected fit
-                icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui"))
+                icon = self.imageList.Add(BitmapLoader.getBitmap("ship_small", "gui"))
                 child = self.affectedBy.AppendItem(root, "{} ({})".format(thing.name, thing.ship.item.name), icon)
                 parent = child
 
@@ -897,9 +897,9 @@ class ItemAffectedBy (wx.Panel):
                 afflictorType, afflictors, attrData, item, projected = info
                 counter = len(afflictors)
                 if afflictorType == Ship:
-                    itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui"))
+                    itemIcon = self.imageList.Add(BitmapLoader.getBitmap("ship_small", "gui"))
                 elif item.icon:
-                    bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "icons")
+                    bitmap = BitmapLoader.getBitmap(item.icon.iconFile, "icons")
                     itemIcon = self.imageList.Add(bitmap) if bitmap else -1
                 else:
                     itemIcon = -1
@@ -925,15 +925,15 @@ class ItemAffectedBy (wx.Panel):
                         if attrInfo:
                             if attrInfo.icon is not None:
                                 iconFile = attrInfo.icon.iconFile
-                                icon = bitmapLoader.getBitmap(iconFile, "icons")
+                                icon = BitmapLoader.getBitmap(iconFile, "icons")
                                 if icon is None:
-                                    icon = bitmapLoader.getBitmap("transparent16x16", "gui")
+                                    icon = BitmapLoader.getBitmap("transparent16x16", "gui")
 
                                 attrIcon = self.imageList.Add(icon)
                             else:
-                                attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                                attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
                         else:
-                            attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons"))
+                            attrIcon = self.imageList.Add(BitmapLoader.getBitmap("07_15", "icons"))
 
                         if attrModifier == "s*":
                             attrModifier = "*"
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 25b9b6895..38ad1e968 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -36,7 +36,7 @@ import gui.chromeTabs
 import gui.utils.animUtils as animUtils
 import gui.globalEvents as GE
 
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 from gui.mainMenuBar import MainMenuBar
 from gui.additionsPane import AdditionsPane
 from gui.marketBrowser import MarketBrowser, ItemSelected
@@ -114,7 +114,7 @@ class MainFrame(wx.Frame):
             self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) )
 
         #Load and set the icon for pyfa main window
-        i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "gui"))
+        i = wx.IconFromBitmap(BitmapLoader.getBitmap("pyfa", "gui"))
         self.SetIcon(i)
 
         #Create the layout and windows
@@ -139,8 +139,8 @@ class MainFrame(wx.Frame):
 
         self.notebookBrowsers = gui.chromeTabs.PFNotebook(self.splitter, False)
 
-        marketImg = bitmapLoader.getImage("market_small", "gui")
-        shipBrowserImg = bitmapLoader.getImage("ship_small", "gui")
+        marketImg = BitmapLoader.getImage("market_small", "gui")
+        shipBrowserImg = BitmapLoader.getImage("ship_small", "gui")
 
         self.marketBrowser = MarketBrowser(self.notebookBrowsers)
         self.notebookBrowsers.AddPage(self.marketBrowser, "Market", tabImage = marketImg, showClose = False)
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 3e9efd623..880dfc385 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -19,7 +19,7 @@
 
 import wx
 import config
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.mainFrame
 import gui.graphFrame
 import gui.globalEvents as GE
@@ -76,23 +76,23 @@ class MainMenuBar(wx.MenuBar):
         self.Append(windowMenu, "&Window")
 
         charEditItem = wx.MenuItem(windowMenu, self.characterEditorId, "&Character Editor\tCTRL+E")
-        charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small", "gui"))
+        charEditItem.SetBitmap(BitmapLoader.getBitmap("character_small", "gui"))
         windowMenu.AppendItem(charEditItem)
 
         damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D")
-        damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "gui"))
+        damagePatternEditItem.SetBitmap(BitmapLoader.getBitmap("damagePattern_small", "gui"))
         windowMenu.AppendItem(damagePatternEditItem)
 
         targetResistsEditItem = wx.MenuItem(windowMenu, self.targetResistsEditorId, "Target Resists Editor\tCTRL+R")
-        targetResistsEditItem.SetBitmap(bitmapLoader.getBitmap("explosive_big", "gui"))
+        targetResistsEditItem.SetBitmap(BitmapLoader.getBitmap("explosive_big", "gui"))
         windowMenu.AppendItem(targetResistsEditItem)
 
         graphFrameItem = wx.MenuItem(windowMenu, self.graphFrameId, "Graphs\tCTRL+G")
-        graphFrameItem.SetBitmap(bitmapLoader.getBitmap("graphs_small", "gui"))
+        graphFrameItem.SetBitmap(BitmapLoader.getBitmap("graphs_small", "gui"))
         windowMenu.AppendItem(graphFrameItem)
 
         preferencesItem = wx.MenuItem(windowMenu, wx.ID_PREFERENCES, "Preferences\tCTRL+P")
-        preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "gui"))
+        preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui"))
         windowMenu.AppendItem(preferencesItem)
 
         # Help menu
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index 88a72d023..53f704c37 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -24,7 +24,7 @@ from gui.cachingImageList import CachingImageList
 from gui.contextMenu import ContextMenu
 import gui.PFSearchBox as SBox
 
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent()
 
@@ -105,8 +105,8 @@ class MarketBrowser(wx.Panel):
 class SearchBox(SBox.PFSearchBox):
     def __init__(self, parent):
         SBox.PFSearchBox.__init__(self, parent)
-        cancelBitmap = bitmapLoader.getBitmap("fit_delete_small","gui")
-        searchBitmap = bitmapLoader.getBitmap("fsearch_small","gui")
+        cancelBitmap = BitmapLoader.getBitmap("fit_delete_small","gui")
+        searchBitmap = BitmapLoader.getBitmap("fsearch_small","gui")
         self.SetSearchBitmap(searchBitmap)
         self.SetCancelBitmap(cancelBitmap)
         self.ShowSearchButton()
diff --git a/gui/patternEditor.py b/gui/patternEditor.py
index 8dce4c18e..40b8e45aa 100644
--- a/gui/patternEditor.py
+++ b/gui/patternEditor.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import service
 from wx.lib.intctrl import IntCtrl
 from gui.utils.clipboard import toClipboard, fromClipboard
@@ -61,7 +61,7 @@ class DmgPatternEditorDlg(wx.Dialog):
         size = None
         headerSizer.Add(self.ccDmgPattern, 1, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT|wx.LEFT, 3)
         buttons = (("new", wx.ART_NEW),
-                   ("rename", bitmapLoader.getBitmap("rename", "gui")),
+                   ("rename", BitmapLoader.getBitmap("rename", "gui")),
                    ("copy", wx.ART_COPY),
                    ("delete", wx.ART_DELETE))
         for name, art in buttons:
@@ -90,10 +90,10 @@ class DmgPatternEditorDlg(wx.Dialog):
         mainSizer.Add(self.sl, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
 
         contentSizer = wx.BoxSizer(wx.VERTICAL)
-        self.embitmap = bitmapLoader.getBitmap("em_big", "gui")
-        self.thermbitmap = bitmapLoader.getBitmap("thermal_big", "gui")
-        self.kinbitmap = bitmapLoader.getBitmap("kinetic_big", "gui")
-        self.expbitmap = bitmapLoader.getBitmap("explosive_big", "gui")
+        self.embitmap = BitmapLoader.getBitmap("em_big", "gui")
+        self.thermbitmap = BitmapLoader.getBitmap("thermal_big", "gui")
+        self.kinbitmap = BitmapLoader.getBitmap("kinetic_big", "gui")
+        self.expbitmap = BitmapLoader.getBitmap("explosive_big", "gui")
 
         dmgeditSizer = wx.FlexGridSizer(2, 6, 0, 2)
         dmgeditSizer.AddGrowableCol(0)
@@ -105,7 +105,7 @@ class DmgPatternEditorDlg(wx.Dialog):
         defSize = wx.Size(width,-1)
 
         for i, type in enumerate(self.DAMAGE_TYPES):
-            bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "gui"))
+            bmp = wx.StaticBitmap(self, wx.ID_ANY, BitmapLoader.getBitmap("%s_big"%type, "gui"))
             if i%2:
                 style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT
                 border = 10
diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py
index bdf5afb35..4274d3fa8 100644
--- a/gui/preferenceDialog.py
+++ b/gui/preferenceDialog.py
@@ -19,14 +19,14 @@
 
 import wx
 from gui.preferenceView import PreferenceView
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 class PreferenceDialog(wx.Dialog):
 
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, id=wx.ID_ANY, size=wx.DefaultSize, style=wx.DEFAULT_DIALOG_STYLE)
         self.SetTitle("pyfa - Preferences")
-        i = wx.IconFromBitmap(bitmapLoader.getBitmap("preferences_small", "gui"))
+        i = wx.IconFromBitmap(BitmapLoader.getBitmap("preferences_small", "gui"))
         self.SetIcon(i)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
diff --git a/gui/pyfatogglepanel.py b/gui/pyfatogglepanel.py
index c5eeec026..7b2d2b849 100644
--- a/gui/pyfatogglepanel.py
+++ b/gui/pyfatogglepanel.py
@@ -24,7 +24,7 @@
 ###########################################################################
 
 import wx
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 
 ###########################################################################
 ## Class TogglePanel
@@ -54,8 +54,8 @@ class TogglePanel ( wx.Panel ):
 
         #    Load expanded/collapsed bitmaps from the icons folder
 
-        self.bmpExpanded = bitmapLoader.getBitmap("down-arrow2","gui")
-        self.bmpCollapsed = bitmapLoader.getBitmap("up-arrow2","gui")
+        self.bmpExpanded = BitmapLoader.getBitmap("down-arrow2","gui")
+        self.bmpCollapsed = BitmapLoader.getBitmap("up-arrow2","gui")
 
         #    Make the bitmaps have the same color as window text
 
diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py
index 97b8fb16d..3d8ac6ef2 100644
--- a/gui/resistsEditor.py
+++ b/gui/resistsEditor.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import service
 from gui.utils.clipboard import toClipboard, fromClipboard
 from service.targetResists import ImportError
@@ -55,7 +55,7 @@ class ResistsEditorDlg(wx.Dialog):
         headerSizer.Add(self.ccResists, 1, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT | wx.LEFT, 3)
 
         buttons = (("new", wx.ART_NEW),
-                   ("rename", bitmapLoader.getBitmap("rename", "gui")),
+                   ("rename", BitmapLoader.getBitmap("rename", "gui")),
                    ("copy", wx.ART_COPY),
                    ("delete", wx.ART_DELETE))
         for name, art in buttons:
@@ -103,7 +103,7 @@ class ResistsEditorDlg(wx.Dialog):
                 style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT
                 border = 5
 
-            bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "gui"))
+            bmp = wx.StaticBitmap(self, wx.ID_ANY, BitmapLoader.getBitmap("%s_big"%type, "gui"))
             resistEditSizer.Add(bmp, 0, style, border)
             # set text edit
             setattr(self, "%sEdit"%type, wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, defSize))
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 5629adce7..28522c47a 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1,6 +1,6 @@
 import wx
 import copy
-from gui import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import gui.mainFrame
 import gui.globalEvents as GE
 import time
@@ -107,9 +107,9 @@ class RaceSelector(wx.Window):
         self.buttonsPadding = 4
 
         if layout == wx.VERTICAL:
-            self.bmpArrow = bitmapLoader.getBitmap("down-arrow2","gui")
+            self.bmpArrow = BitmapLoader.getBitmap("down-arrow2","gui")
         else:
-            self.bmpArrow = bitmapLoader.getBitmap("up-arrow2","gui")
+            self.bmpArrow = BitmapLoader.getBitmap("up-arrow2","gui")
 
         #    Make the bitmaps have the same color as window text
 
@@ -207,7 +207,7 @@ class RaceSelector(wx.Window):
         self.raceBmps = []
         for race in races:
             if race:
-                self.raceBmps.append(bitmapLoader.getBitmap("race_%s_small" % race, "gui"))
+                self.raceBmps.append(BitmapLoader.getBitmap("race_%s_small" % race, "gui"))
         self.raceNames = races
         self.CalcButtonsBarPos()
         self.Refresh()
@@ -328,14 +328,14 @@ class NavigationPanel(SFItem.SFBrowserItem):
     def __init__(self,parent, size = (-1, 24)):
         SFItem.SFBrowserItem.__init__(self,parent,size = size)
 
-        self.rewBmpH = bitmapLoader.getBitmap("frewind_small","gui")
-        self.forwBmp = bitmapLoader.getBitmap("fforward_small","gui")
-        self.searchBmpH = bitmapLoader.getBitmap("fsearch_small","gui")
-        self.newBmpH = bitmapLoader.getBitmap("fit_add_small","gui")
-        self.resetBmpH = bitmapLoader.getBitmap("freset_small","gui")
-        self.switchBmpH = bitmapLoader.getBitmap("fit_switch_view_mode_small","gui")
+        self.rewBmpH = BitmapLoader.getBitmap("frewind_small","gui")
+        self.forwBmp = BitmapLoader.getBitmap("fforward_small","gui")
+        self.searchBmpH = BitmapLoader.getBitmap("fsearch_small","gui")
+        self.newBmpH = BitmapLoader.getBitmap("fit_add_small","gui")
+        self.resetBmpH = BitmapLoader.getBitmap("freset_small","gui")
+        self.switchBmpH = BitmapLoader.getBitmap("fit_switch_view_mode_small","gui")
 
-        switchImg = bitmapLoader.getImage("fit_switch_view_mode_small","gui")
+        switchImg = BitmapLoader.getImage("fit_switch_view_mode_small","gui")
         switchImg = switchImg.AdjustChannels(1,1,1,0.4)
         self.switchBmpD = wx.BitmapFromImage(switchImg)
 
@@ -967,7 +967,7 @@ class CategoryItem(SFItem.SFBrowserItem):
         SFItem.SFBrowserItem.__init__(self,parent,size = size)
 
         if categoryID:
-            self.shipBmp = bitmapLoader.getBitmap("ship_small","gui")
+            self.shipBmp = BitmapLoader.getBitmap("ship_small","gui")
         else:
             self.shipBmp = wx.EmptyBitmap(16,16)
 
@@ -1099,26 +1099,26 @@ class ShipItem(SFItem.SFBrowserItem):
 
         self.shipBmp = None
         if shipID:
-            self.shipBmp = bitmapLoader.getBitmap(str(shipID), "renders")
+            self.shipBmp = BitmapLoader.getBitmap(str(shipID), "renders")
         if not self.shipBmp:
-            self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big", "gui")
+            self.shipBmp = BitmapLoader.getBitmap("ship_no_image_big", "gui")
 
         self.shipFittingInfo = shipFittingInfo
         self.shipName, self.shipFits = shipFittingInfo
 
-        self.newBmp = bitmapLoader.getBitmap("fit_add_small", "gui")
-        self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "gui")
+        self.newBmp = BitmapLoader.getBitmap("fit_add_small", "gui")
+        self.acceptBmp = BitmapLoader.getBitmap("faccept_small", "gui")
 
-        self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","gui")
+        self.shipEffBk = BitmapLoader.getBitmap("fshipbk_big","gui")
 
         img = wx.ImageFromBitmap(self.shipEffBk)
         img = img.Mirror(False)
         self.shipEffBkMirrored = wx.BitmapFromImage(img)
 
-        self.raceBmp = bitmapLoader.getBitmap("race_%s_small" % self.shipRace, "gui")
+        self.raceBmp = BitmapLoader.getBitmap("race_%s_small" % self.shipRace, "gui")
 
         if not self.raceBmp:
-            self.raceBmp = bitmapLoader.getBitmap("fit_delete_small","gui")
+            self.raceBmp = BitmapLoader.getBitmap("fit_delete_small","gui")
 
         self.raceDropShadowBmp = drawUtils.CreateDropShadowBitmap(self.raceBmp, 0.2)
 
@@ -1429,10 +1429,10 @@ class FitItem(SFItem.SFBrowserItem):
         self.deleted = False
 
         if shipID:
-            self.shipBmp = bitmapLoader.getBitmap(str(shipID),"renders")
+            self.shipBmp = BitmapLoader.getBitmap(str(shipID),"renders")
 
         if not self.shipBmp:
-            self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big","gui")
+            self.shipBmp = BitmapLoader.getBitmap("ship_no_image_big","gui")
 
         self.shipFittingInfo = shipFittingInfo
         self.shipName, self.fitName, self.fitBooster, self.timestamp = shipFittingInfo
@@ -1440,13 +1440,13 @@ class FitItem(SFItem.SFBrowserItem):
         # see GH issue #62
         if self.fitBooster is None: self.fitBooster = False
 
-        self.boosterBmp = bitmapLoader.getBitmap("fleet_fc_small", "gui")
-        self.copyBmp    = bitmapLoader.getBitmap("fit_add_small", "gui")
-        self.renameBmp  = bitmapLoader.getBitmap("fit_rename_small", "gui")
-        self.deleteBmp  = bitmapLoader.getBitmap("fit_delete_small","gui")
-        self.acceptBmp  = bitmapLoader.getBitmap("faccept_small", "gui")
+        self.boosterBmp = BitmapLoader.getBitmap("fleet_fc_small", "gui")
+        self.copyBmp    = BitmapLoader.getBitmap("fit_add_small", "gui")
+        self.renameBmp  = BitmapLoader.getBitmap("fit_rename_small", "gui")
+        self.deleteBmp  = BitmapLoader.getBitmap("fit_delete_small","gui")
+        self.acceptBmp  = BitmapLoader.getBitmap("faccept_small", "gui")
 
-        self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","gui")
+        self.shipEffBk = BitmapLoader.getBitmap("fshipbk_big","gui")
 
         img = wx.ImageFromBitmap(self.shipEffBk)
         img = img.Mirror(False)
diff --git a/gui/updateDialog.py b/gui/updateDialog.py
index fa5b9f83d..a01c5a5bc 100644
--- a/gui/updateDialog.py
+++ b/gui/updateDialog.py
@@ -18,7 +18,7 @@
 #===============================================================================
 
 import wx
-import bitmapLoader
+from gui.bitmapLoader import BitmapLoader
 import config
 import service
 import dateutil.parser