diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
index 6f6164aa..63dd2f7f 100644
--- a/qubesmanager/qube_manager.py
+++ b/qubesmanager/qube_manager.py
@@ -99,11 +99,12 @@ def __init__(self):
                 "Running" : QIcon(":/running"),
                 "Paused" : QIcon(":/paused"),
                 "Suspended" : QIcon(":/paused"),
-                "Transient" : QIcon(":/transient"),
+                "Starting" : QIcon(":/transient"),
                 "Halting" : QIcon(":/transient"),
                 "Dying" : QIcon(":/transient"),
                 "Halted" : QIcon(":/blank"),
                 "Blocked" : QIcon(":/ban"),
+                "NA" : QIcon(":/transient"),
                 }
         self.preloadIcon = QIcon(":/preloaded")
         self.preloadTooltip = (
@@ -170,7 +171,7 @@ def paint(self, qp, option, index):
 
         # draw the main state icon, assuming all items have one
         qp.drawPixmap(iconRect,
-            self.stateIcons[index.data()['power']].pixmap(iconSize))
+            self.stateIcons.get(index.data()['power'], 'NA').pixmap(iconSize))
 
         left = delta = margin + iconRect.width()
         if index.data()['outdated']:
@@ -549,9 +550,9 @@ def data(self, index, role):
                 state = vm.state.get('power', '')
                 try:
                     ordered_state = str(
-                        ["Running", "Transient", "Halting", "Paused",
-                         "Suspended", "Dying", "Crashed",
-                         "Halted", "NA"].index(state))
+                        ["Running", "Starting", "Paused", "Suspended",
+                         "Dying", "Halting", "Crashed", "Halted",
+                         "NA"].index(state))
                 except ValueError:
                     ordered_state = state
                 updated = vm.state.get('outdated', '')
@@ -1395,7 +1396,7 @@ def table_selection_changed(self):
             #  TODO: add boot from device to menu and add windows tools there
             # Update available actions:
             if vm.state['power'] in \
-                    ['Running', 'Transient', 'Halting', 'Dying']:
+                    ['Running', 'Starting', 'Halting', 'Dying']:
                 self.action_resumevm.setEnabled(False)
                 self.action_removevm.setEnabled(False)
                 self.template_menu.setEnabled(False)
@@ -1405,7 +1406,7 @@ def table_selection_changed(self):
                 self.action_restartvm.setEnabled(False)
                 self.action_open_console.setEnabled(False)
                 self.template_menu.setEnabled(False)
-            elif vm.state['power'] == 'Suspend':
+            elif vm.state['power'] == 'Suspended':
                 self.action_removevm.setEnabled(False)
                 self.action_pausevm.setEnabled(False)
                 self.action_open_console.setEnabled(False)