diff --git a/data_from_portwine/img/bat.png b/data_from_portwine/img/bat.png
new file mode 100644
index 0000000..424a9ca
Binary files /dev/null and b/data_from_portwine/img/bat.png differ
diff --git a/data_from_portwine/img/exe.png b/data_from_portwine/img/exe.png
new file mode 100644
index 0000000..ab46314
Binary files /dev/null and b/data_from_portwine/img/exe.png differ
diff --git a/data_from_portwine/img/msi.png b/data_from_portwine/img/msi.png
new file mode 100644
index 0000000..ea8c2c8
Binary files /dev/null and b/data_from_portwine/img/msi.png differ
diff --git a/data_from_portwine/img/reg.png b/data_from_portwine/img/reg.png
new file mode 100644
index 0000000..b231277
Binary files /dev/null and b/data_from_portwine/img/reg.png differ
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 8751394..1a55e87 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1682,8 +1682,18 @@ edit_user_conf_from_gui () {
 }
 
 pw_create_gui_png () {
-    if echo "$(basename "${portwine_exe}")" | grep -i "setup\|install" &>/dev/null ; then
+    basename_portwine_exe="$(basename "${portwine_exe}")"
+    if echo "$basename_portwine_exe" | grep -i "setup\|install\|.msi" &>/dev/null ; then
         export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/setup.png"
+        export name_desktop_png="setup"
+        return 0
+    elif echo "$basename_portwine_exe" | grep -i ".reg" &>/dev/null ; then
+        export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/reg.png"
+        export name_desktop_png="reg"
+        return 0
+    elif echo "$basename_portwine_exe"| grep -i ".bat" &>/dev/null ; then
+        export PW_ICON_FOR_YAD="${PORT_WINE_PATH}/data/img/bat.png"
+        export name_desktop_png="bat"
         return 0
     fi
 
@@ -4666,15 +4676,21 @@ portwine_create_shortcut () {
     export GDK_BACKEND="x11"
     pw_stop_progress_bar
     [[ ! -e ${portwine_exe} ]] && return 1
-    unset PORTPROTON_NAME
+    unset PORTPROTON_NAME name_desktop_png
     pw_create_gui_png
 
     [[ -z "${PW_SHORTCUT_MENU}" ]] && PW_SHORTCUT_MENU="TRUE"
     [[ -z "${PW_SHORTCUT_DESKTOP}" ]] && PW_SHORTCUT_DESKTOP="TRUE"
     [[ -z "${PW_SHORTCUT_STEAM}" ]] && PW_SHORTCUT_STEAM="FALSE"
 
-    export name_desktop="${PORTPROTON_NAME}"
-    name_desktop_png="${PORTPROTON_NAME// /_}"
+    if [[ -z "${PORTPROTON_NAME}" ]] ; then
+        export name_desktop="$(basename "$portwine_exe")"
+    else
+        export name_desktop="${PORTPROTON_NAME}"
+    fi
+
+    [[ -z "${name_desktop_png}" ]] && name_desktop_png="${PORTPROTON_NAME// /_}"
+
     if [[ "$1" == "block_name" ]] ; then
         OUTPUT=$("${pw_yad}" --title="$(gettext "Choices")" --form \
         --gui-type="settings-shortcut" \
@@ -5406,11 +5422,11 @@ change_download_grid () {
     if [[ "$DOWNLOAD_STEAM_GRID" == "1" ]] ; then
         sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="0"/' "$USER_CONF"
         pw_notify_send -i info \
-        "$(gettext "Cover downloads are enabled")"
+        "$(gettext "Cover downloads are disabled")"
     else
         sed -i 's/DOWNLOAD_STEAM_GRID=.*/DOWNLOAD_STEAM_GRID="1"/' "$USER_CONF"
         pw_notify_send -i info \
-        "$(gettext "Cover downloads are disabled")"
+        "$(gettext "Cover downloads are enabled")"
     fi
     print_info "Restarting PP for change cover download behavior..."
     export SKIP_CHECK_UPDATES="1"
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 3031c53..3587b30 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -49,7 +49,8 @@ elif [[ "$1" == "--debug" ]] \
 && [[ "$2" == *.exe || "$2" == *.bat || "$2" == *.reg || "$2" == *.msi ]]
 then
     portwine_exe="$(realpath "$OLDPWD/$2")"
-elif [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.msi ]]; then
+elif [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.msi || "$1" == *.reg ]]
+then
     portwine_exe="$1"
     MISSING_DESKTOP_FILE=1
 fi
@@ -679,8 +680,8 @@ else
     fi
 
     if [[ "$DOWNLOAD_STEAM_GRID" == "1" ]]
-    then NEW_STEAM_BEHAVIOR="$(gettext "Enable")"
-    else NEW_STEAM_BEHAVIOR="$(gettext "Disable")"
+    then NEW_STEAM_BEHAVIOR="$(gettext "Disable")"
+    else NEW_STEAM_BEHAVIOR="$(gettext "Enable")"
     fi
 
     IFS=$'\n'