Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/aga/qubes-manager

mainwindow.ui

@@ -272,7 +272,6 @@
    <addaction name="action_resumevm"/>
    <addaction name="action_pausevm"/>
    <addaction name="action_shutdownvm"/>
-   <addaction name="action_killvm"/>
    <addaction name="separator"/>
    <addaction name="action_settings"/>
    <addaction name="action_editfwrules"/>

qubesmanager/main.py

@@ -477,11 +477,11 @@ class VmUpdateInfoWidget(QWidget):
             tooltip_text = "VM up to date"
         elif state == "update":
             label_text = "<font color=\"#CCCC00\">Check updates</font>"
-            icon_path = ":/flag-yellow.png"
+            icon_path = ":/update-recommended.png"
             tooltip_text = "Update recommended"
         elif state == "outdated":
             label_text = "<font color=\"red\">VM outdated</font>"
-            icon_path = ":/flag-red.png"
+            icon_path = ":/outdated.png"
             tooltip_text = "VM outdated"
 
         if self.show_text:

resources.qrc

@@ -7,13 +7,13 @@
     <file alias="backup.png">icons/backup.png</file>
     <file alias="global-settings.png">icons/global-settings.png</file>
     <file alias="off.png">icons/on-icon/off.png</file>
-    <file alias="on-old.png">icons/on-icon/on.png</file>
+    <file alias="outdated.png">icons/outdated.png</file>
+    <file alias="update-recommended.png">icons/update-recommended.png</file>
     <file alias="show-all-running.png">icons/show-all-running.png</file>
     <file alias="mount.png">icons/mount.png</file>
     <file alias="log.png">icons/log.png</file>
     <file alias="kbd-layout.png">icons/kbd-layout.png</file>
     <file alias="pencil.png">icons/pencil.png</file>
-    <file alias="redfirewall.png">icons/redfirewall.png</file>
     <file alias="edit.png">icons/edit.png</file>
     <file alias="add.png">icons/add.png</file>
     <file alias="flag-blue.png">icons/flag-blue.png</file>