Use Standalone/AppVM icon for HVM

Instead of separate HVM icon.

qubesmanager/main.py

@@ -159,15 +159,12 @@ class VmTypeWidget(VmIconWidget):
         elif vm.is_proxyvm():
             self.value = 2
             return (":/proxyvm.png", "ProxyVM")
-        elif vm.type == "HVM":
-            self.value = 5
-            return (":/hvm.png", "HVM")
-        elif vm.is_template():
-            self.value = 3
-            return (":/templatevm.png", "TemplateVM")
         elif vm.is_appvm() and vm.template is None:
             self.value = 4
             return (":/standalonevm.png", "StandaloneVM")
+        elif vm.is_template():
+            self.value = 3
+            return (":/templatevm.png", "TemplateVM")
         elif vm.is_appvm() or vm.is_disposablevm():
             self.value = 5 + vm.label.index
             return (":/appvm.png", "AppVM")

resources.qrc

@@ -31,7 +31,6 @@
     <file alias="qubes.png">icons/qubes.png</file>
     <file alias="appvm.png">icons/appvm.png</file>
     <file alias="netvm.png">icons/netvm.png</file>
-    <file alias="hvm.png">icons/hvm.png</file>
     <file alias="proxyvm.png">icons/proxyvm.png</file>
     <file alias="standalonevm.png">icons/standalonevm.png</file>
     <file alias="networking.png">icons/networking.png</file>