diff --git a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl
index 10932419..074b0d1e 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_70-misc-bug-fixes.tmpl
@@ -50,18 +50,21 @@ SOURCE_DIR="/usr/local/share/icons/Candy/apps/scalable"
 TARGET_DIR="/usr/local/share/icons/Candy/apps/scalable"
 if [ -d "$SOURCE_DIR" ] && [ -d "$TARGET_DIR" ]; then
     logg info 'Adding similar substitutes for some apps in the Candy icons theme'
-    if [ -f "$SOURCE_DIR/youtube-dl-gui.svg" ]; then
+    if [ -f "$SOURCE_DIR/youtube-dl-gui.svg" ] && [ ! -f "$TARGET_DIR/com.github.Johnn3y.Forklift.svg" ]; then
         sudo cp -f "$SOURCE_DIR/youtube-dl-gui.svg" "$TARGET_DIR/com.github.Johnn3y.Forklift.svg"
     fi
-    if [ -f "$SOURCE_DIR/rdm.svg" ]; then
+    if [ -f "$SOURCE_DIR/rdm.svg" ] && [ ! -f "$TARGET_DIR/app.resp.RESP.svg" ]; then
         sudo cp -f "$SOURCE_DIR/rdm.svg" "$TARGET_DIR/app.resp.RESP.svg"
     fi
-    if [ -f "$SOURCE_DIR/preferences-system-power.svg" ]; then
+    if [ -f "$SOURCE_DIR/preferences-system-power.svg" ] && [ ! -f "$TARGET_DIR/org.gnome.PowerStats.svg" ]; then
         sudo cp -f "$SOURCE_DIR/preferences-system-power.svg" "$TARGET_DIR/org.gnome.PowerStats.svg"
     fi
-    if [ -f "$SOURCE_DIR/software-store.svg" ]; then
+    if [ -f "$SOURCE_DIR/software-store.svg" ] && [ ! -f "$TARGET_DIR/software-properties-gtk.svg" ]; then
         sudo cp -f "$SOURCE_DIR/software-store.svg" "$TARGET_DIR/software-properties-gtk.svg"
     fi
+    if [ -f "$SOURCE_DIR/preferences-desktop-remote-desktop.svg" ] && [ ! -f "$TARGET_DIR/org.gnome.Connections.svg" ]; then
+        sudo cp -f "$SOURCE_DIR/preferences-desktop-remote-desktop.svg" "$TARGET_DIR/org.gnome.Connections.svg"
+    fi
 fi
 
 ### Icons added to fork (https://github.com/ProfessorManhattan/candy-icons)
diff --git a/home/dot_local/bin/executable_open b/home/dot_local/bin/executable_open
index 0c7da3d5..2e34acf2 100644
--- a/home/dot_local/bin/executable_open
+++ b/home/dot_local/bin/executable_open
@@ -9,6 +9,8 @@
 #   It is used to handle cross-VM links when Gas Station is used to provision [Qubes](https://www.qubes-os.org/).
 #   When called with -d, the default program is used.
 
+# TODO Add support for opening .desktop files with gtk-launch (i.e. `gtk-launch my-app.desktop`)
+
 # Default to system open executable on macOS
 if [ -d /Applications ] && [ -d /Library ]; then
   /usr/bin/open "$*" && exit 0