diff --git a/build/msi/fibratus.ico b/build/msi/fibratus.ico
new file mode 100644
index 000000000..818827a31
Binary files /dev/null and b/build/msi/fibratus.ico differ
diff --git a/build/msi/fibratus.wxs b/build/msi/fibratus.wxs
index a00687178..e2a7a7676 100644
--- a/build/msi/fibratus.wxs
+++ b/build/msi/fibratus.wxs
@@ -14,6 +14,10 @@
 
     <Media Id="1" Cabinet="fibratus.cab" EmbedCab="yes" />
 
+    <Icon Id="Fibratus.ico" SourceFile="fibratus.ico" />
+
+    <Property Id="ARPPRODUCTICON" Value="Fibratus.ico" />
+
     <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed" AllowSameVersionUpgrades="yes" />
 
     <UI Id="UI">
diff --git a/cmd/fibratus/fibratus.ico b/cmd/fibratus/fibratus.ico
new file mode 100644
index 000000000..818827a31
Binary files /dev/null and b/cmd/fibratus/fibratus.ico differ
diff --git a/cmd/fibratus/fibratus.rc b/cmd/fibratus/fibratus.rc
index 274d60c7b..67cf8042b 100644
--- a/cmd/fibratus/fibratus.rc
+++ b/cmd/fibratus/fibratus.rc
@@ -1,6 +1,8 @@
 #include "version.h"
 #define RT_MANIFEST 24
 
+IDI_APP_ICON ICON "fibratus.ico"
+
 #define VS_VERSION_INFO 1
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION RC_FILE_VERSION
diff --git a/cmd/systray/fibratus-systray.rc b/cmd/systray/fibratus-systray.rc
index dddd45a51..b3d93f6bd 100644
--- a/cmd/systray/fibratus-systray.rc
+++ b/cmd/systray/fibratus-systray.rc
@@ -1,6 +1,8 @@
 #include "version.h"
 #define RT_MANIFEST 24
 
+IDI_APP_ICON ICON "fibratus.ico"
+
 #define VS_VERSION_INFO 1
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION RC_FILE_VERSION
diff --git a/cmd/systray/fibratus.ico b/cmd/systray/fibratus.ico
new file mode 100644
index 000000000..818827a31
Binary files /dev/null and b/cmd/systray/fibratus.ico differ
diff --git a/cmd/systray/main_windows.go b/cmd/systray/main_windows.go
index 78774fb78..a68bf0a86 100644
--- a/cmd/systray/main_windows.go
+++ b/cmd/systray/main_windows.go
@@ -49,7 +49,8 @@ const (
 )
 
 var (
-	className = windows.StringToUTF16Ptr("fibratus")
+	className  = windows.StringToUTF16Ptr("fibratus")
+	alertTitle = "Malicious Activity Detected"
 )
 
 // Msg represents the data exchanged between systray client/server.
@@ -221,13 +222,7 @@ func (s *Systray) handleMessage(m Msg) error {
 			logrus.Errorf("unable to decode alert: %v", err)
 			return err
 		}
-		text := alert.Text
-		// the balloon notification fails
-		// to show up if the text is empty
-		if text == "" {
-			text = " "
-		}
-		return s.systrayIcon.ShowBalloonNotification(alert.Title, text, s.config.Sound, s.config.QuietMode)
+		return s.systrayIcon.ShowBalloonNotification(alertTitle, alert.Title, s.config.Sound, s.config.QuietMode)
 	}
 	return nil
 }
diff --git a/make.bat b/make.bat
index f224e3e65..452ca0cae 100644
--- a/make.bat
+++ b/make.bat
@@ -116,6 +116,7 @@ echo Copying artifacts...
 :: Copy artifacts
 copy /y ".\cmd\fibratus\fibratus.exe" "%RELEASE_DIR%\Bin"
 copy /y ".\cmd\systray\fibratus-systray.exe" "%RELEASE_DIR%\Bin"
+copy /y ".\cmd\fibratus\fibratus.ico" "%RELEASE_DIR%\Bin"
 copy /y ".\configs\fibratus.yml" "%RELEASE_DIR%\Config\fibratus.yml"
 copy /y ".\pkg\outputs\eventlog\mc\fibratus.dll" "%RELEASE_DIR%\fibratus.dll"
 
@@ -175,6 +176,7 @@ echo Copying artifacts...
 :: Copy artifacts
 copy /y ".\cmd\fibratus\fibratus.exe" "%RELEASE_DIR%\Bin"
 copy /y ".\cmd\systray\fibratus-systray.exe" "%RELEASE_DIR%\Bin"
+copy /y ".\cmd\fibratus\fibratus.ico" "%RELEASE_DIR%\Bin"
 copy /y ".\configs\fibratus.yml" "%RELEASE_DIR%\Config\fibratus.yml"
 copy /y ".\pkg\outputs\eventlog\mc\fibratus.dll" "%RELEASE_DIR%\fibratus.dll"