diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini
index 17f5189..47b5edf 100644
--- a/config/nwg-look/.config/gtk-3.0/settings.ini
+++ b/config/nwg-look/.config/gtk-3.0/settings.ini
@@ -1,25 +1,17 @@
 [Settings]
-gtk-application-prefer-dark-theme=true
-gtk-button-images=true
-gtk-cursor-blink=true
-gtk-cursor-blink-time=1000
+gtk-theme-name=catppuccin-mocha-blue-standard+default
+gtk-icon-theme-name=Papirus
+gtk-font-name=Noto Sans  10
 gtk-cursor-theme-name=Bibata-Modern-Ice
 gtk-cursor-theme-size=24
-gtk-decoration-layout=icon:minimize,maximize,close
-gtk-enable-animations=true
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=0
+gtk-menu-images=0
 gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=0
-gtk-font-name=Sarasa UI SC,  10
-gtk-icon-theme-name=Papirus
-gtk-menu-images=true
-gtk-modules=colorreload-gtk-module
-gtk-primary-button-warps-slider=true
-gtk-sound-theme-name=ocean
-gtk-theme-name=catppuccin-mocha-blue-standard+default
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=3
 gtk-xft-antialias=1
-gtk-xft-dpi=122880
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=1
diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini
index 4139029..ae04bc1 100644
--- a/config/nwg-look/.config/gtk-4.0/settings.ini
+++ b/config/nwg-look/.config/gtk-4.0/settings.ini
@@ -1,14 +1,7 @@
 [Settings]
-gtk-application-prefer-dark-theme=true
-gtk-cursor-blink=true
-gtk-cursor-blink-time=1000
+gtk-theme-name=catppuccin-mocha-blue-standard+default
+gtk-icon-theme-name=Papirus
+gtk-font-name=Noto Sans  10
 gtk-cursor-theme-name=Bibata-Modern-Ice
 gtk-cursor-theme-size=24
-gtk-decoration-layout=icon:minimize,maximize,close
-gtk-enable-animations=true
-gtk-font-name=Sarasa UI SC,  10
-gtk-icon-theme-name=Papirus
-gtk-primary-button-warps-slider=true
-gtk-sound-theme-name=ocean
-gtk-theme-name=catppuccin-mocha-blue-standard+default
-gtk-xft-dpi=122880
+gtk-application-prefer-dark-theme=1
diff --git a/config/quickshell/.config/quickshell/Components/UProgressExpand.qml b/config/quickshell/.config/quickshell/Components/UProgressExpand.qml
index 46fcaee..e29e90b 100644
--- a/config/quickshell/.config/quickshell/Components/UProgressExpand.qml
+++ b/config/quickshell/.config/quickshell/Components/UProgressExpand.qml
@@ -111,6 +111,9 @@ Item {
                 anchors.centerIn: parent
                 onPaint: {
                     var ctx = getContext("2d");
+                    if (!ctx)
+                        return ;
+
                     ctx.reset();
                     var centerX = width / 2;
                     var centerY = height / 2;
diff --git a/config/quickshell/.config/quickshell/Services/ImageCacheService.qml b/config/quickshell/.config/quickshell/Services/ImageCacheService.qml
index 517dd60..900862b 100644
--- a/config/quickshell/.config/quickshell/Services/ImageCacheService.qml
+++ b/config/quickshell/.config/quickshell/Services/ImageCacheService.qml
@@ -509,4 +509,71 @@ Singleton {
 
     }
 
+    PanelWindow {
+        id: fallbackRenderer
+
+        implicitWidth: 0
+        implicitHeight: 0
+        WlrLayershell.exclusionMode: ExclusionMode.Ignore
+        WlrLayershell.namespace: "noctalia-image-cache-renderer"
+        color: "transparent"
+
+        Image {
+            id: fallbackImage
+
+            property string cacheKey: ""
+            property string destPath: ""
+            property int targetSize: 256
+
+            function processNextFallback() {
+                cacheKey = "";
+                destPath = "";
+                source = "";
+                if (fallbackQueue.length > 0) {
+                    const next = fallbackQueue.shift();
+                    cacheKey = next.cacheKey;
+                    destPath = next.destPath;
+                    targetSize = next.size;
+                    source = next.sourcePath;
+                } else {
+                    fallbackProcessing = false;
+                }
+            }
+
+            width: targetSize
+            height: targetSize
+            visible: true
+            cache: false
+            asynchronous: true
+            fillMode: Image.PreserveAspectCrop
+            mipmap: true
+            antialiasing: true
+            onStatusChanged: {
+                if (!cacheKey)
+                    return ;
+
+                if (status === Image.Ready) {
+                    grabToImage(function(result) {
+                        if (result.saveToFile(destPath)) {
+                            Logger.d("ImageCache", "Fallback cache created:", destPath);
+                            root.notifyCallbacks(cacheKey, destPath, true);
+                        } else {
+                            Logger.e("ImageCache", "Failed to save fallback cache");
+                            root.notifyCallbacks(cacheKey, "", false);
+                        }
+                        processNextFallback();
+                    });
+                } else if (status === Image.Error) {
+                    Logger.e("ImageCache", "Fallback image load failed");
+                    root.notifyCallbacks(cacheKey, "", false);
+                    processNextFallback();
+                }
+            }
+        }
+
+        mask: Region {
+        }
+
+    }
+
 }