diff --git a/retrodeck.sh b/retrodeck.sh
index 2509ab87..c0cf1c73 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -154,7 +154,7 @@ finit() {
     echo "Executing finit"
 
     # Internal or SD Card?
-    zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --ok-label "Internal" --cancel-label "SD Card" --text="Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your roms folder to be located?"
+    zenity --icon-name=net.retrodeck.retrodeck --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --ok-label "Internal" --cancel-label "SD Card" --text="Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your roms folder to be located?"
     if [ $? == 0 ] #yes - Internal
     then
         roms_folder="$rdhome/roms"
@@ -171,7 +171,7 @@ finit() {
     mkdir -pv $roms_folder
 
     # TODO: after the next update of ES-DE this will not be needed
-    zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest."
+    zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest."
 
     # Recreating the folder
     /var/config/retrodeck/tools/
@@ -180,7 +180,7 @@ finit() {
     # TODO: after the next update of ES-DE this will not be needed
     start_retrodeck
 
-    zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
+    zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
 
     # Initializing ROMs folder - Original in retrodeck home (or SD Card)
     dir_prep $roms_folder "/var/config/emulationstation/ROMs"
@@ -202,7 +202,7 @@ finit() {
     tools_init
     create_lock
 
-    zenity --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access."
+    zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$rdhome/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access."
     # TODO: Replace the stuff above with BoilR code when ready
 }
 
diff --git a/tools/move-roms.sh b/tools/move-roms.sh
index c23e3315..a6bfafce 100644
--- a/tools/move-roms.sh
+++ b/tools/move-roms.sh
@@ -2,7 +2,7 @@
 
 if [ -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ]
 then # found both internal and sd folders
-    kdialog --title "RetroDECK" --warning "I found a roms folder both in internal and SD Card, in order to make this tool useful you should remove one of the two or merge them."
+    zenity --title "RetroDECK" --warning --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="I found a roms folder both in internal and SD Card,\nin order to make this tool useful you should remove one of the two or merge them."
     exit 0
 fi
 
@@ -18,7 +18,7 @@ then # found external folder and not the internal
     new_roms_path=~/retrodeck
 fi
 
-kdialog --title "RetroDECK" --warningyesno "Should I move the roms from\n\n$roms_path/roms\n\nto\n\n$new_roms_path/roms?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Should I move the roms from\n\n$roms_path/roms\n\nto\n\n$new_roms_path/roms?"
 if [ $? == 0 ] #yes
 then
     mkdir -p $new_roms_path
diff --git a/tools/start-citra.sh b/tools/start-citra.sh
index f7fda6b6..f551da09 100644
--- a/tools/start-citra.sh
+++ b/tools/start-citra.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     citra-qt
diff --git a/tools/start-dolphin.sh b/tools/start-dolphin.sh
index e5943836..99d1a671 100644
--- a/tools/start-dolphin.sh
+++ b/tools/start-dolphin.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     dolphin-emu
diff --git a/tools/start-melonds.sh b/tools/start-melonds.sh
index 7cdd9990..eec54c16 100644
--- a/tools/start-melonds.sh
+++ b/tools/start-melonds.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     melonDS
diff --git a/tools/start-pcsx2.sh b/tools/start-pcsx2.sh
index 13fa82dc..4d2a7b69 100644
--- a/tools/start-pcsx2.sh
+++ b/tools/start-pcsx2.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     pcsx2
diff --git a/tools/start-ppsspp.sh b/tools/start-ppsspp.sh
index 6644c8ad..6343ba15 100644
--- a/tools/start-ppsspp.sh
+++ b/tools/start-ppsspp.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     PPSSPPSDL
diff --git a/tools/start-retroarch.sh b/tools/start-retroarch.sh
index c485313f..5e3111e7 100644
--- a/tools/start-retroarch.sh
+++ b/tools/start-retroarch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the RetroArch configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     retroarch
diff --git a/tools/start-rpcs3.sh b/tools/start-rpcs3.sh
index ccfb38d5..d560b202 100644
--- a/tools/start-rpcs3.sh
+++ b/tools/start-rpcs3.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     rpcs3
diff --git a/tools/start-yuzu.sh b/tools/start-yuzu.sh
index fe4f4fba..e9150ff0 100644
--- a/tools/start-yuzu.sh
+++ b/tools/start-yuzu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-kdialog --title "RetroDECK" --warningyesno "Doing some changes in the emulator's configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?"
+zenity --title "RetroDECK" --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --text="Doing some changes in the emulator's configuration may create serious issues,\nplease continue only if you know what you're doing.\n\nDo you want to continue?"
 if [ $? == 0 ]
 then
     yuzu