diff --git a/public/s/js/f0ckm.js b/public/s/js/f0ckm.js
index 3c5cf64..f831b5a 100644
--- a/public/s/js/f0ckm.js
+++ b/public/s/js/f0ckm.js
@@ -525,7 +525,13 @@ window.cancelAnimFrame = (function () {
   };
 
   const syncRatingButtonUI = () => {
-    const activeRatings = getRatingsCookie();
+    let activeRatings = getRatingsCookie();
+    if (activeRatings.length === 0) {
+      if (window.activeMode === 0) activeRatings = ['sfw'];
+      else if (window.activeMode === 1) activeRatings = ['nsfw'];
+      else if (window.activeMode === 4) activeRatings = ['nsfl'];
+      else if (window.activeMode === 2) activeRatings = ['untagged'];
+    }
     const selector = document.getElementById('rating-selector');
     if (!selector) return;
     selector.querySelectorAll('.rating-toggle-btn').forEach(btn => {
@@ -536,7 +542,7 @@ window.cancelAnimFrame = (function () {
     // ALL button: active when ratings cookie is empty/absent (server mode is the authority)
     const allBtn = document.getElementById('rating-btn-all');
     if (allBtn) {
-      allBtn.classList.toggle('active', activeRatings.length === 0 && window.activeMode === 3);
+      allBtn.classList.toggle('active', (getRatingsCookie().length === 0 && window.activeMode === 3) || activeRatings.length === 0);
     }
   };
 
diff --git a/public/s/js/upload.js b/public/s/js/upload.js
index 0bb4378..b5c2ffe 100644
--- a/public/s/js/upload.js
+++ b/public/s/js/upload.js
@@ -1972,6 +1972,9 @@ window.initUploadForm = (selector) => {
                 
                 if (isShitpost) {
                     // Flash message removed as requested
+                    if (lastData?.manual_approval && typeof window.showFlash === 'function') {
+                        window.showFlash('Upload awaits approval, please be patient', 'info');
+                    }
                 } else {
                     if (!dragModal && statusDiv) {
                         statusDiv.innerHTML = '✓ ' + (lastData?.msg || 'Upload successful');
@@ -2125,11 +2128,18 @@ window.initUploadForm = (selector) => {
                 form._f0ckUploader.reset();
                 if (isShitpost) {
                     // Flash message removed as requested
+                    if (lastData?.manual_approval && typeof window.showFlash === 'function') {
+                        window.showFlash('Upload awaits approval, please be patient', 'info');
+                    }
                 } else if (!dragModal && statusDiv) {
                     statusDiv.innerHTML = '✓ ' + (lastData?.msg || 'Upload successful');
                     statusDiv.className = 'upload-status success';
                 }
 
+                if (!isShitpost && lastData?.manual_approval && typeof window.showFlash === 'function') {
+                    window.showFlash('Upload awaits approval, please be patient', 'info');
+                }
+
                 setTimeout(() => {
                     if (typeof window.loadPageAjax === 'function') window.loadPageAjax('/');
                     else window.location.href = '/';