UI: Update main icon

src/ui/form/dialog/passworddialog.cpp

@@ -62,7 +62,7 @@ void PasswordDialog::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/key.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/key.png"));
 }
 
 QLayout *PasswordDialog::setupPasswordLayout()

src/ui/form/opt/optionswindow.cpp

@@ -110,7 +110,7 @@ void OptionsWindow::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/cog.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/cog.png"));
 
     // Size
     this->setMinimumSize(800, 500);

src/ui/form/policy/policieswindow.cpp

@@ -142,7 +142,7 @@ void PoliciesWindow::setupUi()
 
     // Icon
     this->setWindowIcon(
-            GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/traffic_lights.png"));
+            GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/traffic_lights.png"));
 
     // Size
     this->setMinimumSize(500, 400);

src/ui/form/prog/programswindow.cpp

@@ -170,7 +170,7 @@ void ProgramsWindow::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/application.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/application.png"));
 
     // Size
     this->setMinimumSize(500, 400);

src/ui/form/stat/statisticswindow.cpp

@@ -82,7 +82,7 @@ void StatisticsWindow::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/chart_bar.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/chart_bar.png"));
 
     // Size
     this->setMinimumSize(500, 400);

src/ui/form/svc/serviceswindow.cpp

@@ -140,7 +140,7 @@ void ServicesWindow::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/windows-48.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/windows-48.png"));
 
     // Size
     this->setMinimumSize(500, 400);

src/ui/form/tray/trayicon.cpp

@@ -342,7 +342,7 @@ void TrayIcon::setupTrayMenu()
 {
     m_menu = ControlUtil::createMenu(windowManager()->mainWindow());
 
-    m_homeAction = addAction(m_menu, IconCache::icon(":/icons/fort-96.png"), QString(),
+    m_homeAction = addAction(m_menu, IconCache::icon(":/icons/fort.png"), QString(),
             windowManager(), SLOT(showHomeWindow()));
     addHotKey(m_homeAction, iniUser()->hotKeyHome());
 
@@ -542,11 +542,11 @@ void TrayIcon::updateTrayIconShape()
     QString mainIconPath;
 
     if (!conf()->filterEnabled() || !driverManager()->isDeviceOpened()) {
-        mainIconPath = ":/icons/fort-96_gray.png";
+        mainIconPath = ":/icons/fort_gray.png";
     } else if (conf()->stopTraffic() || conf()->stopInetTraffic()) {
-        mainIconPath = ":/icons/fort-96_red.png";
+        mainIconPath = ":/icons/fort_red.png";
     } else {
-        mainIconPath = ":/icons/fort-96.png";
+        mainIconPath = ":/icons/fort.png";
     }
 
     const auto icon = m_alerted

src/ui/form/zone/zoneswindow.cpp

@@ -167,7 +167,7 @@ void ZonesWindow::setupUi()
     this->setFont(WindowManager::defaultFont());
 
     // Icon
-    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort-96.png", ":/icons/ip_class.png"));
+    this->setWindowIcon(GuiUtil::overlayIcon(":/icons/fort.png", ":/icons/ip_class.png"));
 
     // Size
     this->setMinimumSize(500, 400);

src/ui/fort_icons.qrc

@@ -25,9 +25,9 @@
     <file>icons/error.png</file>
     <file>icons/filter.png</file>
     <file>icons/folder.png</file>
-    <file>icons/fort-96.png</file>
-    <file>icons/fort-96_gray.png</file>
-    <file>icons/fort-96_red.png</file>
+    <file>icons/fort.png</file>
+    <file>icons/fort_gray.png</file>
+    <file>icons/fort_red.png</file>
     <file>icons/github.png</file>
     <file>icons/global_telecom.png</file>
     <file>icons/help.png</file>

src/ui_bin/FortFirewall.rc

@@ -26,7 +26,7 @@
 
 1               11      "../driver/evt/FORTEVT_MSG00001.bin"
 
-IDI_ICON1       ICON    DISCARDABLE     FortFirewall.ico
+IDI_ICON1       ICON    DISCARDABLE     "FortFirewall.ico"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION