diff --git a/salt/electrum/create.sls b/salt/electrum/create.sls
index 5188743..c4a7a52 100644
--- a/salt/electrum/create.sls
+++ b/salt/electrum/create.sls
@@ -22,6 +22,7 @@ prefs:
 features:
 - set:
   - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop electrum.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 {%- endload %}
 {{ load(defaults) }}
 
@@ -33,6 +34,10 @@ require:
 prefs:
 - audiovm: ""
 - default_dispvm: ""
+features:
+- set:
+  - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "updatevm-sys-bitcoin-gateway"
@@ -124,6 +129,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -156,6 +163,8 @@ features:
   - appmenus-dispvm
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
diff --git a/salt/sys-bitcoin/create.sls b/salt/sys-bitcoin/create.sls
index cba2013..1f27717 100644
--- a/salt/sys-bitcoin/create.sls
+++ b/salt/sys-bitcoin/create.sls
@@ -52,6 +52,10 @@ require:
 prefs:
 - audiovm: ""
 - default_dispvm: ""
+features:
+- set:
+  - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "updatevm-sys-bitcoin-gateway"
@@ -87,6 +91,8 @@ features:
   - service.cups
   - service.cups-browsed
   - service.meminfo-writer
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -118,6 +124,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -150,6 +158,8 @@ features:
   - appmenus-dispvm
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -186,18 +196,14 @@ features:
 tags:
 - del:
   - "bitcoin-client"
-
 {%- endload %}
 {{ load(defaults) }}
 
-## TODO: remove comment of volume extension
-{#
 "{{ slsdotpath }}-extend-private-volume":
   cmd.run:
     - require:
       - qvm: {{ slsdotpath }}
     - name: qvm-volume extend {{ slsdotpath }}:private 1Ti
-#}
 
 "{{ slsdotpath }}-extend-builder-private-volume":
   cmd.run:
diff --git a/salt/sys-electrs/create.sls b/salt/sys-electrs/create.sls
index d3c4340..3cafbc8 100644
--- a/salt/sys-electrs/create.sls
+++ b/salt/sys-electrs/create.sls
@@ -17,6 +17,10 @@ require:
 - sls: {{ slsdotpath }}.clone
 prefs:
 - audiovm: ""
+features:
+- set:
+  - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 {%- endload %}
 {{ load(defaults) }}
 
@@ -45,6 +49,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "bitcoin-client"
@@ -59,6 +65,9 @@ require:
 prefs:
 - audiovm: ""
 - default_dispvm: ""
+features:
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 ## See comment in clone.sls.
 {% if salt['cmd.shell']('qvm-features tpl-electrs-builder') == "whonix-ws" %}
 tags:
@@ -98,6 +107,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -135,6 +146,8 @@ features:
   - appmenus-dispvm
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
diff --git a/salt/sys-electrumx/create.sls b/salt/sys-electrumx/create.sls
index d7b7000..3e5738e 100644
--- a/salt/sys-electrumx/create.sls
+++ b/salt/sys-electrumx/create.sls
@@ -17,6 +17,10 @@ require:
 - sls: {{ slsdotpath }}.clone
 prefs:
 - audiovm: ""
+features:
+- set:
+  - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 {%- endload %}
 {{ load(defaults) }}
 
@@ -45,6 +49,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "bitcoin-client"
@@ -59,6 +65,10 @@ require:
 prefs:
 - audiovm: ""
 - default_dispvm: ""
+features:
+- set:
+  - default-menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "updatevm-sys-bitcoin-gateway"
@@ -90,6 +100,8 @@ features:
 - disable:
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"
@@ -122,6 +134,8 @@ features:
   - appmenus-dispvm
   - service.cups
   - service.cups-browsed
+- set:
+  - menu-items: "qubes-run-terminal.desktop qubes-start.desktop"
 tags:
 - add:
   - "anon-bitcoin-vm"