diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py
index 0fd4938d3..87f3004b4 100644
--- a/gui/builtinContextMenus/moduleAmmoChange.py
+++ b/gui/builtinContextMenus/moduleAmmoChange.py
@@ -102,6 +102,9 @@ class ChangeModuleAmmo(ContextMenuCombined):
             menuItems = []
             for chargeCatName, charges in chargeDict.items():
                 menuItem = wx.MenuItem(menu, wx.ID_ANY, self.ddMissileChargeCatTrans.get(chargeCatName, chargeCatName))
+                bitmap = BitmapLoader.getBitmap("%s_small" % chargeCatName, "gui")
+                if bitmap is not None:
+                    menuItem.SetBitmap(bitmap)
                 menuItems.append(menuItem)
                 subMenu = wx.Menu()
                 subMenu.Bind(wx.EVT_MENU, self.handleAmmoSwitch)
diff --git a/pyfa.py b/pyfa.py
index 6b4186048..c5394b0a7 100755
--- a/pyfa.py
+++ b/pyfa.py
@@ -74,7 +74,7 @@ parser.add_option("-s", "--savepath", action="store", dest="savepath", help="Set
 parser.add_option("-l", "--logginglevel", action="store", dest="logginglevel", help="Set desired logging level [Critical|Error|Warning|Info|Debug]", default="Error")
 parser.add_option("-p", "--profile", action="store", dest="profile_path", help="Set location to save profileing.", default=None)
 
-parser.add_option("-i", "--language", action="store", dest="language", help="Set the language for pyfa", default=None)
+parser.add_option("-i", "--language", action="store", dest="language", help="Set the language for pyfa", default='zh')
 
 (options, args) = parser.parse_args()