diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index d8263ee..56a6051 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-2
\ No newline at end of file
+1
\ No newline at end of file
diff --git a/pikabar/debian/changelog b/pikabar/debian/changelog
index bb6fba8..e8e8acf 100644
--- a/pikabar/debian/changelog
+++ b/pikabar/debian/changelog
@@ -1,6 +1,6 @@
-pikabar (1.0.0-101pika5) pika; urgency=medium
+pikabar (1.0.0-101pika6) pika; urgency=medium
 
-  * Font fixes
+  * Font fixes and icon fixes
 
  -- ferrreo <harderthanfire@gmail.com>  Sat, 01 Oct 2022 14:50:00 +0300
 
diff --git a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
index 6ab3cc2..34bd582 100644
--- a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
+++ b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml
@@ -7,11 +7,28 @@ import "root:/"
 Row {
     spacing: 10
 
+    function getIcon() {
+        var icon = Quickshell.iconPath(ToplevelManager.activeToplevel.appId.toLowerCase())
+        if (!icon) {
+            icon = Quickshell.iconPath(ToplevelManager.activeToplevel.appId)
+        }
+        if (!icon) {
+            icon = Quickshell.iconPath(ToplevelManager.activeToplevel.title)
+        }
+        if (!icon) {
+            icon = Quickshell.iconPath(ToplevelManager.activeToplevel.title.toLowerCase())
+        }
+        if (!icon) {
+            icon = Quickshell.iconPath("application-x-executable")
+        }
+        return icon
+    }
+
     SimpleImage {
         height: 42
         Layout.fillHeight: true
         implicitWidth: parent.height / 2
-        source: ToplevelManager.activeToplevel ? Quickshell.iconPath(ToplevelManager.activeToplevel.appId.toLowerCase()) || Quickshell.iconPath(ToplevelManager.activeToplevel.appId) : ""
+        source: ToplevelManager.activeToplevel ? getIcon() : ""
     }
 
     Text {