diff --git a/.github/README.md b/.github/README.md
deleted file mode 100644
index 97cb440866..0000000000
--- a/.github/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# CI Configuration
-
-## CI Lite Mode
-
-Skip non-essential CI workflows by setting a repository variable:
-
-**Settings → Secrets and variables → Actions → Variables → New repository variable**
-
-- Name: `CI_PROFILE`
-- Value: `lite`
-
-Skips resource-intensive builds, releases, and OSS-specific workflows. Useful for deployment-only forks or faster CI runs.
diff --git a/.github/workflows/PR-Auto-Deploy-V2.yml b/.github/workflows/PR-Auto-Deploy-V2.yml
index ad6d6f3dc4..c96d7d5b20 100644
--- a/.github/workflows/PR-Auto-Deploy-V2.yml
+++ b/.github/workflows/PR-Auto-Deploy-V2.yml
@@ -52,7 +52,6 @@ jobs:
             core.setOutput('repository', pr.head.repo.full_name);
             core.setOutput('ref', pr.head.ref);
             core.setOutput('is_fork', String(pr.head.repo.fork));
-            core.setOutput('base_ref', pr.base.ref);
             core.setOutput('author', pr.user.login);
             core.setOutput('state', pr.state);
 
@@ -65,10 +64,6 @@ jobs:
           IS_FORK: ${{ steps.resolve.outputs.is_fork }}
           # nur bei workflow_dispatch gesetzt:
           ALLOW_FORK_INPUT: ${{ inputs.allow_fork }}
-          # für Auto-PR-Logik:
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_BASE: ${{ steps.resolve.outputs.base_ref }}
           PR_AUTHOR: ${{ steps.resolve.outputs.author }}
         run: |
           set -e
@@ -89,14 +84,8 @@ jobs:
           else
             auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "DarioGii" "ConnorYoh" "EthanHealy01" "jbrunton96" "balazs-szucs")
             is_auth=false; for u in "${auth_users[@]}"; do [ "$u" = "$PR_AUTHOR" ] && is_auth=true && break; done
-            if [ "$PR_BASE" = "V2" ] && [ "$is_auth" = true ]; then
+            if [ "$is_auth" = true ]; then
               should=true
-            else
-              title_has_v2=false; echo "$PR_TITLE" | grep -qiE 'v2|version.?2|version.?two' && title_has_v2=true
-              branch_has_kw=false; echo "$PR_BRANCH" | grep -qiE 'v2|react' && branch_has_kw=true
-              if [ "$is_auth" = true ] && { [ "$title_has_v2" = true ] || [ "$branch_has_kw" = true ]; }; then
-                should=true
-              fi
             fi
           fi
 
@@ -174,7 +163,7 @@ jobs:
               owner,
               repo,
               issue_number: prNumber,
-              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment triggered by V2/version2 keywords in the PR title or V2/React keywords in the branch name._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
+              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment for approved V2 contributors._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
             });
             return newComment.id;
 
@@ -394,7 +383,7 @@ jobs:
                               `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
                               `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
                               `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
-                              `🔄 **Auto-deployed** because PR title or branch name contains V2/version2/React keywords.`;
+                              `🔄 **Auto-deployed** for approved V2 contributors.`;
 
             await github.rest.issues.createComment({
               owner,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a049bb90c..a5df3e9ec6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -262,7 +262,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        docker-rev: ["docker/embedded/Dockerfile", "docker/embedded/Dockerfile.ultra-lite", "docker/embedded/Dockerfile.fat"]
+        include:
+          - docker-rev: docker/embedded/Dockerfile
+            artifact-suffix: Dockerfile
+          - docker-rev: docker/embedded/Dockerfile.ultra-lite
+            artifact-suffix: Dockerfile.ultra-lite
+          - docker-rev: docker/embedded/Dockerfile.fat
+            artifact-suffix: Dockerfile.fat
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -272,6 +278,13 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
+      - name: Free disk space on runner
+        run: |
+          echo "Disk space before cleanup:" && df -h
+          sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /usr/local/share/boost
+          docker system prune -af || true
+          echo "Disk space after cleanup:" && df -h
+
       - name: Set up JDK 17
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
@@ -313,7 +326,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: reports-docker-${{ matrix.docker-rev }}
+          name: reports-docker-${{ matrix.artifact-suffix }}
           path: |
             build/reports/tests/
             build/test-results/
diff --git a/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
index 35f68939c3..ff48b5b2e7 100644
--- a/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -491,6 +491,9 @@ public class EndpointConfiguration {
         addEndpointToGroup("Ghostscript", "repair");
         addEndpointToGroup("Ghostscript", "compress-pdf");
 
+        /* ImageMagick */
+        addEndpointToGroup("ImageMagick", "compress-pdf");
+
         /* tesseract */
         addEndpointToGroup("tesseract", "ocr-pdf");
 
@@ -574,6 +577,7 @@ public class EndpointConfiguration {
                 || "Javascript".equals(group)
                 || "Weasyprint".equals(group)
                 || "Pdftohtml".equals(group)
+                || "ImageMagick".equals(group)
                 || "rar".equals(group);
     }
 
diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
index 56a9b05afd..b672298caa 100644
--- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
+++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
@@ -398,6 +398,7 @@ public class ApplicationProperties {
         private Boolean enableAnalytics;
         private Boolean enablePosthog;
         private Boolean enableScarf;
+        private Boolean enableDesktopInstallSlide;
         private Datasource datasource;
         private Boolean disableSanitize;
         private int maxDPI;
@@ -693,6 +694,7 @@ public class ApplicationProperties {
             private int weasyPrintSessionLimit;
             private int installAppSessionLimit;
             private int calibreSessionLimit;
+            private int imageMagickSessionLimit;
             private int qpdfSessionLimit;
             private int tesseractSessionLimit;
             private int ghostscriptSessionLimit;
@@ -730,6 +732,10 @@ public class ApplicationProperties {
                 return calibreSessionLimit > 0 ? calibreSessionLimit : 1;
             }
 
+            public int getImageMagickSessionLimit() {
+                return imageMagickSessionLimit > 0 ? imageMagickSessionLimit : 4;
+            }
+
             public int getGhostscriptSessionLimit() {
                 return ghostscriptSessionLimit > 0 ? ghostscriptSessionLimit : 8;
             }
@@ -759,6 +765,8 @@ public class ApplicationProperties {
             @JsonProperty("calibretimeoutMinutes")
             private long calibreTimeoutMinutes;
 
+            private long imageMagickTimeoutMinutes;
+
             private long tesseractTimeoutMinutes;
             private long qpdfTimeoutMinutes;
             private long ghostscriptTimeoutMinutes;
@@ -796,6 +804,10 @@ public class ApplicationProperties {
                 return calibreTimeoutMinutes > 0 ? calibreTimeoutMinutes : 30;
             }
 
+            public long getImageMagickTimeoutMinutes() {
+                return imageMagickTimeoutMinutes > 0 ? imageMagickTimeoutMinutes : 30;
+            }
+
             public long getGhostscriptTimeoutMinutes() {
                 return ghostscriptTimeoutMinutes > 0 ? ghostscriptTimeoutMinutes : 30;
             }
diff --git a/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java b/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java
new file mode 100644
index 0000000000..ab4f55d2e6
--- /dev/null
+++ b/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java
@@ -0,0 +1,12 @@
+package stirling.software.common.service;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+
+public interface LineArtConversionService {
+    PDImageXObject convertImageToLineArt(
+            PDDocument doc, PDImageXObject originalImage, double threshold, int edgeLevel)
+            throws IOException;
+}
diff --git a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
index 3b94fbfbce..2694418135 100644
--- a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
+++ b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
@@ -86,6 +86,11 @@ public class ProcessExecutor {
                                                 .getProcessExecutor()
                                                 .getSessionLimit()
                                                 .getCalibreSessionLimit();
+                                case IMAGEMAGICK ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getImageMagickSessionLimit();
                                 case GHOSTSCRIPT ->
                                         applicationProperties
                                                 .getProcessExecutor()
@@ -141,6 +146,11 @@ public class ProcessExecutor {
                                                 .getProcessExecutor()
                                                 .getTimeoutMinutes()
                                                 .getCalibreTimeoutMinutes();
+                                case IMAGEMAGICK ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getImageMagickTimeoutMinutes();
                                 case GHOSTSCRIPT ->
                                         applicationProperties
                                                 .getProcessExecutor()
@@ -301,6 +311,7 @@ public class ProcessExecutor {
         WEASYPRINT,
         INSTALL_APP,
         CALIBRE,
+        IMAGEMAGICK,
         TESSERACT,
         QPDF,
         GHOSTSCRIPT,
diff --git a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
index f1763e4313..acad6f4a9d 100644
--- a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
+++ b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
@@ -26,6 +26,7 @@ public class RequestUriUtils {
                 || normalizedUri.startsWith("/public/")
                 || normalizedUri.startsWith("/pdfjs/")
                 || normalizedUri.startsWith("/pdfjs-legacy/")
+                || normalizedUri.startsWith("/pdfium/")
                 || normalizedUri.startsWith("/assets/")
                 || normalizedUri.startsWith("/locales/")
                 || normalizedUri.startsWith("/Login/")
@@ -61,7 +62,8 @@ public class RequestUriUtils {
                 || normalizedUri.endsWith(".css")
                 || normalizedUri.endsWith(".mjs")
                 || normalizedUri.endsWith(".html")
-                || normalizedUri.endsWith(".toml");
+                || normalizedUri.endsWith(".toml")
+                || normalizedUri.endsWith(".wasm");
     }
 
     public static boolean isFrontendRoute(String contextPath, String requestURI) {
@@ -125,11 +127,13 @@ public class RequestUriUtils {
                 || requestURI.endsWith("popularity.txt")
                 || requestURI.endsWith(".js")
                 || requestURI.endsWith(".toml")
+                || requestURI.endsWith(".wasm")
                 || requestURI.contains("swagger")
                 || requestURI.startsWith("/api/v1/info")
                 || requestURI.startsWith("/site.webmanifest")
                 || requestURI.startsWith("/fonts")
-                || requestURI.startsWith("/pdfjs"));
+                || requestURI.startsWith("/pdfjs")
+                || requestURI.startsWith("/pdfium"));
     }
 
     /**
diff --git a/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
index b7c121ab30..409615e68b 100644
--- a/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
+++ b/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
@@ -24,6 +24,9 @@ public class RequestUriUtilsTest {
         assertTrue(
                 RequestUriUtils.isStaticResource("/pdfjs/pdf.worker.js"),
                 "PDF.js files should be static");
+        assertTrue(
+                RequestUriUtils.isStaticResource("/pdfium/pdfium.wasm"),
+                "PDFium wasm should be static");
         assertTrue(
                 RequestUriUtils.isStaticResource("/api/v1/info/status"),
                 "API status should be static");
@@ -110,7 +113,8 @@ public class RequestUriUtilsTest {
                 "/downloads/document.png",
                 "/assets/brand.ico",
                 "/any/path/with/image.svg",
-                "/deep/nested/folder/icon.png"
+                "/deep/nested/folder/icon.png",
+                "/pdfium/pdfium.wasm"
             })
     void testIsStaticResourceWithFileExtensions(String path) {
         assertTrue(
@@ -148,6 +152,9 @@ public class RequestUriUtilsTest {
         assertFalse(
                 RequestUriUtils.isTrackableResource("/script.js"),
                 "JS files should not be trackable");
+        assertFalse(
+                RequestUriUtils.isTrackableResource("/pdfium/pdfium.wasm"),
+                "PDFium wasm should not be trackable");
         assertFalse(
                 RequestUriUtils.isTrackableResource("/swagger/index.html"),
                 "Swagger files should not be trackable");
@@ -224,7 +231,8 @@ public class RequestUriUtilsTest {
                 "/api/v1/info/health",
                 "/site.webmanifest",
                 "/fonts/roboto.woff",
-                "/pdfjs/viewer.js"
+                "/pdfjs/viewer.js",
+                "/pdfium/pdfium.wasm"
             })
     void testNonTrackableResources(String path) {
         assertFalse(
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
index 59c8825fc4..8606cc2a92 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
@@ -46,6 +46,7 @@ public class ExternalAppDepConfig {
                         put("qpdf", List.of("qpdf"));
                         put("tesseract", List.of("tesseract"));
                         put("rar", List.of("rar")); // Required for real CBR output
+                        put("magick", List.of("ImageMagick"));
                     }
                 };
     }
@@ -128,6 +129,7 @@ public class ExternalAppDepConfig {
         checkDependencyAndDisableGroup("pdftohtml");
         checkDependencyAndDisableGroup(unoconvPath);
         checkDependencyAndDisableGroup("rar");
+        checkDependencyAndDisableGroup("magick");
         // Special handling for Python/OpenCV dependencies
         boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");
         if (!pythonAvailable) {
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
index 0703708f54..8eac8fa80d 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
@@ -1,10 +1,14 @@
 package stirling.software.SPDF.config;
 
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import lombok.RequiredArgsConstructor;
@@ -25,6 +29,20 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addInterceptor(endpointInterceptor);
     }
 
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // Cache hashed assets (JS/CSS with content hashes) for 1 year
+        // These files have names like index-ChAS4tCC.js that change when content changes
+        registry.addResourceHandler("/assets/**")
+                .addResourceLocations("classpath:/static/assets/")
+                .setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS).cachePublic());
+
+        // Don't cache index.html - it needs to be fresh to reference latest hashed assets
+        registry.addResourceHandler("/index.html")
+                .addResourceLocations("classpath:/static/")
+                .setCacheControl(CacheControl.noCache().mustRevalidate());
+    }
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         // Check if running in Tauri mode
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
index 865a95c5cb..9b0483da94 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
@@ -28,10 +28,13 @@ import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
 
 import io.swagger.v3.oas.annotations.Operation;
 
@@ -44,6 +47,7 @@ import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.LineArtConversionService;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
@@ -58,6 +62,9 @@ public class CompressController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final EndpointConfiguration endpointConfiguration;
 
+    @Autowired(required = false)
+    private LineArtConversionService lineArtConversionService;
+
     private boolean isQpdfEnabled() {
         return endpointConfiguration.isGroupEnabled("qpdf");
     }
@@ -66,6 +73,10 @@ public class CompressController {
         return endpointConfiguration.isGroupEnabled("Ghostscript");
     }
 
+    private boolean isImageMagickEnabled() {
+        return endpointConfiguration.isGroupEnabled("ImageMagick");
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
@@ -660,6 +671,9 @@ public class CompressController {
         Integer optimizeLevel = request.getOptimizeLevel();
         String expectedOutputSizeString = request.getExpectedOutputSize();
         Boolean convertToGrayscale = request.getGrayscale();
+        Boolean convertToLineArt = request.getLineArt();
+        Double lineArtThreshold = request.getLineArtThreshold();
+        Integer lineArtEdgeLevel = request.getLineArtEdgeLevel();
         if (expectedOutputSizeString == null && optimizeLevel == null) {
             throw new Exception("Both expected output size and optimize level are not specified");
         }
@@ -689,6 +703,26 @@ public class CompressController {
                 optimizeLevel = determineOptimizeLevel(sizeReductionRatio);
             }
 
+            if (Boolean.TRUE.equals(convertToLineArt)) {
+                if (lineArtConversionService == null) {
+                    throw new ResponseStatusException(
+                            HttpStatus.FORBIDDEN,
+                            "Line art conversion is unavailable - ImageMagick service not found");
+                }
+                if (!isImageMagickEnabled()) {
+                    throw new IOException(
+                            "ImageMagick is not enabled but line art conversion was requested");
+                }
+                double thresholdValue =
+                        lineArtThreshold == null
+                                ? 55d
+                                : Math.min(100d, Math.max(0d, lineArtThreshold));
+                int edgeLevel =
+                        lineArtEdgeLevel == null ? 1 : Math.min(3, Math.max(1, lineArtEdgeLevel));
+                currentFile =
+                        applyLineArtConversion(currentFile, tempFiles, thresholdValue, edgeLevel);
+            }
+
             boolean sizeMet = false;
             boolean imageCompressionApplied = false;
             boolean externalCompressionApplied = false;
@@ -810,6 +844,75 @@ public class CompressController {
         }
     }
 
+    private Path applyLineArtConversion(
+            Path currentFile, List<Path> tempFiles, double threshold, int edgeLevel)
+            throws IOException {
+
+        Path lineArtFile = Files.createTempFile("lineart_output_", ".pdf");
+        tempFiles.add(lineArtFile);
+
+        try (PDDocument doc = pdfDocumentFactory.load(currentFile.toFile())) {
+            Map<String, List<ImageReference>> uniqueImages = findImages(doc);
+            CompressionStats stats = new CompressionStats();
+            stats.uniqueImagesCount = uniqueImages.size();
+            calculateImageStats(uniqueImages, stats);
+
+            Map<String, PDImageXObject> convertedImages =
+                    createLineArtImages(doc, uniqueImages, stats, threshold, edgeLevel);
+
+            replaceImages(doc, uniqueImages, convertedImages, stats);
+
+            log.info(
+                    "Applied line art conversion to {} unique images ({} total references)",
+                    stats.uniqueImagesCount,
+                    stats.totalImages);
+
+            doc.save(lineArtFile.toString());
+            return lineArtFile;
+        }
+    }
+
+    private Map<String, PDImageXObject> createLineArtImages(
+            PDDocument doc,
+            Map<String, List<ImageReference>> uniqueImages,
+            CompressionStats stats,
+            double threshold,
+            int edgeLevel)
+            throws IOException {
+
+        Map<String, PDImageXObject> convertedImages = new HashMap<>();
+
+        for (Entry<String, List<ImageReference>> entry : uniqueImages.entrySet()) {
+            String imageHash = entry.getKey();
+            List<ImageReference> references = entry.getValue();
+            if (references.isEmpty()) continue;
+
+            PDImageXObject originalImage = getOriginalImage(doc, references.get(0));
+
+            int originalSize = (int) originalImage.getCOSObject().getLength();
+            stats.totalOriginalBytes += originalSize;
+
+            PDImageXObject converted =
+                    lineArtConversionService.convertImageToLineArt(
+                            doc, originalImage, threshold, edgeLevel);
+            convertedImages.put(imageHash, converted);
+            stats.compressedImages++;
+
+            int convertedSize = (int) converted.getCOSObject().getLength();
+            stats.totalCompressedBytes += convertedSize * references.size();
+
+            double reductionPercentage = 100.0 - ((convertedSize * 100.0) / originalSize);
+            log.info(
+                    "Image hash {}: Line art conversion {} → {} (reduced by {}%)",
+                    imageHash,
+                    GeneralUtils.formatBytes(originalSize),
+                    GeneralUtils.formatBytes(convertedSize),
+                    String.format("%.1f", reductionPercentage));
+        }
+
+        return convertedImages;
+    }
+
     // Run Ghostscript compression
     private void applyGhostscriptCompression(
             OptimizePdfRequest request, int optimizeLevel, Path currentFile, List<Path> tempFiles)
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
index 43aaecd9d7..95486ff9b8 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
@@ -124,6 +124,9 @@ public class ConfigController {
                     "enableAnalytics", applicationProperties.getSystem().getEnableAnalytics());
             configData.put("enablePosthog", applicationProperties.getSystem().getEnablePosthog());
             configData.put("enableScarf", applicationProperties.getSystem().getEnableScarf());
+            configData.put(
+                    "enableDesktopInstallSlide",
+                    applicationProperties.getSystem().getEnableDesktopInstallSlide());
 
             // Premium/Enterprise settings
             configData.put("premiumEnabled", applicationProperties.getPremium().isEnabled());
@@ -227,4 +230,10 @@ public class ConfigController {
         }
         return ResponseEntity.ok(result);
     }
+
+    @GetMapping("/group-enabled")
+    public ResponseEntity<Boolean> isGroupEnabled(@RequestParam(name = "group") String group) {
+        boolean enabled = endpointConfiguration.isGroupEnabled(group);
+        return ResponseEntity.ok(enabled);
+    }
 }
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
index 3b27492a6e..893c9c54c8 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
@@ -191,6 +191,12 @@ public class CertSignController {
 
         switch (certType) {
             case "PEM":
+                privateKeyFile =
+                        validateFilePresent(
+                                privateKeyFile, "PEM private key", "private key file is required");
+                certFile =
+                        validateFilePresent(
+                                certFile, "PEM certificate", "certificate file is required");
                 ks = KeyStore.getInstance("JKS");
                 ks.load(null);
                 PrivateKey privateKey = getPrivateKeyFromPEM(privateKeyFile.getBytes(), password);
@@ -200,10 +206,16 @@ public class CertSignController {
                 break;
             case "PKCS12":
             case "PFX":
+                p12File =
+                        validateFilePresent(
+                                p12File, "PKCS12 keystore", "PKCS12/PFX keystore file is required");
                 ks = KeyStore.getInstance("PKCS12");
                 ks.load(p12File.getInputStream(), password.toCharArray());
                 break;
             case "JKS":
+                jksfile =
+                        validateFilePresent(
+                                jksfile, "JKS keystore", "JKS keystore file is required");
                 ks = KeyStore.getInstance("JKS");
                 ks.load(jksfile.getInputStream(), password.toCharArray());
                 break;
@@ -251,6 +263,17 @@ public class CertSignController {
                 GeneralUtils.generateFilename(pdf.getOriginalFilename(), "_signed.pdf"));
     }
 
+    private MultipartFile validateFilePresent(
+            MultipartFile file, String argumentName, String errorDescription) {
+        if (file == null || file.isEmpty()) {
+            throw ExceptionUtils.createIllegalArgumentException(
+                    "error.invalidArgument",
+                    "Invalid argument: {0}",
+                    argumentName + " - " + errorDescription);
+        }
+        return file;
+    }
+
     private PrivateKey getPrivateKeyFromPEM(byte[] pemBytes, String password)
             throws IOException, OperatorCreationException, PKCSException {
         try (PEMParser pemParser =
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
index 6373e07520..ab8f3b75b6 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
@@ -74,13 +74,13 @@ public class ReactRoutingController {
     }
 
     @GetMapping(
-            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*$}")
+            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|pdfium|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*$}")
     public ResponseEntity<String> forwardRootPaths(HttpServletRequest request) throws IOException {
         return serveIndexHtml(request);
     }
 
     @GetMapping(
-            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
+            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|pdfium|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
     public ResponseEntity<String> forwardNestedPaths(HttpServletRequest request)
             throws IOException {
         return serveIndexHtml(request);
diff --git a/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java b/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
index bf96dd2171..d6e5c7021d 100644
--- a/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
+++ b/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
@@ -45,4 +45,26 @@ public class OptimizePdfRequest extends PDFFile {
             requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "false")
     private Boolean grayscale = false;
+
+    @Schema(
+            description =
+                    "Whether to convert images to high-contrast line art using ImageMagick. Default is false.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "false")
+    private Boolean lineArt = false;
+
+    @Schema(
+            description = "Threshold to use for line art conversion (0-100).",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "55")
+    private Double lineArtThreshold = 55d;
+
+    @Schema(
+            description =
+                    "Edge detection strength to use for line art conversion (1-3). This maps to"
+                            + " ImageMagick's -edge radius.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "1",
+            allowableValues = {"1", "2", "3"})
+    private Integer lineArtEdgeLevel = 1;
 }
diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template
index b5d10126b4..ad1ee4c8aa 100644
--- a/app/core/src/main/resources/settings.yml.template
+++ b/app/core/src/main/resources/settings.yml.template
@@ -126,6 +126,7 @@ system:
   customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template HTML files
   tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
   enableAnalytics: null # Master toggle for analytics: set to 'true' to enable all analytics, 'false' to disable all analytics, or leave as 'null' to prompt admin on first launch
+  enableDesktopInstallSlide: true # Set to 'false' to hide the desktop app installation slide in the onboarding flow
   enablePosthog: null # Enable PostHog analytics (open-source product analytics): set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
   enableScarf: null # Enable Scarf tracking pixel: set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
   enableUrlToPDF: false # Set to 'true' to enable URL to PDF, INTERNAL ONLY, known security issues, should not be used externally
@@ -206,6 +207,7 @@ processExecutor:
     weasyPrintSessionLimit: 16
     installAppSessionLimit: 1
     calibreSessionLimit: 1
+    imageMagickSessionLimit: 4
     ghostscriptSessionLimit: 8
     ocrMyPdfSessionLimit: 2
   timeoutMinutes: # Process executor timeout in minutes
@@ -215,6 +217,7 @@ processExecutor:
     weasyPrinttimeoutMinutes: 30
     installApptimeoutMinutes: 60
     calibretimeoutMinutes: 30
+    imageMagickTimeoutMinutes: 30
     tesseractTimeoutMinutes: 30
     qpdfTimeoutMinutes: 30
     ghostscriptTimeoutMinutes: 30
diff --git a/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java b/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
index c9f02cd28d..5a5eff1f12 100644
--- a/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
+++ b/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
@@ -1,9 +1,10 @@
 package stirling.software.SPDF.controller.api.security;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -107,7 +108,8 @@ class CertSignControllerTest {
             derCertBytes = baos.toByteArray();
         }
 
-        when(pdfDocumentFactory.load(any(MultipartFile.class)))
+        lenient()
+                .when(pdfDocumentFactory.load(any(MultipartFile.class)))
                 .thenAnswer(
                         invocation -> {
                             MultipartFile file = invocation.getArgument(0);
@@ -167,6 +169,31 @@ class CertSignControllerTest {
         assertTrue(response.getBody().length > 0);
     }
 
+    @Test
+    void testSignPdfWithMissingPkcs12FileThrowsError() {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile(
+                        "fileInput", "test.pdf", MediaType.APPLICATION_PDF_VALUE, pdfBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PFX");
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        IllegalArgumentException exception =
+                assertThrows(
+                        IllegalArgumentException.class,
+                        () -> certSignController.signPDFWithCert(request));
+
+        assertTrue(exception.getMessage().contains("PKCS12 keystore"));
+    }
+
     @Test
     void testSignPdfWithJks() throws Exception {
         MockMultipartFile pdfFile =
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
index a073c21371..53b3e1f388 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.annotations.api.UserApi;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.proprietary.model.api.signature.SavedSignatureRequest;
 import stirling.software.proprietary.model.api.signature.SavedSignatureResponse;
@@ -34,7 +33,6 @@ import stirling.software.proprietary.service.SignatureService;
  * authentication and enforces per-user storage limits. All endpoints require authentication
  * via @PreAuthorize("isAuthenticated()").
  */
-@UserApi
 @Slf4j
 @RestController
 @RequestMapping("/api/v1/proprietary/signatures")
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java
new file mode 100644
index 0000000000..8ca6a83e7c
--- /dev/null
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java
@@ -0,0 +1,81 @@
+package stirling.software.proprietary.service;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.LineArtConversionService;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+
+@Slf4j
+@Service
+public class ImageMagickLineArtConversionService implements LineArtConversionService {
+
+    @Override
+    public PDImageXObject convertImageToLineArt(
+            PDDocument doc, PDImageXObject originalImage, double threshold, int edgeLevel)
+            throws IOException {
+
+        Path inputImage = Files.createTempFile("lineart_image_input_", ".png");
+        Path outputImage = Files.createTempFile("lineart_image_output_", ".tiff");
+
+        try {
+            ImageIO.write(originalImage.getImage(), "png", inputImage.toFile());
+
+            List<String> command = new ArrayList<>();
+            command.add("magick");
+            command.add(inputImage.toString());
+            command.add("-colorspace");
+            command.add("Gray");
+
+            // Edge-aware line art conversion using ImageMagick's built-in operators.
+            // -edge/-negate/-normalize are standard convert options (IM v6+/v7) that
+            // accentuate outlines before thresholding to a bilevel image.
+            command.add("-edge");
+            command.add(String.valueOf(edgeLevel));
+            command.add("-negate");
+            command.add("-normalize");
+
+            command.add("-type");
+            command.add("Bilevel");
+            command.add("-threshold");
+            command.add(String.format(Locale.ROOT, "%.1f%%", threshold));
+            command.add("-compress");
+            command.add("Group4");
+            command.add(outputImage.toString());
+
+            ProcessExecutorResult result =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.IMAGEMAGICK)
+                            .runCommandWithOutputHandling(command);
+
+            if (result.getRc() != 0) {
+                log.warn(
+                        "ImageMagick line art conversion failed with return code: {}",
+                        result.getRc());
+                throw new IOException("ImageMagick line art conversion failed");
+            }
+
+            byte[] convertedBytes = Files.readAllBytes(outputImage);
+            return PDImageXObject.createFromByteArray(
+                    doc, convertedBytes, originalImage.getCOSObject().toString());
+        } catch (Exception e) {
+            log.warn("ImageMagick line art conversion failed", e);
+            throw new IOException("ImageMagick line art conversion failed", e);
+        } finally {
+            Files.deleteIfExists(inputImage);
+            Files.deleteIfExists(outputImage);
+        }
+    }
+}
diff --git a/build.gradle b/build.gradle
index 64908ee4ac..90fde88e59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,8 @@ plugins {
 }
 
 import com.github.jk1.license.render.*
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 
 ext {
     springBootVersion = "3.5.6"
@@ -57,7 +59,7 @@ repositories {
 
 allprojects {
     group = 'stirling.software'
-    version = '2.1.2'
+    version = '2.1.3'
 
     configurations.configureEach {
         exclude group: 'commons-logging', module: 'commons-logging'
@@ -65,6 +67,51 @@ allprojects {
     }
 }
 
+def writeIfChanged(File targetFile, String newContent) {
+    if (targetFile.getText('UTF-8') != newContent) {
+        targetFile.write(newContent, 'UTF-8')
+    }
+}
+
+def updateTauriConfigVersion(String version) {
+    File tauriConfig = file('frontend/src-tauri/tauri.conf.json')
+    def parsed = new JsonSlurper().parse(tauriConfig)
+    parsed.version = version
+
+    def formatted = JsonOutput.prettyPrint(JsonOutput.toJson(parsed)) + System.lineSeparator()
+    writeIfChanged(tauriConfig, formatted)
+}
+
+def updateSimulationVersion(File fileToUpdate, String version) {
+    def content = fileToUpdate.getText('UTF-8')
+    def matcher = content =~ /(appVersion:\s*')([^']*)(')/
+
+    if (!matcher.find()) {
+        throw new GradleException("Could not locate appVersion in ${fileToUpdate} for synchronization")
+    }
+
+    def updatedContent = matcher.replaceFirst("${matcher.group(1)}${version}${matcher.group(3)}")
+    writeIfChanged(fileToUpdate, updatedContent)
+}
+
+tasks.register('syncAppVersion') {
+    group = 'versioning'
+    description = 'Synchronizes app version across desktop and simulation configs.'
+
+    doLast {
+        def appVersion = project.version.toString()
+        println "Synchronizing application version to ${appVersion}"
+        updateTauriConfigVersion(appVersion)
+
+        [
+            'frontend/src/core/testing/serverExperienceSimulations.ts',
+            'frontend/src/proprietary/testing/serverExperienceSimulations.ts'
+        ].each { path ->
+            updateSimulationVersion(file(path), appVersion)
+        }
+    }
+}
+
 tasks.register('writeVersion', WriteProperties) {
     destinationFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
     println "Writing version.properties to ${destinationFile.get().asFile.path}"
@@ -314,7 +361,7 @@ tasks.named('bootRun') {
 tasks.named('build') {
     group = 'build'
     description = 'Delegates to :stirling-pdf:bootJar'
-    dependsOn ':stirling-pdf:bootJar', 'buildRestartHelper'
+    dependsOn ':stirling-pdf:bootJar', 'buildRestartHelper', 'syncAppVersion'
 
     doFirst {
         println "Delegating to :stirling-pdf:bootJar"
diff --git a/docker/Dockerfile.unified b/docker/Dockerfile.unified
index 0ba7cfb3c2..2968f569ce 100644
--- a/docker/Dockerfile.unified
+++ b/docker/Dockerfile.unified
@@ -105,6 +105,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     gcompat \
     libc6-compat \
     libreoffice \
+    imagemagick \
     # pdftohtml
     poppler-utils \
     # OCR MY PDF
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index f2421fa943..b946e1e619 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -81,6 +81,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/backend/Dockerfile.fat b/docker/backend/Dockerfile.fat
index c54a162dae..78d395d9de 100644
--- a/docker/backend/Dockerfile.fat
+++ b/docker/backend/Dockerfile.fat
@@ -74,6 +74,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/embedded/Dockerfile b/docker/embedded/Dockerfile
index a38aee9b4a..6b189f3108 100644
--- a/docker/embedded/Dockerfile
+++ b/docker/embedded/Dockerfile
@@ -99,6 +99,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/embedded/Dockerfile.fat b/docker/embedded/Dockerfile.fat
index 67e648aee0..462daa901b 100644
--- a/docker/embedded/Dockerfile.fat
+++ b/docker/embedded/Dockerfile.fat
@@ -101,6 +101,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 8d90d96588..f788474bbb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -105,6 +105,7 @@
         "typescript": "^5.9.2",
         "typescript-eslint": "^8.44.1",
         "vite": "^7.1.7",
+        "vite-plugin-static-copy": "^3.1.4",
         "vite-tsconfig-paths": "^5.1.4",
         "vitest": "^3.2.4"
       }
@@ -11093,6 +11094,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-map": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pac-proxy-agent": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
@@ -14503,6 +14517,25 @@
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/vite-plugin-static-copy": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-3.1.4.tgz",
+      "integrity": "sha512-iCmr4GSw4eSnaB+G8zc2f4dxSuDjbkjwpuBLLGvQYR9IW7rnDzftnUjOH5p4RYR+d4GsiBqXRvzuFhs5bnzVyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": "^3.6.0",
+        "p-map": "^7.0.3",
+        "picocolors": "^1.1.1",
+        "tinyglobby": "^0.2.15"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      }
+    },
     "node_modules/vite-tsconfig-paths": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 5489f6b46e..914b7bb1f9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -152,6 +152,7 @@
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.44.1",
     "vite": "^7.1.7",
+    "vite-plugin-static-copy": "^3.1.4",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4"
   },
diff --git a/frontend/public/locales/de-DE/translation.toml b/frontend/public/locales/de-DE/translation.toml
index 274de764ea..d48c424f42 100644
--- a/frontend/public/locales/de-DE/translation.toml
+++ b/frontend/public/locales/de-DE/translation.toml
@@ -6131,8 +6131,8 @@ tags = "text,anmerkung,beschriftung"
 applySignatures = "Text anwenden"
 
 [addText.text]
-name = "Textinhalt"
-placeholder = "Geben Sie den hinzuzufügenden Text ein"
+name = "Text"
+placeholder = "Text eingeben"
 fontLabel = "Schriftart"
 fontSizeLabel = "Schriftgröße"
 fontSizePlaceholder = "Schriftgröße eingeben oder wählen (8-200)"
diff --git a/frontend/public/locales/en-GB/translation.toml b/frontend/public/locales/en-GB/translation.toml
index 9d9278922e..7743ca9b1e 100644
--- a/frontend/public/locales/en-GB/translation.toml
+++ b/frontend/public/locales/en-GB/translation.toml
@@ -312,10 +312,10 @@ yamlAdvert = "Stirling PDF Pro supports YAML configuration files and other SSO f
 ssoAdvert = "Looking for more user management features? Check out Stirling PDF Pro"
 
 [analytics]
-title = "Do you want make Stirling PDF better?"
-paragraph1 = "Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents."
+title = "Do you want to help make Stirling PDF better?"
+paragraph1 = "Stirling PDF has opt-in analytics to help us improve the product. We do not track any personal information or file contents."
 paragraph2 = "Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better."
-learnMore = "Learn more"
+learnMore = "Learn more about our analytics"
 enable = "Enable analytics"
 disable = "Disable analytics"
 settings = "You can change the settings for analytics in the config/settings.yml file"
@@ -340,6 +340,10 @@ advance = "Advanced"
 edit = "View & Edit"
 popular = "Popular"
 
+[footer]
+discord = "Discord"
+issues = "GitHub"
+
 [settings.preferences]
 title = "Preferences"
 
@@ -435,6 +439,24 @@ latestVersion = "Latest Version"
 checkForUpdates = "Check for Updates"
 viewDetails = "View Details"
 
+[settings.security]
+title = "Security"
+description = "Update your password to keep your account secure."
+
+[settings.security.password]
+subtitle = "Change your password. You will be logged out after updating."
+required = "All fields are required."
+mismatch = "New passwords do not match."
+error = "Unable to update password. Please verify your current password and try again."
+success = "Password updated successfully. Please sign in again."
+current = "Current password"
+currentPlaceholder = "Enter your current password"
+new = "New password"
+newPlaceholder = "Enter a new password"
+confirm = "Confirm new password"
+confirmPlaceholder = "Re-enter your new password"
+update = "Update password"
+
 [settings.hotkeys]
 title = "Keyboard Shortcuts"
 description = "Customize keyboard shortcuts for quick tool access. Click \"Change shortcut\" and press a new key combination. Press Esc to cancel."
@@ -493,6 +515,10 @@ oldPassword = "Current Password"
 newPassword = "New Password"
 confirmNewPassword = "Confirm New Password"
 submit = "Submit Changes"
+credsUpdated = "Account updated"
+description = "Changes saved. Please log in again."
+error = "Unable to update username. Please verify your password and try again."
+changeUsername = "Update your username. You will be logged out after updating."
 
 [account]
 title = "Account Settings"
@@ -3703,6 +3729,16 @@ filesize = "File Size"
 [compress.grayscale]
 label = "Apply Grayscale for Compression"
 
+[compress.lineArt]
+label = "Convert images to line art"
+description = "Uses ImageMagick to reduce pages to high-contrast black and white for maximum size reduction."
+unavailable = "ImageMagick is not installed or enabled on this server"
+detailLevel = "Detail level"
+edgeEmphasis = "Edge emphasis"
+edgeLow = "Gentle"
+edgeMedium = "Balanced"
+edgeHigh = "Strong"
+
 [compress.tooltip.header]
 title = "Compress Settings Overview"
 
@@ -3720,6 +3756,10 @@ bullet2 = "Higher values reduce file size"
 title = "Grayscale"
 text = "Select this option to convert all images to black and white, which can significantly reduce file size especially for scanned PDFs or image-heavy documents."
 
+[compress.tooltip.lineArt]
+title = "Line Art"
+text = "Convert pages to high-contrast black and white using ImageMagick. Use detail level to control how much content becomes black, and edge emphasis to control how aggressively edges are detected."
+
 [compress.error]
 failed = "An error occurred while compressing the PDF."
 
@@ -4038,12 +4078,20 @@ settings = "Settings"
 adminSettings = "Admin Settings"
 allTools = "Tools"
 reader = "Reader"
+tours = "Tours"
+showMeAround = "Show me around"
+
+[quickAccess.toursTooltip]
+admin = "Watch walkthroughs here: Tools tour, New V2 layout tour, and the Admin tour."
+user = "Watch walkthroughs here: Tools tour and the New V2 layout tour."
 
 [quickAccess.helpMenu]
 toolsTour = "Tools Tour"
 toolsTourDesc = "Learn what the tools can do"
 adminTour = "Admin Tour"
 adminTourDesc = "Explore admin settings & features"
+whatsNewTour = "See what's new in V2"
+whatsNewTourDesc = "Tour the updated layout"
 
 [admin]
 error = "Error"
@@ -5070,6 +5118,7 @@ loading = "Loading..."
 back = "Back"
 continue = "Continue"
 error = "Error"
+save = "Save"
 
 [config.overview]
 title = "Application Configuration"
@@ -5236,6 +5285,16 @@ finish = "Finish"
 startTour = "Start Tour"
 startTourDescription = "Take a guided tour of Stirling PDF's key features"
 
+[onboarding.whatsNew]
+quickAccess = "Start at the <strong>Quick Access</strong> rail to jump between Reader, Automate, your files, and all the tours."
+leftPanel = "The left <strong>Tools</strong> panel lists everything you can do. Browse categories or search to find a tool quickly."
+fileUpload = "Use the <strong>Files</strong> button to upload or pick a recent PDF. We will load a sample so you can see the workspace."
+rightRail = "The <strong>Right Rail</strong> holds quick actions to select files, change theme or language, and download results."
+topBar = "The top bar lets you swap between <strong>Viewer</strong>, <strong>Page Editor</strong>, and <strong>Active Files</strong>."
+pageEditorView = "Switch to the Page Editor to reorder, rotate, or delete pages."
+activeFilesView = "Use Active Files to see everything you have open and pick what to work on."
+wrapUp = "That is what is new in V2. Open the <strong>Tours</strong> menu anytime to replay this, the Tools tour, or the Admin tour."
+
 [onboarding.welcomeModal]
 title = "Welcome to Stirling PDF!"
 description = "Would you like to take a quick 1-minute tour to learn the key features and how to get started?"
@@ -5256,6 +5315,10 @@ download = "Download →"
 showMeAround = "Show me around"
 skipTheTour = "Skip the tour"
 
+[onboarding.tourOverview]
+title = "Tour Overview"
+body = "Stirling PDF V2 ships with dozens of tools and a refreshed layout. Take a quick tour to see what changed and where to find the features you need."
+
 [onboarding.serverLicense]
 skip = "Skip for now"
 seePlans = "See Plans →"
@@ -5569,6 +5632,28 @@ contactSales = "Contact Sales"
 contactToUpgrade = "Contact us to upgrade or customize your plan"
 maxUsers = "Max Users"
 upTo = "Up to"
+getLicense = "Get Server License"
+upgradeToEnterprise = "Upgrade to Enterprise"
+selectPeriod = "Select Billing Period"
+monthlyBilling = "Monthly Billing"
+yearlyBilling = "Yearly Billing"
+checkoutOpened = "Checkout Opened"
+checkoutInstructions = "Complete your purchase in the Stripe tab. After payment, return here and refresh the page to activate your license. You will also receive an email with your license key."
+activateLicense = "Activate Your License"
+
+[plan.static.licenseActivation]
+checkoutOpened = "Checkout Opened in New Tab"
+instructions = "Complete your purchase in the Stripe tab. Once your payment is complete, you will receive an email with your license key."
+enterKey = "Enter your license key below to activate your plan:"
+keyDescription = "Paste the license key from your email"
+activate = "Activate License"
+doLater = "I'll do this later"
+success = "License Activated!"
+successMessage = "Your license has been successfully activated. You can now close this window."
+
+[plan.static.billingPortal]
+title = "Email Verification Required"
+message = "You will need to verify your email address in the Stripe billing portal. Check your email for a login link."
 
 [plan.period]
 month = "month"
@@ -5772,6 +5857,8 @@ notAvailable = "Audit system not available"
 notAvailableMessage = "The audit system is not configured or not available."
 disabled = "Audit logging is disabled"
 disabledMessage = "Enable audit logging in your application configuration to track system events."
+enterpriseRequired = "Enterprise License Required"
+enterpriseRequiredMessage = "The audit logging system is an enterprise feature. Please upgrade to an enterprise license to access audit logs and analytics."
 
 [audit.error]
 title = "Error loading audit system"
diff --git a/frontend/src-tauri/src/lib.rs b/frontend/src-tauri/src/lib.rs
index cb8faf04bb..a08587cc17 100644
--- a/frontend/src-tauri/src/lib.rs
+++ b/frontend/src-tauri/src/lib.rs
@@ -152,15 +152,27 @@ pub fn run() {
         }
         #[cfg(target_os = "macos")]
         RunEvent::Opened { urls } => {
+          use urlencoding::decode;
+
           add_log(format!("📂 Tauri file opened event: {:?}", urls));
           let mut added_files = false;
 
           for url in urls {
             let url_str = url.as_str();
             if url_str.starts_with("file://") {
-              let file_path = url_str.strip_prefix("file://").unwrap_or(url_str);
+              let encoded_path = url_str.strip_prefix("file://").unwrap_or(url_str);
+
+              // Decode URL-encoded characters (%20 -> space, etc.)
+              let file_path = match decode(encoded_path) {
+                Ok(decoded) => decoded.into_owned(),
+                Err(e) => {
+                  add_log(format!("⚠️ Failed to decode file path: {} - {}", encoded_path, e));
+                  encoded_path.to_string() // Fallback to encoded path
+                }
+              };
+
               add_log(format!("📂 Processing opened file: {}", file_path));
-              add_opened_file(file_path.to_string());
+              add_opened_file(file_path);
               added_files = true;
             }
           }
diff --git a/frontend/src-tauri/tauri.conf.json b/frontend/src-tauri/tauri.conf.json
index a7c3355d89..b10fec0e54 100644
--- a/frontend/src-tauri/tauri.conf.json
+++ b/frontend/src-tauri/tauri.conf.json
@@ -1,74 +1,82 @@
 {
-  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
-  "productName": "Stirling-PDF",
-  "version": "2.0.0",
-  "identifier": "stirling.pdf.dev",
-  "build": {
-    "frontendDist": "../dist",
-    "devUrl": "http://localhost:5173",
-    "beforeDevCommand": "npm run dev -- --mode desktop",
-    "beforeBuildCommand": "npm run build -- --mode desktop"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "Stirling-PDF",
-        "width": 1280,
-        "height": 800,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ]
-  },
-  "bundle": {
-    "active": true,
-    "targets": ["deb", "rpm", "dmg", "app", "msi"],
-    "icon": [
-      "icons/icon.png",
-      "icons/icon.icns",
-      "icons/icon.ico",
-      "icons/16x16.png",
-      "icons/32x32.png",
-      "icons/64x64.png",
-      "icons/128x128.png",
-      "icons/192x192.png"
-    ],
-    "resources": [
-      "libs/*.jar",
-      "runtime/jre/**/*"
-    ],
-    "fileAssociations": [
-      {
-        "ext": ["pdf"],
-        "name": "PDF Document",
-        "description": "Open PDF files with Stirling-PDF",
-        "role": "Editor",
-        "mimeType": "application/pdf"
-      }
-    ],
-    "linux": {
-      "deb": {
-        "desktopTemplate": "stirling-pdf.desktop"
-      }
+    "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+    "productName": "Stirling-PDF",
+    "version": "2.1.3",
+    "identifier": "stirling.pdf.dev",
+    "build": {
+        "frontendDist": "../dist",
+        "devUrl": "http://localhost:5173",
+        "beforeDevCommand": "npm run dev -- --mode desktop",
+        "beforeBuildCommand": "npm run build -- --mode desktop"
     },
-    "windows": {
-      "certificateThumbprint": null,
-      "digestAlgorithm": "sha256",
-      "timestampUrl": "http://timestamp.digicert.com"
+    "app": {
+        "windows": [
+            {
+                "title": "Stirling-PDF",
+                "width": 1280,
+                "height": 800,
+                "resizable": true,
+                "fullscreen": false
+            }
+        ]
     },
-    "macOS": {
-      "minimumSystemVersion": "10.15",
-      "signingIdentity": null,
-      "entitlements": null,
-      "providerShortName": null
+    "bundle": {
+        "active": true,
+        "targets": [
+            "deb",
+            "rpm",
+            "dmg",
+            "app",
+            "msi"
+        ],
+        "icon": [
+            "icons/icon.png",
+            "icons/icon.icns",
+            "icons/icon.ico",
+            "icons/16x16.png",
+            "icons/32x32.png",
+            "icons/64x64.png",
+            "icons/128x128.png",
+            "icons/192x192.png"
+        ],
+        "resources": [
+            "libs/*.jar",
+            "runtime/jre/**/*"
+        ],
+        "fileAssociations": [
+            {
+                "ext": [
+                    "pdf"
+                ],
+                "name": "PDF Document",
+                "description": "Open PDF files with Stirling-PDF",
+                "role": "Editor",
+                "mimeType": "application/pdf"
+            }
+        ],
+        "linux": {
+            "deb": {
+                "desktopTemplate": "stirling-pdf.desktop"
+            }
+        },
+        "windows": {
+            "certificateThumbprint": null,
+            "digestAlgorithm": "sha256",
+            "timestampUrl": "http://timestamp.digicert.com"
+        },
+        "macOS": {
+            "minimumSystemVersion": "10.15",
+            "signingIdentity": null,
+            "entitlements": null,
+            "providerShortName": null
+        }
+    },
+    "plugins": {
+        "shell": {
+            "open": true
+        },
+        "fs": {
+            "requireLiteralLeadingDot": false
+        }
     }
-  },
-  "plugins": {
-    "shell": {
-      "open": true
-    },
-    "fs": {
-      "requireLiteralLeadingDot": false
-    }
-  }
 }
diff --git a/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx b/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
index c93a89be00..f3fecba7e6 100644
--- a/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
+++ b/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
 import { Stack, TextInput, Select, Combobox, useCombobox, Group, Box } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
 import { ColorPicker } from '@app/components/annotation/shared/ColorPicker';
 
 interface TextInputWithFontProps {
@@ -13,8 +12,12 @@ interface TextInputWithFontProps {
   textColor?: string;
   onTextColorChange?: (color: string) => void;
   disabled?: boolean;
-  label?: string;
-  placeholder?: string;
+  label: string;
+  placeholder: string;
+  fontLabel: string;
+  fontSizeLabel: string;
+  fontSizePlaceholder: string;
+  colorLabel?: string;
   onAnyChange?: () => void;
 }
 
@@ -30,9 +33,12 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
   disabled = false,
   label,
   placeholder,
+  fontLabel,
+  fontSizeLabel,
+  fontSizePlaceholder,
+  colorLabel,
   onAnyChange
 }) => {
-  const { t } = useTranslation();
   const [fontSizeInput, setFontSizeInput] = useState(fontSize.toString());
   const fontSizeCombobox = useCombobox();
   const [isColorPickerOpen, setIsColorPickerOpen] = useState(false);
@@ -66,8 +72,8 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
   return (
     <Stack gap="sm">
       <TextInput
-        label={label || t('sign.text.name', 'Signer name')}
-        placeholder={placeholder || t('sign.text.placeholder', 'Enter your full name')}
+        label={label}
+        placeholder={placeholder}
         value={text}
         onChange={(e) => {
           onTextChange(e.target.value);
@@ -79,7 +85,7 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
 
       {/* Font Selection */}
       <Select
-        label={t('sign.text.fontLabel', 'Font')}
+        label={fontLabel}
         value={fontFamily}
         onChange={(value) => {
           onFontFamilyChange(value || 'Helvetica');
@@ -107,8 +113,8 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
         >
           <Combobox.Target>
             <TextInput
-              label={t('sign.text.fontSizeLabel', 'Font size')}
-              placeholder={t('sign.text.fontSizePlaceholder', 'Type or select font size (8-200)')}
+              label={fontSizeLabel}
+              placeholder={fontSizePlaceholder}
               value={fontSizeInput}
               onChange={(event) => {
                 const value = event.currentTarget.value;
@@ -155,7 +161,7 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
         {onTextColorChange && (
           <Box>
             <TextInput
-              label={t('sign.text.colorLabel', 'Text colour')}
+              label={colorLabel}
               value={colorInput}
               placeholder="#000000"
               disabled={disabled}
diff --git a/frontend/src/core/components/annotation/tools/TextTool.tsx b/frontend/src/core/components/annotation/tools/TextTool.tsx
deleted file mode 100644
index 471198d8e3..0000000000
--- a/frontend/src/core/components/annotation/tools/TextTool.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useState } from 'react';
-import { Stack } from '@mantine/core';
-import { BaseAnnotationTool } from '@app/components/annotation/shared/BaseAnnotationTool';
-import { TextInputWithFont } from '@app/components/annotation/shared/TextInputWithFont';
-
-interface TextToolProps {
-  onTextChange?: (text: string) => void;
-  disabled?: boolean;
-}
-
-export const TextTool: React.FC<TextToolProps> = ({
-  onTextChange,
-  disabled = false
-}) => {
-  const [text, setText] = useState('');
-  const [fontSize, setFontSize] = useState(16);
-  const [fontFamily, setFontFamily] = useState('Helvetica');
-
-  const handleTextChange = (newText: string) => {
-    setText(newText);
-    onTextChange?.(newText);
-  };
-
-  const handleSignatureDataChange = (data: string | null) => {
-    if (data) {
-      onTextChange?.(data);
-    }
-  };
-
-  const toolConfig = {
-    enableTextInput: true,
-    showPlaceButton: true,
-    placeButtonText: "Place Text"
-  };
-
-  return (
-    <BaseAnnotationTool
-      config={toolConfig}
-      onSignatureDataChange={handleSignatureDataChange}
-      disabled={disabled}
-    >
-      <Stack gap="sm">
-        <TextInputWithFont
-          text={text}
-          onTextChange={handleTextChange}
-          fontSize={fontSize}
-          onFontSizeChange={setFontSize}
-          fontFamily={fontFamily}
-          onFontFamilyChange={setFontFamily}
-          disabled={disabled}
-          label="Text Content"
-          placeholder="Enter text to place on the PDF"
-        />
-      </Stack>
-    </BaseAnnotationTool>
-  );
-};
\ No newline at end of file
diff --git a/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx b/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
index ae90c27da0..c50ae7b43e 100644
--- a/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
+++ b/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
@@ -47,11 +47,11 @@ export function SlideButtons({ slideDefinition, licenseNotice, flowState, onActi
     ) {
       return t('onboarding.serverLicense.upgrade', 'Upgrade now →');
     }
-    
+
     // Translate the label (it's a translation key)
     const label = button.label ?? '';
     if (!label) return '';
-    
+
     // Extract fallback text from translation key (e.g., 'onboarding.buttons.next' -> 'Next')
     const fallback = label.split('.').pop() || label;
     return t(label, fallback);
@@ -105,4 +105,4 @@ export function SlideButtons({ slideDefinition, licenseNotice, flowState, onActi
       <Group gap={12}>{rightButtons.map(renderButton)}</Group>
     </Group>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/src/core/components/onboarding/Onboarding.tsx b/frontend/src/core/components/onboarding/Onboarding.tsx
index e851ee60bf..bcfa449bf7 100644
--- a/frontend/src/core/components/onboarding/Onboarding.tsx
+++ b/frontend/src/core/components/onboarding/Onboarding.tsx
@@ -5,7 +5,6 @@ import { useNavigate, useLocation } from 'react-router-dom';
 import { isAuthRoute } from '@app/constants/routes';
 import { dispatchTourState } from '@app/constants/events';
 import { useOnboardingOrchestrator } from '@app/components/onboarding/orchestrator/useOnboardingOrchestrator';
-import { markStepSeen } from '@app/components/onboarding/orchestrator/onboardingStorage';
 import { useBypassOnboarding } from '@app/components/onboarding/useBypassOnboarding';
 import OnboardingTour, { type AdvanceArgs, type CloseArgs } from '@app/components/onboarding/OnboardingTour';
 import OnboardingModalSlide from '@app/components/onboarding/OnboardingModalSlide';
@@ -20,10 +19,12 @@ import { useTourOrchestration } from '@app/contexts/TourOrchestrationContext';
 import { useAdminTourOrchestration } from '@app/contexts/AdminTourOrchestrationContext';
 import { createUserStepsConfig } from '@app/components/onboarding/userStepsConfig';
 import { createAdminStepsConfig } from '@app/components/onboarding/adminStepsConfig';
+import { createWhatsNewStepsConfig } from '@app/components/onboarding/whatsNewStepsConfig';
 import { removeAllGlows } from '@app/components/onboarding/tourGlow';
 import { useFilesModalContext } from '@app/contexts/FilesModalContext';
 import { useServerExperience } from '@app/hooks/useServerExperience';
-import AdminAnalyticsChoiceModal from '@app/components/shared/AdminAnalyticsChoiceModal';
+import { useAppConfig } from '@app/contexts/AppConfigContext';
+import apiClient from '@app/services/apiClient';
 import '@app/components/onboarding/OnboardingTour.css';
 
 export default function Onboarding() {
@@ -39,6 +40,11 @@ export default function Onboarding() {
   const { osInfo, osOptions, setSelectedDownloadUrl, handleDownloadSelected } = useOnboardingDownload();
   const { showLicenseSlide, licenseNotice: externalLicenseNotice, closeLicenseSlide } = useServerLicenseRequest();
   const { tourRequested: externalTourRequested, requestedTourType, clearTourRequest } = useTourRequest();
+  const { config, refetch: refetchConfig } = useAppConfig();
+  const [analyticsError, setAnalyticsError] = useState<string | null>(null);
+  const [analyticsLoading, setAnalyticsLoading] = useState(false);
+  const [showAnalyticsModal, setShowAnalyticsModal] = useState(false);
+  const [analyticsModalDismissed, setAnalyticsModalDismissed] = useState(false);
 
   const handleRoleSelect = useCallback((role: 'admin' | 'user' | null) => {
     actions.updateRuntimeState({ selectedRole: role });
@@ -50,7 +56,34 @@ export default function Onboarding() {
     window.location.href = '/login';
   }, [actions]);
 
-  const handleButtonAction = useCallback((action: ButtonAction) => {
+  // Check if we should show analytics modal before onboarding
+  useEffect(() => {
+    if (!isLoading && !analyticsModalDismissed && serverExperience.effectiveIsAdmin && config?.enableAnalytics == null) {
+      setShowAnalyticsModal(true);
+    }
+  }, [isLoading, analyticsModalDismissed, serverExperience.effectiveIsAdmin, config?.enableAnalytics]);
+
+  const handleAnalyticsChoice = useCallback(async (enableAnalytics: boolean) => {
+    if (analyticsLoading) return;
+    setAnalyticsLoading(true);
+    setAnalyticsError(null);
+
+    try {
+      const formData = new FormData();
+      formData.append('enabled', enableAnalytics.toString());
+
+      await apiClient.post('/api/v1/settings/update-enable-analytics', formData);
+      await refetchConfig();
+      setShowAnalyticsModal(false);
+      setAnalyticsModalDismissed(true);
+      setAnalyticsLoading(false);
+    } catch (error) {
+      setAnalyticsError(error instanceof Error ? error.message : 'Unknown error');
+      setAnalyticsLoading(false);
+    }
+  }, [analyticsLoading, refetchConfig]);
+
+  const handleButtonAction = useCallback(async (action: ButtonAction) => {
     switch (action) {
       case 'next':
       case 'complete-close':
@@ -69,35 +102,43 @@ export default function Onboarding() {
       case 'security-next':
         if (!runtimeState.selectedRole) return;
         if (runtimeState.selectedRole !== 'admin') {
-          actions.updateRuntimeState({ tourRequested: true, tourType: 'tools' });
+          actions.updateRuntimeState({ tourType: 'whatsnew' });
+          setIsTourOpen(true);
         }
         actions.complete();
         break;
       case 'launch-admin':
-        actions.updateRuntimeState({ tourRequested: true, tourType: 'admin' });
-        actions.complete();
+        actions.updateRuntimeState({ tourType: 'admin' });
+        setIsTourOpen(true);
         break;
       case 'launch-tools':
-        actions.updateRuntimeState({ tourRequested: true, tourType: 'tools' });
-        actions.complete();
+        actions.updateRuntimeState({ tourType: 'whatsnew' });
+        setIsTourOpen(true);
         break;
       case 'launch-auto': {
-        const tourType = serverExperience.effectiveIsAdmin || runtimeState.selectedRole === 'admin' ? 'admin' : 'tools';
-        actions.updateRuntimeState({ tourRequested: true, tourType });
-        actions.complete();
+        const tourType = serverExperience.effectiveIsAdmin || runtimeState.selectedRole === 'admin' ? 'admin' : 'whatsnew';
+        actions.updateRuntimeState({ tourType });
+        setIsTourOpen(true);
         break;
       }
       case 'skip-to-license':
-        markStepSeen('tour');
-        actions.updateRuntimeState({ tourRequested: false });
+        actions.complete();
+        break;
+      case 'skip-tour':
         actions.complete();
         break;
       case 'see-plans':
         actions.complete();
         navigate('/settings/adminPlan');
         break;
+      case 'enable-analytics':
+        await handleAnalyticsChoice(true);
+        break;
+      case 'disable-analytics':
+        await handleAnalyticsChoice(false);
+        break;
     }
-  }, [actions, handleDownloadSelected, navigate, runtimeState.selectedRole, serverExperience.effectiveIsAdmin]);
+  }, [actions, handleAnalyticsChoice, handleDownloadSelected, navigate, runtimeState.selectedRole, serverExperience.effectiveIsAdmin]);
 
   const isRTL = typeof document !== 'undefined' ? document.documentElement.dir === 'rtl' : false;
   const [isTourOpen, setIsTourOpen] = useState(false);
@@ -117,10 +158,7 @@ export default function Onboarding() {
         backToAllTools: tourOrch.backToAllTools,
         selectCropTool: tourOrch.selectCropTool,
         loadSampleFile: tourOrch.loadSampleFile,
-        switchToViewer: tourOrch.switchToViewer,
-        switchToPageEditor: tourOrch.switchToPageEditor,
         switchToActiveFiles: tourOrch.switchToActiveFiles,
-        selectFirstFile: tourOrch.selectFirstFile,
         pinFile: tourOrch.pinFile,
         modifyCropSettings: tourOrch.modifyCropSettings,
         executeTool: tourOrch.executeTool,
@@ -130,6 +168,24 @@ export default function Onboarding() {
     [t, tourOrch, closeFilesModal, openFilesModal]
   );
 
+  const whatsNewStepsConfig = useMemo(
+    () => createWhatsNewStepsConfig({
+      t,
+      actions: {
+        saveWorkbenchState: tourOrch.saveWorkbenchState,
+        closeFilesModal,
+        backToAllTools: tourOrch.backToAllTools,
+        openFilesModal,
+        loadSampleFile: tourOrch.loadSampleFile,
+        switchToViewer: tourOrch.switchToViewer,
+        switchToPageEditor: tourOrch.switchToPageEditor,
+        switchToActiveFiles: tourOrch.switchToActiveFiles,
+        selectFirstFile: tourOrch.selectFirstFile,
+      },
+    }),
+    [t, tourOrch, closeFilesModal, openFilesModal]
+  );
+
   const adminStepsConfig = useMemo(
     () => createAdminStepsConfig({
       t,
@@ -144,21 +200,19 @@ export default function Onboarding() {
   );
 
   const tourSteps = useMemo<StepType[]>(() => {
-    const config = runtimeState.tourType === 'admin' ? adminStepsConfig : userStepsConfig;
-    return Object.values(config);
-  }, [adminStepsConfig, runtimeState.tourType, userStepsConfig]);
-
-  useEffect(() => {
-    if (currentStep?.id === 'tour' && !isTourOpen) {
-      markStepSeen('tour');
-      setIsTourOpen(true);
+    switch (runtimeState.tourType) {
+      case 'admin':
+        return Object.values(adminStepsConfig);
+      case 'whatsnew':
+        return Object.values(whatsNewStepsConfig);
+      default:
+        return Object.values(userStepsConfig);
     }
-  }, [currentStep, isTourOpen, activeFlow]);
+  }, [adminStepsConfig, runtimeState.tourType, userStepsConfig, whatsNewStepsConfig]);
 
   useEffect(() => {
     if (externalTourRequested) {
-      actions.updateRuntimeState({ tourRequested: true, tourType: requestedTourType });
-      markStepSeen('tour');
+      actions.updateRuntimeState({ tourType: requestedTourType });
       setIsTourOpen(true);
       clearTourRequest();
     }
@@ -176,9 +230,9 @@ export default function Onboarding() {
     } else {
       tourOrch.restoreWorkbenchState();
     }
-    markStepSeen('tour');
-    if (currentStep?.id === 'tour') actions.complete();
-  }, [actions, adminTourOrch, currentStep?.id, runtimeState.tourType, tourOrch]);
+    // Advance to next onboarding step after tour completes
+    actions.complete();
+  }, [actions, adminTourOrch, runtimeState.tourType, tourOrch]);
 
   const handleAdvanceTour = useCallback((args: AdvanceArgs) => {
     const { setCurrentStep, currentStep: tourCurrentStep, steps, setIsOpen } = args;
@@ -216,8 +270,10 @@ export default function Onboarding() {
       firstLoginUsername: runtimeState.firstLoginUsername,
       onPasswordChanged: handlePasswordChanged,
       usingDefaultCredentials: runtimeState.usingDefaultCredentials,
+      analyticsError,
+      analyticsLoading,
     });
-  }, [currentSlideDefinition, osInfo, osOptions, runtimeState.selectedRole, runtimeState.licenseNotice, handleRoleSelect, serverExperience.loginEnabled, setSelectedDownloadUrl, runtimeState.firstLoginUsername, handlePasswordChanged]);
+  }, [analyticsError, analyticsLoading, currentSlideDefinition, osInfo, osOptions, runtimeState.selectedRole, runtimeState.licenseNotice, handleRoleSelect, serverExperience.loginEnabled, setSelectedDownloadUrl, runtimeState.firstLoginUsername, handlePasswordChanged]);
 
   const modalSlideCount = useMemo(() => {
     return activeFlow.filter((step) => step.type === 'modal-slide').length;
@@ -237,8 +293,45 @@ export default function Onboarding() {
     return null;
   }
 
+  // Show analytics modal before onboarding if needed
+  if (showAnalyticsModal) {
+    const slideDefinition = SLIDE_DEFINITIONS['analytics-choice'];
+    const slideContent = slideDefinition.createSlide({
+      osLabel: '',
+      osUrl: '',
+      selectedRole: null,
+      onRoleSelect: () => {},
+      analyticsError,
+      analyticsLoading,
+    });
+
+    return (
+      <OnboardingModalSlide
+        slideDefinition={slideDefinition}
+        slideContent={slideContent}
+        runtimeState={runtimeState}
+        modalSlideCount={1}
+        currentModalSlideIndex={0}
+        onSkip={() => {}} // No skip allowed
+        onAction={async (action) => {
+          if (action === 'enable-analytics') {
+            await handleAnalyticsChoice(true);
+          } else if (action === 'disable-analytics') {
+            await handleAnalyticsChoice(false);
+          }
+        }}
+        allowDismiss={false}
+      />
+    );
+  }
+
   if (showLicenseSlide) {
-    const slideDefinition = SLIDE_DEFINITIONS['server-license'];
+    const baseSlideDefinition = SLIDE_DEFINITIONS['server-license'];
+    // Remove back button for external license notice
+    const slideDefinition = {
+      ...baseSlideDefinition,
+      buttons: baseSlideDefinition.buttons.filter(btn => btn.key !== 'license-back')
+    };
     const effectiveLicenseNotice = externalLicenseNotice || runtimeState.licenseNotice;
     const slideContent = slideDefinition.createSlide({
       osLabel: '',
@@ -250,7 +343,7 @@ export default function Onboarding() {
       licenseNotice: effectiveLicenseNotice,
       loginEnabled: serverExperience.loginEnabled,
     });
-    
+
     return (
       <OnboardingModalSlide
         slideDefinition={slideDefinition}
@@ -271,40 +364,34 @@ export default function Onboarding() {
     );
   }
 
+  // Always render the tour component (it controls its own visibility with isOpen)
+  const tourComponent = (
+    <OnboardingTour
+      isOpen={isTourOpen}
+      tourSteps={tourSteps}
+      tourType={runtimeState.tourType}
+      isRTL={isRTL}
+      t={t}
+      onAdvance={handleAdvanceTour}
+      onClose={handleCloseTour}
+    />
+  );
+
+  // If no active onboarding, just show the tour (which may or may not be open)
   if (isLoading || !isActive || !currentStep) {
-    return (
-      <OnboardingTour
-        isOpen={isTourOpen}
-        tourSteps={tourSteps}
-        tourType={runtimeState.tourType}
-        isRTL={isRTL}
-        t={t}
-        onAdvance={handleAdvanceTour}
-        onClose={handleCloseTour}
-      />
-    );
+    return tourComponent;
   }
 
+  // If tour is open, hide the onboarding modal and just show the tour
+  if (isTourOpen) {
+    return tourComponent;
+  }
+
+  // Render the current onboarding step
   switch (currentStep.type) {
     case 'tool-prompt':
       return <ToolPanelModePrompt forceOpen={true} onComplete={actions.complete} />;
 
-    case 'tour':
-      return (
-        <OnboardingTour
-          isOpen={true}
-          tourSteps={tourSteps}
-          tourType={runtimeState.tourType}
-          isRTL={isRTL}
-          t={t}
-          onAdvance={handleAdvanceTour}
-          onClose={handleCloseTour}
-        />
-      );
-
-    case 'analytics-modal':
-      return <AdminAnalyticsChoiceModal opened={true} onClose={actions.complete} />;
-
     case 'modal-slide':
       if (!currentSlideDefinition || !currentSlideContent) return null;
       return (
diff --git a/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx b/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
index 381a608d8a..60a9309199 100644
--- a/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
+++ b/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
@@ -6,8 +6,9 @@
  */
 
 import React from 'react';
-import { Modal, Stack } from '@mantine/core';
+import { Modal, Stack, ActionIcon } from '@mantine/core';
 import DiamondOutlinedIcon from '@mui/icons-material/DiamondOutlined';
+import CloseIcon from '@mui/icons-material/Close';
 
 import type { SlideDefinition, ButtonAction } from '@app/components/onboarding/onboardingFlowConfig';
 import type { OnboardingRuntimeState } from '@app/components/onboarding/orchestrator/onboardingConfig';
@@ -28,6 +29,7 @@ interface OnboardingModalSlideProps {
   currentModalSlideIndex: number;
   onSkip: () => void;
   onAction: (action: ButtonAction) => void;
+  allowDismiss?: boolean;
 }
 
 export default function OnboardingModalSlide({
@@ -38,6 +40,7 @@ export default function OnboardingModalSlide({
   currentModalSlideIndex,
   onSkip,
   onAction,
+  allowDismiss = true,
 }: OnboardingModalSlideProps) {
 
   const renderHero = () => {
@@ -62,6 +65,9 @@ export default function OnboardingModalSlide({
         {slideDefinition.hero.type === 'lock' && (
           <LocalIcon icon="lock-outline" width={64} height={64} className={styles.heroIcon} />
         )}
+        {slideDefinition.hero.type === 'analytics' && (
+          <LocalIcon icon="analytics" width={64} height={64} className={styles.heroIcon} />
+        )}
         {slideDefinition.hero.type === 'diamond' && <DiamondOutlinedIcon sx={{ fontSize: 64, color: '#000000' }} />}
         {slideDefinition.hero.type === 'logo' && (
           <img src={`${BASE_PATH}/branding/StirlingPDFLogoNoTextLightHC.svg`} alt="Stirling logo" />
@@ -75,6 +81,7 @@ export default function OnboardingModalSlide({
       opened={true}
       onClose={onSkip}
       closeOnClickOutside={false}
+      closeOnEscape={allowDismiss}
       centered
       size="lg"
       radius="lg"
@@ -93,6 +100,31 @@ export default function OnboardingModalSlide({
             isActive
             slideKey={slideContent.key}
           />
+          {allowDismiss && (
+            <ActionIcon
+              onClick={onSkip}
+              radius="md"
+              size={36}
+              style={{
+                position: 'absolute',
+                top: 16,
+                right: 16,
+                backgroundColor: 'rgba(255, 255, 255, 0.2)',
+                color: 'white',
+                backdropFilter: 'blur(4px)',
+                zIndex: 10,
+              }}
+              styles={{
+                root: {
+                  '&:hover': {
+                    backgroundColor: 'rgba(255, 255, 255, 0.3)',
+                  },
+                },
+              }}
+            >
+              <CloseIcon fontSize="small" />
+            </ActionIcon>
+          )}
           <div className={styles.heroLogo} key={`logo-${slideContent.key}`}>
             {renderHero()}
           </div>
@@ -114,7 +146,9 @@ export default function OnboardingModalSlide({
               <style>{`div strong{color: var(--onboarding-title); font-weight: 600;}`}</style>
             </div>
 
-            <OnboardingStepper totalSteps={modalSlideCount} activeStep={currentModalSlideIndex} />
+            {modalSlideCount > 1 && (
+              <OnboardingStepper totalSteps={modalSlideCount} activeStep={currentModalSlideIndex} />
+            )}
 
             <div className={styles.buttonContainer}>
               <SlideButtons
diff --git a/frontend/src/core/components/onboarding/OnboardingTour.tsx b/frontend/src/core/components/onboarding/OnboardingTour.tsx
index 5715967987..85df0a9fdb 100644
--- a/frontend/src/core/components/onboarding/OnboardingTour.tsx
+++ b/frontend/src/core/components/onboarding/OnboardingTour.tsx
@@ -49,7 +49,7 @@ interface CloseArgs {
 
 interface OnboardingTourProps {
   tourSteps: StepType[];
-  tourType: 'admin' | 'tools';
+  tourType: 'admin' | 'tools' | 'whatsnew';
   isRTL: boolean;
   t: TFunction;
   isOpen: boolean;
diff --git a/frontend/src/core/components/onboarding/onboardingFlowConfig.ts b/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
index ff8ef1ccc1..0f9f5de020 100644
--- a/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
+++ b/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
@@ -4,6 +4,8 @@ import SecurityCheckSlide from '@app/components/onboarding/slides/SecurityCheckS
 import PlanOverviewSlide from '@app/components/onboarding/slides/PlanOverviewSlide';
 import ServerLicenseSlide from '@app/components/onboarding/slides/ServerLicenseSlide';
 import FirstLoginSlide from '@app/components/onboarding/slides/FirstLoginSlide';
+import TourOverviewSlide from '@app/components/onboarding/slides/TourOverviewSlide';
+import AnalyticsChoiceSlide from '@app/components/onboarding/slides/AnalyticsChoiceSlide';
 import { SlideConfig, LicenseNotice } from '@app/types/types';
 
 export type SlideId =
@@ -12,9 +14,11 @@ export type SlideId =
   | 'desktop-install'
   | 'security-check'
   | 'admin-overview'
-  | 'server-license';
+  | 'server-license'
+  | 'tour-overview'
+  | 'analytics-choice';
 
-export type HeroType = 'rocket' | 'dual-icon' | 'shield' | 'diamond' | 'logo' | 'lock';
+export type HeroType = 'rocket' | 'dual-icon' | 'shield' | 'diamond' | 'logo' | 'lock' | 'analytics';
 
 export type ButtonAction =
   | 'next'
@@ -27,7 +31,10 @@ export type ButtonAction =
   | 'launch-tools'
   | 'launch-auto'
   | 'see-plans'
-  | 'skip-to-license';
+  | 'skip-to-license'
+  | 'skip-tour'
+  | 'enable-analytics'
+  | 'disable-analytics';
 
 export interface FlowState {
   selectedRole: 'admin' | 'user' | null;
@@ -52,6 +59,8 @@ export interface SlideFactoryParams {
   firstLoginUsername?: string;
   onPasswordChanged?: () => void;
   usingDefaultCredentials?: boolean;
+  analyticsError?: string | null;
+  analyticsLoading?: boolean;
 }
 
 export interface HeroDefinition {
@@ -79,9 +88,9 @@ export interface SlideDefinition {
 export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
   'first-login': {
     id: 'first-login',
-    createSlide: ({ firstLoginUsername, onPasswordChanged, usingDefaultCredentials }) => 
-      FirstLoginSlide({ 
-        username: firstLoginUsername || '', 
+    createSlide: ({ firstLoginUsername, onPasswordChanged, usingDefaultCredentials }) =>
+      FirstLoginSlide({
+        username: firstLoginUsername || '',
         onPasswordChanged: onPasswordChanged || (() => {}),
         usingDefaultCredentials: usingDefaultCredentials || false,
       }),
@@ -194,6 +203,13 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
     createSlide: ({ licenseNotice }) => ServerLicenseSlide({ licenseNotice }),
     hero: { type: 'dual-icon' },
     buttons: [
+      {
+        key: 'license-back',
+        type: 'icon',
+        icon: 'chevron-left',
+        group: 'left',
+        action: 'prev',
+      },
       {
         key: 'license-close',
         type: 'button',
@@ -212,5 +228,58 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
       },
     ],
   },
+  'tour-overview': {
+    id: 'tour-overview',
+    createSlide: () => TourOverviewSlide(),
+    hero: { type: 'rocket' },
+    buttons: [
+      {
+        key: 'tour-overview-back',
+        type: 'icon',
+        icon: 'chevron-left',
+        group: 'left',
+        action: 'prev',
+      },
+      {
+        key: 'tour-overview-skip',
+        type: 'button',
+        label: 'onboarding.buttons.skipForNow',
+        variant: 'secondary',
+        group: 'left',
+        action: 'skip-tour',
+      },
+      {
+        key: 'tour-overview-show',
+        type: 'button',
+        label: 'onboarding.buttons.showMeAround',
+        variant: 'primary',
+        group: 'right',
+        action: 'launch-tools',
+      },
+    ],
+  },
+  'analytics-choice': {
+    id: 'analytics-choice',
+    createSlide: ({ analyticsError }) => AnalyticsChoiceSlide({ analyticsError }),
+    hero: { type: 'analytics' },
+    buttons: [
+      {
+        key: 'analytics-disable',
+        type: 'button',
+        label: 'no',
+        variant: 'secondary',
+        group: 'left',
+        action: 'disable-analytics',
+      },
+      {
+        key: 'analytics-enable',
+        type: 'button',
+        label: 'yes',
+        variant: 'primary',
+        group: 'right',
+        action: 'enable-analytics',
+      },
+    ],
+  },
 };
 
diff --git a/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts b/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
index 60843dea1f..7c9431dc47 100644
--- a/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
@@ -5,21 +5,20 @@ export type OnboardingStepId =
   | 'security-check'
   | 'admin-overview'
   | 'tool-layout'
-  | 'tour'
+  | 'tour-overview'
   | 'server-license'
   | 'analytics-choice';
 
 export type OnboardingStepType =
   | 'modal-slide'
-  | 'tool-prompt'
-  | 'tour'
-  | 'analytics-modal';
+  | 'tool-prompt';
 
 export interface OnboardingRuntimeState {
   selectedRole: 'admin' | 'user' | null;
   tourRequested: boolean;
-  tourType: 'admin' | 'tools';
+  tourType: 'admin' | 'tools' | 'whatsnew';
   isDesktopApp: boolean;
+  desktopSlideEnabled: boolean;
   analyticsNotConfigured: boolean;
   analyticsEnabled: boolean;
   licenseNotice: {
@@ -42,13 +41,13 @@ export interface OnboardingStep {
   id: OnboardingStepId;
   type: OnboardingStepType;
   condition: (ctx: OnboardingConditionContext) => boolean;
-  slideId?: 'first-login' | 'welcome' | 'desktop-install' | 'security-check' | 'admin-overview' | 'server-license';
+  slideId?: 'first-login' | 'welcome' | 'desktop-install' | 'security-check' | 'admin-overview' | 'server-license' | 'tour-overview' | 'analytics-choice';
 }
 
 export const DEFAULT_RUNTIME_STATE: OnboardingRuntimeState = {
   selectedRole: null,
   tourRequested: false,
-  tourType: 'tools',
+  tourType: 'whatsnew',
   isDesktopApp: false,
   analyticsNotConfigured: false,
   analyticsEnabled: false,
@@ -61,6 +60,7 @@ export const DEFAULT_RUNTIME_STATE: OnboardingRuntimeState = {
   requiresPasswordChange: false,
   firstLoginUsername: '',
   usingDefaultCredentials: false,
+  desktopSlideEnabled: true,
 };
 
 export const ONBOARDING_STEPS: OnboardingStep[] = [
@@ -76,18 +76,6 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     slideId: 'welcome',
     condition: () => true,
   },
-  {
-    id: 'desktop-install',
-    type: 'modal-slide',
-    slideId: 'desktop-install',
-    condition: (ctx) => !ctx.isDesktopApp,
-  },
-  {
-    id: 'security-check',
-    type: 'modal-slide',
-    slideId: 'security-check',
-    condition: (ctx) => !ctx.loginEnabled && !ctx.isDesktopApp,
-  },
   {
     id: 'admin-overview',
     type: 'modal-slide',
@@ -95,14 +83,27 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     condition: (ctx) => ctx.effectiveIsAdmin,
   },
   {
-    id: 'tool-layout',
-    type: 'tool-prompt',
-    condition: () => true,
+    id: 'desktop-install',
+    type: 'modal-slide',
+    slideId: 'desktop-install',
+    condition: (ctx) => !ctx.isDesktopApp && ctx.desktopSlideEnabled,
   },
   {
-    id: 'tour',
-    type: 'tour',
-    condition: (ctx) => ctx.tourRequested || !ctx.effectiveIsAdmin,
+    id: 'security-check',
+    type: 'modal-slide',
+    slideId: 'security-check',
+    condition: () => false,
+  },
+  {
+    id: 'tool-layout',
+    type: 'tool-prompt',
+    condition: () => false,
+  },
+  {
+    id: 'tour-overview',
+    type: 'modal-slide',
+    slideId: 'tour-overview',
+    condition: (ctx) => !ctx.effectiveIsAdmin && ctx.tourType !== 'admin',
   },
   {
     id: 'server-license',
@@ -110,11 +111,6 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     slideId: 'server-license',
     condition: (ctx) => ctx.effectiveIsAdmin && ctx.licenseNotice.requiresLicense,
   },
-  {
-    id: 'analytics-choice',
-    type: 'analytics-modal',
-    condition: (ctx) => ctx.effectiveIsAdmin && ctx.analyticsNotConfigured,
-  },
 ];
 
 export function getStepById(id: OnboardingStepId): OnboardingStep | undefined {
diff --git a/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts b/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
index ef9f51be17..9e3065614a 100644
--- a/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
@@ -1,94 +1,71 @@
-import { type OnboardingStepId, ONBOARDING_STEPS } from '@app/components/onboarding/orchestrator/onboardingConfig';
-
 const STORAGE_PREFIX = 'onboarding';
+const TOURS_TOOLTIP_KEY = `${STORAGE_PREFIX}::tours-tooltip-shown`;
+const ONBOARDING_COMPLETED_KEY = `${STORAGE_PREFIX}::completed`;
 
-export function getStorageKey(stepId: OnboardingStepId): string {
-  return `${STORAGE_PREFIX}::${stepId}`;
-}
-
-export function hasSeenStep(stepId: OnboardingStepId): boolean {
+export function isOnboardingCompleted(): boolean {
   if (typeof window === 'undefined') return false;
   try {
-    return localStorage.getItem(getStorageKey(stepId)) === 'true';
+    return localStorage.getItem(ONBOARDING_COMPLETED_KEY) === 'true';
   } catch {
     return false;
   }
 }
 
-export function markStepSeen(stepId: OnboardingStepId): void {
+export function markOnboardingCompleted(): void {
   if (typeof window === 'undefined') return;
   try {
-    localStorage.setItem(getStorageKey(stepId), 'true');
+    localStorage.setItem(ONBOARDING_COMPLETED_KEY, 'true');
   } catch (error) {
-    console.error('[onboardingStorage] Error marking step as seen:', error);
+    console.error('[onboardingStorage] Error marking onboarding as completed:', error);
   }
 }
 
-export function resetStepSeen(stepId: OnboardingStepId): void {
+export function resetOnboardingProgress(): void {
   if (typeof window === 'undefined') return;
   try {
-    localStorage.removeItem(getStorageKey(stepId));
+    localStorage.removeItem(ONBOARDING_COMPLETED_KEY);
   } catch (error) {
-    console.error('[onboardingStorage] Error resetting step seen:', error);
+    console.error('[onboardingStorage] Error resetting onboarding progress:', error);
   }
 }
 
-export function resetAllOnboardingProgress(): void {
-  if (typeof window === 'undefined') return;
+export function hasShownToursTooltip(): boolean {
+  if (typeof window === 'undefined') return false;
   try {
-    const prefix = `${STORAGE_PREFIX}::`;
-    const keysToRemove: string[] = [];
-    for (let i = 0; i < localStorage.length; i++) {
-      const key = localStorage.key(i);
-      if (key?.startsWith(prefix)) keysToRemove.push(key);
-    }
-    keysToRemove.forEach((key) => localStorage.removeItem(key));
-  } catch (error) {
-    console.error('[onboardingStorage] Error resetting all onboarding progress:', error);
+    return localStorage.getItem(TOURS_TOOLTIP_KEY) === 'true';
+  } catch {
+    return false;
   }
 }
 
-export function getOnboardingStorageState(): Record<string, boolean> {
-  const state: Record<string, boolean> = {};
-  ONBOARDING_STEPS.forEach((step) => {
-    state[step.id] = hasSeenStep(step.id);
-  });
-  return state;
+export function markToursTooltipShown(): void {
+  if (typeof window === 'undefined') return;
+  try {
+    localStorage.setItem(TOURS_TOOLTIP_KEY, 'true');
+  } catch (error) {
+    console.error('[onboardingStorage] Error marking tours tooltip as shown:', error);
+  }
 }
 
 export function migrateFromLegacyPreferences(): void {
   if (typeof window === 'undefined') return;
-  
+
   const migrationKey = `${STORAGE_PREFIX}::migrated`;
-  
+
   try {
     // Skip if already migrated
     if (localStorage.getItem(migrationKey) === 'true') return;
-    
+
     const prefsRaw = localStorage.getItem('stirlingpdf_preferences');
     if (prefsRaw) {
       const prefs = JSON.parse(prefsRaw) as Record<string, unknown>;
-      
-      // Migrate based on legacy flags
-      if (prefs.hasSeenIntroOnboarding === true) {
-        markStepSeen('welcome');
-        markStepSeen('desktop-install');
-        markStepSeen('security-check');
-        markStepSeen('admin-overview');
+
+      // If user had completed onboarding in old system, mark new system as complete
+      if (prefs.hasCompletedOnboarding === true || prefs.hasSeenIntroOnboarding === true) {
+        markOnboardingCompleted();
       }
-      
-      if (prefs.toolPanelModePromptSeen === true || prefs.hasSelectedToolPanelMode === true) {
-        markStepSeen('tool-layout');
-      }
-      
-      if (prefs.hasCompletedOnboarding === true) {
-        markStepSeen('tour');
-        markStepSeen('analytics-choice');
-        markStepSeen('server-license');
-      }
-      
     }
-    
+
     // Mark migration complete
     localStorage.setItem(migrationKey, 'true');
   } catch {
diff --git a/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts b/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
index 514b98e1c7..eb3c5367ec 100644
--- a/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
@@ -12,8 +12,8 @@ import {
   DEFAULT_RUNTIME_STATE,
 } from '@app/components/onboarding/orchestrator/onboardingConfig';
 import {
-  hasSeenStep,
-  markStepSeen,
+  isOnboardingCompleted,
+  markOnboardingCompleted,
   migrateFromLegacyPreferences,
 } from '@app/components/onboarding/orchestrator/onboardingStorage';
 import { accountService } from '@app/services/accountService';
@@ -35,12 +35,15 @@ function getInitialRuntimeState(baseState: OnboardingRuntimeState): OnboardingRu
   if (typeof window === 'undefined') {
     return baseState;
   }
-  
+
   try {
     const tourRequested = sessionStorage.getItem(SESSION_TOUR_REQUESTED) === 'true';
-    const tourType = (sessionStorage.getItem(SESSION_TOUR_TYPE) as 'admin' | 'tools') || 'tools';
+    const sessionTourType = sessionStorage.getItem(SESSION_TOUR_TYPE);
+    const tourType = (sessionTourType === 'admin' || sessionTourType === 'tools' || sessionTourType === 'whatsnew')
+      ? sessionTourType
+      : 'whatsnew';
     const selectedRole = sessionStorage.getItem(SESSION_SELECTED_ROLE) as 'admin' | 'user' | null;
-    
+
     return {
       ...baseState,
       tourRequested,
@@ -54,7 +57,7 @@ function getInitialRuntimeState(baseState: OnboardingRuntimeState): OnboardingRu
 
 function persistRuntimeState(state: Partial<OnboardingRuntimeState>): void {
   if (typeof window === 'undefined') return;
-  
+
   try {
     if (state.tourRequested !== undefined) {
       sessionStorage.setItem(SESSION_TOUR_REQUESTED, state.tourRequested ? 'true' : 'false');
@@ -76,7 +79,7 @@ function persistRuntimeState(state: Partial<OnboardingRuntimeState>): void {
 
 function clearRuntimeStateSession(): void {
   if (typeof window === 'undefined') return;
-  
+
   try {
     sessionStorage.removeItem(SESSION_TOUR_REQUESTED);
     sessionStorage.removeItem(SESSION_TOUR_TYPE);
@@ -145,7 +148,7 @@ export function useOnboardingOrchestrator(
   const location = useLocation();
   const bypassOnboarding = useBypassOnboarding();
 
-  const [runtimeState, setRuntimeState] = useState<OnboardingRuntimeState>(() => 
+  const [runtimeState, setRuntimeState] = useState<OnboardingRuntimeState>(() =>
     getInitialRuntimeState(defaultState)
   );
   const [isPaused, setIsPaused] = useState(false);
@@ -166,6 +169,7 @@ export function useOnboardingOrchestrator(
       ...prev,
       analyticsEnabled: config?.enableAnalytics === true,
       analyticsNotConfigured: config?.enableAnalytics == null,
+      desktopSlideEnabled: config?.enableDesktopInstallSlide ?? true,
       licenseNotice: {
         totalUsers: serverExperience.totalUsers,
         freeTierLimit: serverExperience.freeTierLimit,
@@ -221,7 +225,7 @@ export function useOnboardingOrchestrator(
   const conditionContext = useMemo<OnboardingConditionContext>(() => ({
     ...serverExperience,
     ...runtimeState,
-    effectiveIsAdmin: serverExperience.effectiveIsAdmin || 
+    effectiveIsAdmin: serverExperience.effectiveIsAdmin ||
       (!serverExperience.loginEnabled && runtimeState.selectedRole === 'admin'),
   }), [serverExperience, runtimeState]);
 
@@ -235,53 +239,44 @@ export function useOnboardingOrchestrator(
 
   // Wait for config AND admin status before calculating initial step
   const adminStatusResolved = !configLoading && (
-    config?.enableLogin === false || 
-    config?.enableLogin === undefined || 
+    config?.enableLogin === false ||
+    config?.enableLogin === undefined ||
     config?.isAdmin !== undefined
   );
-  
+
   useEffect(() => {
-    if (configLoading || !adminStatusResolved || activeFlow.length === 0) return;
+    if (configLoading || !adminStatusResolved) return;
 
-    let firstUnseenIndex = -1;
-    for (let i = 0; i < activeFlow.length; i++) {
-      // Special case: first-login step should always be considered "unseen" if requiresPasswordChange is true
-      const isFirstLoginStep = activeFlow[i].id === 'first-login';
-      const shouldTreatAsUnseen = isFirstLoginStep ? runtimeState.requiresPasswordChange : !hasSeenStep(activeFlow[i].id);
-
-      if (shouldTreatAsUnseen) {
-        firstUnseenIndex = i;
-        break;
-      }
-    }
-
-    // Force reset index when password change is required (overrides initialIndexSet)
-    if (runtimeState.requiresPasswordChange && firstUnseenIndex === 0) {
+    // If there are no steps to show, mark initialized/completed baseline
+    if (activeFlow.length === 0) {
       setCurrentStepIndex(0);
       initialIndexSet.current = true;
-    } else if (firstUnseenIndex === -1) {
+      return;
+    }
+
+    // If onboarding has been completed, don't show it
+    if (isOnboardingCompleted() && !runtimeState.requiresPasswordChange) {
       setCurrentStepIndex(activeFlow.length);
       initialIndexSet.current = true;
-    } else if (!initialIndexSet.current) {
-      setCurrentStepIndex(firstUnseenIndex);
+      return;
+    }
+
+    // Start from the beginning
+    if (!initialIndexSet.current) {
+      setCurrentStepIndex(0);
       initialIndexSet.current = true;
     }
   }, [activeFlow, configLoading, adminStatusResolved, runtimeState.requiresPasswordChange]);
 
   const totalSteps = activeFlow.length;
-  
-  const allStepsAlreadySeen = useMemo(() => {
-    if (activeFlow.length === 0) return false;
-    return activeFlow.every(step => hasSeenStep(step.id));
-  }, [activeFlow]);
-  
-  const isComplete = isInitialized && initialIndexSet.current && 
-    (currentStepIndex >= totalSteps || allStepsAlreadySeen);
-  const currentStep = (currentStepIndex >= 0 && currentStepIndex < totalSteps && !allStepsAlreadySeen) 
-    ? activeFlow[currentStepIndex] 
+
+  const isComplete = isInitialized &&
+    (totalSteps === 0 || currentStepIndex >= totalSteps || isOnboardingCompleted());
+  const currentStep = (currentStepIndex >= 0 && currentStepIndex < totalSteps)
+    ? activeFlow[currentStepIndex]
     : null;
   const isActive = !shouldBlockOnboarding && !isPaused && !isComplete && isInitialized && currentStep !== null;
-  const isLoading = configLoading || !adminStatusResolved || !isInitialized || 
+  const isLoading = configLoading || !adminStatusResolved || !isInitialized ||
     !initialIndexSet.current || (currentStepIndex === -1 && activeFlow.length > 0);
 
   useEffect(() => {
@@ -293,35 +288,33 @@ export function useOnboardingOrchestrator(
   }, [isComplete]);
 
   const next = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
+    const nextIndex = currentStepIndex + 1;
+    if (nextIndex >= totalSteps) {
+      // Reached the end, mark onboarding as completed
+      markOnboardingCompleted();
+    }
+    setCurrentStepIndex(nextIndex);
+  }, [currentStepIndex, totalSteps]);
 
   const prev = useCallback(() => {
     setCurrentStepIndex((prev) => Math.max(prev - 1, 0));
   }, []);
 
   const skip = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
+    // Skip marks the entire onboarding as completed
+    markOnboardingCompleted();
+    setCurrentStepIndex(totalSteps);
+  }, [totalSteps]);
 
   const complete = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
-
-  useEffect(() => {
-    if (!currentStep || isLoading) {
-      return;
+    const nextIndex = currentStepIndex + 1;
+    if (nextIndex >= totalSteps) {
+      // Reached the end, mark onboarding as completed
+      markOnboardingCompleted();
     }
-    // Special case: never auto-complete first-login step if requiresPasswordChange is true
-    const isFirstLoginStep = currentStep.id === 'first-login';
+    setCurrentStepIndex(nextIndex);
+  }, [currentStepIndex, totalSteps]);
 
-    if (!isFirstLoginStep && hasSeenStep(currentStep.id)) {
-      complete();
-    }
-  }, [currentStep, isLoading, complete, runtimeState.requiresPasswordChange]);
 
   const updateRuntimeState = useCallback((updates: Partial<OnboardingRuntimeState>) => {
     persistRuntimeState(updates);
diff --git a/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx b/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx
new file mode 100644
index 0000000000..c04009ca4c
--- /dev/null
+++ b/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { Trans } from 'react-i18next';
+import { Button } from '@mantine/core';
+import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import i18n from '@app/i18n';
+import { SlideConfig } from '@app/types/types';
+import { UNIFIED_CIRCLE_CONFIG } from '@app/components/onboarding/slides/unifiedBackgroundConfig';
+import styles from '@app/components/onboarding/InitialOnboardingModal/InitialOnboardingModal.module.css';
+
+interface AnalyticsChoiceSlideProps {
+  analyticsError?: string | null;
+}
+
+export default function AnalyticsChoiceSlide({ analyticsError }: AnalyticsChoiceSlideProps): SlideConfig {
+  return {
+    key: 'analytics-choice',
+    title: i18n.t('analytics.title', 'Do you want to help make Stirling PDF better?'),
+    body: (
+      <div className={styles.bodyCopyInner}>
+        <Trans
+          i18nKey="analytics.paragraph1"
+          defaults="Stirling PDF has opt-in analytics to help us improve the product. We do not track any personal information or file contents."
+          components={{ strong: <strong /> }}
+        />
+        <br />
+        <Trans
+          i18nKey="analytics.paragraph2"
+          defaults="Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better."
+          components={{ strong: <strong /> }}
+        />
+        <br />
+        <div style={{ textAlign: 'right', marginTop: 0 }}>
+          <Button
+            variant="default"
+            size="sm"
+            onClick={() => window.open('https://docs.stirlingpdf.com/analytics-telemetry/', '_blank')}
+            rightSection={<OpenInNewIcon style={{ fontSize: 16 }} />}
+          >
+            {i18n.t('analytics.learnMore', 'Learn more about our analytics')}
+          </Button>
+        </div>
+        {analyticsError && (
+          <div style={{ color: 'var(--mantine-color-red-6)', marginTop: 12 }}>
+            {analyticsError}
+          </div>
+        )}
+      </div>
+    ),
+    background: {
+      gradientStops: ['#0EA5E9', '#6366F1'],
+      circles: UNIFIED_CIRCLE_CONFIG,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx b/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx
new file mode 100644
index 0000000000..b76a10b7f5
--- /dev/null
+++ b/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Trans } from 'react-i18next';
+import i18n from '@app/i18n';
+import { SlideConfig } from '@app/types/types';
+import { UNIFIED_CIRCLE_CONFIG } from '@app/components/onboarding/slides/unifiedBackgroundConfig';
+import styles from '@app/components/onboarding/InitialOnboardingModal/InitialOnboardingModal.module.css';
+
+export default function TourOverviewSlide(): SlideConfig {
+  return {
+    key: 'tour-overview',
+    title: i18n.t('onboarding.tourOverview.title', 'Tour Overview'),
+    body: (
+      <span className={styles.bodyCopyInner}>
+        <Trans
+          i18nKey="onboarding.tourOverview.body"
+          defaults="Stirling PDF V2 ships with dozens of tools and a refreshed layout. Take a quick tour to see what changed and where to find the features you need."
+          components={{ strong: <strong /> }}
+        />
+      </span>
+    ),
+    background: {
+      gradientStops: ['#2563EB', '#7C3AED'],
+      circles: UNIFIED_CIRCLE_CONFIG,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/onboarding/useBypassOnboarding.ts b/frontend/src/core/components/onboarding/useBypassOnboarding.ts
index 8e7d9b14f0..166c893527 100644
--- a/frontend/src/core/components/onboarding/useBypassOnboarding.ts
+++ b/frontend/src/core/components/onboarding/useBypassOnboarding.ts
@@ -1,7 +1,6 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { ONBOARDING_STEPS } from '@app/components/onboarding/orchestrator/onboardingConfig';
-import { markStepSeen } from '@app/components/onboarding/orchestrator/onboardingStorage';
+import { markOnboardingCompleted } from '@app/components/onboarding/orchestrator/onboardingStorage';
 
 const SESSION_KEY = 'onboarding::bypass-all';
 const PARAM_KEY = 'bypassOnboarding';
@@ -34,13 +33,12 @@ function setStoredBypass(enabled: boolean): void {
 
 /**
  * Detects the `bypassOnboarding` query parameter and stores it in session storage
- * so that onboarding remains disabled while the app is open. Also marks all steps
- * as seen to ensure any dependent UI elements remain hidden.
+ * so that onboarding remains disabled while the app is open. Also marks onboarding
+ * as completed to ensure any dependent UI elements remain hidden.
  */
 export function useBypassOnboarding(): boolean {
   const location = useLocation();
   const [bypassOnboarding, setBypassOnboarding] = useState<boolean>(() => readStoredBypass());
-  const stepsMarkedRef = useRef(false);
 
   const shouldBypassFromSearch = useMemo(() => {
     try {
@@ -57,14 +55,9 @@ export function useBypassOnboarding(): boolean {
     setBypassOnboarding(nextBypass);
     if (nextBypass) {
       setStoredBypass(true);
+      markOnboardingCompleted();
     }
   }, [shouldBypassFromSearch]);
 
-  useEffect(() => {
-    if (!bypassOnboarding || stepsMarkedRef.current) return;
-    stepsMarkedRef.current = true;
-    ONBOARDING_STEPS.forEach((step) => markStepSeen(step.id));
-  }, [bypassOnboarding]);
-
   return bypassOnboarding;
 }
diff --git a/frontend/src/core/components/onboarding/useOnboardingEffects.ts b/frontend/src/core/components/onboarding/useOnboardingEffects.ts
index 54c58eceee..f7eacb1f9c 100644
--- a/frontend/src/core/components/onboarding/useOnboardingEffects.ts
+++ b/frontend/src/core/components/onboarding/useOnboardingEffects.ts
@@ -51,14 +51,14 @@ export function useTourRequest(): {
   clearTourRequest: () => void;
 } {
   const [tourRequested, setTourRequested] = useState(false);
-  const [requestedTourType, setRequestedTourType] = useState<TourType>('tools');
+  const [requestedTourType, setRequestedTourType] = useState<TourType>('whatsnew');
 
   useEffect(() => {
     if (typeof window === 'undefined') return;
 
     const handleTourRequest = (event: Event) => {
       const { detail } = event as CustomEvent<StartTourPayload>;
-      setRequestedTourType(detail?.tourType ?? 'tools');
+      setRequestedTourType(detail?.tourType ?? 'whatsnew');
       setTourRequested(true);
     };
 
diff --git a/frontend/src/core/components/onboarding/userStepsConfig.ts b/frontend/src/core/components/onboarding/userStepsConfig.ts
index 07e3da7607..5a936b3d65 100644
--- a/frontend/src/core/components/onboarding/userStepsConfig.ts
+++ b/frontend/src/core/components/onboarding/userStepsConfig.ts
@@ -8,12 +8,8 @@ export enum TourStep {
   FILES_BUTTON,
   FILE_SOURCES,
   WORKBENCH,
-  VIEW_SWITCHER,
-  VIEWER,
-  PAGE_EDITOR,
   ACTIVE_FILES,
   FILE_CHECKBOX,
-  SELECT_CONTROLS,
   CROP_SETTINGS,
   RUN_BUTTON,
   RESULTS,
@@ -28,10 +24,7 @@ interface UserStepActions {
   backToAllTools: () => void;
   selectCropTool: () => void;
   loadSampleFile: () => void;
-  switchToViewer: () => void;
-  switchToPageEditor: () => void;
   switchToActiveFiles: () => void;
-  selectFirstFile: () => void;
   pinFile: () => void;
   modifyCropSettings: () => void;
   executeTool: () => void;
@@ -50,10 +43,7 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
     backToAllTools,
     selectCropTool,
     loadSampleFile,
-    switchToViewer,
-    switchToPageEditor,
     switchToActiveFiles,
-    selectFirstFile,
     pinFile,
     modifyCropSettings,
     executeTool,
@@ -108,26 +98,6 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
       position: 'center',
       padding: 0,
     },
-    [TourStep.VIEW_SWITCHER]: {
-      selector: '[data-tour="view-switcher"]',
-      content: t('onboarding.viewSwitcher', 'Use these controls to select how you want to view your PDFs.'),
-      position: 'bottom',
-      padding: 0,
-    },
-    [TourStep.VIEWER]: {
-      selector: '[data-tour="workbench"]',
-      content: t('onboarding.viewer', "The <strong>Viewer</strong> lets you read and annotate your PDFs."),
-      position: 'center',
-      padding: 0,
-      action: () => switchToViewer(),
-    },
-    [TourStep.PAGE_EDITOR]: {
-      selector: '[data-tour="workbench"]',
-      content: t('onboarding.pageEditor', "The <strong>Page Editor</strong> allows you to do various operations on the pages within your PDFs, such as reordering, rotating and deleting."),
-      position: 'center',
-      padding: 0,
-      action: () => switchToPageEditor(),
-    },
     [TourStep.ACTIVE_FILES]: {
       selector: '[data-tour="workbench"]',
       content: t('onboarding.activeFiles', "The <strong>Active Files</strong> view shows all of the PDFs you have loaded into the tool, and allows you to select which ones to process."),
@@ -141,14 +111,6 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
       position: 'top',
       padding: 10,
     },
-    [TourStep.SELECT_CONTROLS]: {
-      selector: '[data-tour="right-rail-controls"]',
-      highlightedSelectors: ['[data-tour="right-rail-controls"]', '[data-tour="right-rail-settings"]'],
-      content: t('onboarding.selectControls', "The <strong>Right Rail</strong> contains buttons to quickly select/deselect all of your active PDFs, along with buttons to change the app's theme or language."),
-      position: 'left',
-      padding: 5,
-      action: () => selectFirstFile(),
-    },
     [TourStep.CROP_SETTINGS]: {
       selector: '[data-tour="crop-settings"]',
       content: t('onboarding.cropSettings', "Now that we've selected the file we want crop, we can configure the <strong>Crop</strong> tool to choose the area that we want to crop the PDF to."),
diff --git a/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts b/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts
new file mode 100644
index 0000000000..cb86644c4a
--- /dev/null
+++ b/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts
@@ -0,0 +1,197 @@
+import type { StepType } from '@reactour/tour';
+import type { TFunction } from 'i18next';
+
+async function waitForElement(selector: string, timeoutMs = 7000, intervalMs = 100): Promise<void> {
+  if (typeof document === 'undefined') return;
+  const start = Date.now();
+  // Immediate hit
+  if (document.querySelector(selector)) return;
+
+  return new Promise((resolve) => {
+    const check = () => {
+      if (document.querySelector(selector) || Date.now() - start >= timeoutMs) {
+        resolve();
+        return;
+      }
+      setTimeout(check, intervalMs);
+    };
+    check();
+  });
+}
+
+async function waitForHighlightable(selector: string, timeoutMs = 7000, intervalMs = 500): Promise<void> {
+  if (typeof document === 'undefined') return;
+  const start = Date.now();
+
+  return new Promise((resolve) => {
+    const check = () => {
+      const el = document.querySelector<HTMLElement>(selector);
+      const isVisible = !!el && el.getClientRects().length > 0;
+      if (isVisible || Date.now() - start >= timeoutMs) {
+        // Nudge Reactour to recalc positions in case layout shifted
+        window.dispatchEvent(new Event('resize'));
+        requestAnimationFrame(() => window.dispatchEvent(new Event('resize')));
+        resolve();
+        return;
+      }
+      setTimeout(check, intervalMs);
+    };
+    check();
+  });
+}
+
+export enum WhatsNewTourStep {
+  QUICK_ACCESS,
+  LEFT_PANEL,
+  FILE_UPLOAD,
+  RIGHT_RAIL,
+  TOP_BAR,
+  PAGE_EDITOR_VIEW,
+  ACTIVE_FILES_VIEW,
+  WRAP_UP,
+}
+
+interface WhatsNewStepActions {
+  saveWorkbenchState: () => void;
+  closeFilesModal: () => void;
+  backToAllTools: () => void;
+  openFilesModal: () => void;
+  loadSampleFile: () => Promise<void> | void;
+  switchToViewer: () => void;
+  switchToPageEditor: () => void;
+  switchToActiveFiles: () => void;
+  selectFirstFile: () => void;
+}
+
+interface CreateWhatsNewStepsConfigArgs {
+  t: TFunction;
+  actions: WhatsNewStepActions;
+}
+
+export function createWhatsNewStepsConfig({ t, actions }: CreateWhatsNewStepsConfigArgs): Record<WhatsNewTourStep, StepType> {
+  const {
+    saveWorkbenchState,
+    closeFilesModal,
+    backToAllTools,
+    openFilesModal,
+    loadSampleFile,
+    switchToViewer,
+    switchToPageEditor,
+    switchToActiveFiles,
+    selectFirstFile,
+  } = actions;
+
+  return {
+    [WhatsNewTourStep.QUICK_ACCESS]: {
+      selector: '[data-tour="quick-access-bar"]',
+      content: t(
+        'onboarding.whatsNew.quickAccess',
+        'Start at the <strong>Quick Access</strong> rail to jump between Reader, Automate, your files, and all the tours.'
+      ),
+      position: 'right',
+      padding: 10,
+      action: () => {
+        saveWorkbenchState();
+        closeFilesModal();
+        backToAllTools();
+      },
+    },
+    [WhatsNewTourStep.LEFT_PANEL]: {
+      selector: '[data-tour="tool-panel"]',
+      content: t(
+        'onboarding.whatsNew.leftPanel',
+        'The left <strong>Tools</strong> panel lists everything you can do. Browse categories or search to find a tool quickly.'
+      ),
+      position: 'center',
+      padding: 0,
+    },
+    [WhatsNewTourStep.FILE_UPLOAD]: {
+      selector: '[data-tour="files-button"]',
+      content: t(
+        'onboarding.whatsNew.fileUpload',
+        'Use the <strong>Files</strong> button to upload or pick a recent PDF. We will load a sample so you can see the workspace.'
+      ),
+      position: 'right',
+      padding: 10,
+      action: async () => {
+        openFilesModal();
+        await waitForElement('[data-tour="file-sources"]', 5000, 100);
+      },
+      actionAfter: async () => {
+        await Promise.resolve(loadSampleFile());
+        closeFilesModal();
+        switchToViewer();
+        // wait for file render and top controls to mount
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.RIGHT_RAIL]: {
+      selector: '[data-tour="right-rail-controls"]',
+      highlightedSelectors: ['[data-tour="right-rail-controls"]', '[data-tour="right-rail-settings"]'],
+      content: t(
+        'onboarding.whatsNew.rightRail',
+        'The <strong>Right Rail</strong> holds quick actions to select files, change theme or language, and download results.'
+      ),
+      position: 'left',
+      padding: 10,
+      action: async () => {
+        await waitForElement('[data-tour="right-rail-controls"]', 7000, 100);
+        selectFirstFile();
+      },
+    },
+    [WhatsNewTourStep.TOP_BAR]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.topBar',
+        'The top bar lets you swap between <strong>Viewer</strong>, <strong>Page Editor</strong>, and <strong>Active Files</strong>.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      // Ensure the switcher has mounted before this step renders
+      action: async () => {
+        switchToViewer();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.PAGE_EDITOR_VIEW]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.pageEditorView',
+        'Switch to the Page Editor to reorder, rotate, or delete pages.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      action: async () => {
+        switchToPageEditor();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.ACTIVE_FILES_VIEW]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.activeFilesView',
+        'Use Active Files to see everything you have open and pick what to work on.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      action: async () => {
+        switchToActiveFiles();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.WRAP_UP]: {
+      selector: '[data-tour="help-button"]',
+      content: t(
+        'onboarding.whatsNew.wrapUp',
+        'That is what is new in V2. Open the <strong>Tours</strong> menu anytime to replay this, the Tools tour, or the Admin tour.'
+      ),
+      position: 'right',
+      padding: 10,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx b/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx
deleted file mode 100644
index f72d28452a..0000000000
--- a/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-  Modal,
-  Stack,
-  Button,
-  Text,
-  Title,
-  Anchor,
-  useMantineTheme,
-  useComputedColorScheme,
-} from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import { Z_ANALYTICS_MODAL } from '@app/styles/zIndex';
-import { useAppConfig } from '@app/contexts/AppConfigContext';
-import apiClient from '@app/services/apiClient';
-
-interface AdminAnalyticsChoiceModalProps {
-  opened: boolean;
-  onClose: () => void;
-}
-
-export default function AdminAnalyticsChoiceModal({ opened, onClose }: AdminAnalyticsChoiceModalProps) {
-  const { t } = useTranslation();
-  const { refetch } = useAppConfig();
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const theme = useMantineTheme();
-  const computedColorScheme = useComputedColorScheme('light', { getInitialValueInEffect: true });
-  const isDark = computedColorScheme === 'dark';
-  const privacyHighlightStyles = {
-    color: isDark ? '#FFFFFF' : theme.colors.blue[7],
-    padding: `${theme.spacing.xs} ${theme.spacing.sm}`,
-    borderRadius: theme.radius.md,
-    fontWeight: 700,
-    textAlign: 'center' as const,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    gap: theme.spacing.xs,
-    letterSpacing: 0.3,
-  };
-
-  const handleChoice = async (enableAnalytics: boolean) => {
-    setLoading(true);
-    setError(null);
-
-    try {
-      const formData = new FormData();
-      formData.append('enabled', enableAnalytics.toString());
-
-      await apiClient.post('/api/v1/settings/update-enable-analytics', formData);
-
-      // Refetch config to apply new settings without page reload
-      await refetch();
-
-      // Close the modal after successful save
-      onClose();
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Unknown error occurred');
-      setLoading(false);
-    }
-  };
-
-  const handleEnable = () => {
-    handleChoice(true);
-  };
-
-  const handleDisable = () => {
-    handleChoice(false);
-  };
-
-  return (
-    <Modal
-      opened={opened}
-      onClose={() => {}} // Prevent closing
-      closeOnClickOutside={false}
-      closeOnEscape={false}
-      withCloseButton={false}
-      size="lg"
-      centered
-      zIndex={Z_ANALYTICS_MODAL}
-    >
-      <Stack gap="md">
-        <Title order={2}>{t('analytics.title', 'Do you want make Stirling PDF better?')}</Title>
-
-        <Text size="sm" c="dimmed">
-          {t('analytics.paragraph1', 'Stirling PDF has opt in analytics to help us improve the product.')}
-        </Text>
-        <Text size="sm" style={privacyHighlightStyles}>
-          • {t('analytics.privacyAssurance', 'We do not track any personal information or the contents of your files.')} •
-        </Text>
-
-        <Text size="sm" c="dimmed">
-          {t('analytics.paragraph2', 'Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.')}{' '}
-          <Anchor
-            href="https://docs.stirlingpdf.com/analytics-telemetry"
-            target="_blank"
-            rel="noopener noreferrer"
-            size="sm"
-          >
-            {t('analytics.learnMore', 'Learn more')}
-          </Anchor>
-        </Text>
-
-        {error && (
-          <Text c="red" size="sm">
-            {error}
-          </Text>
-        )}
-
-        <Stack gap="sm">
-          <Button
-            onClick={handleEnable}
-            loading={loading}
-            fullWidth
-            size="md"
-          >
-            {t('analytics.enable', 'Enable analytics')}
-          </Button>
-
-          <Button
-            onClick={handleDisable}
-            loading={loading}
-            fullWidth
-            size="md"
-            variant="subtle"
-            c="gray"
-          >
-            {t('analytics.disable', 'Disable analytics')}
-          </Button>
-        </Stack>
-
-        <Text size="xs" c="dimmed" ta="center">
-          {t('analytics.settings', 'You can change the settings for analytics in the config/settings.yml file')}
-        </Text>
-      </Stack>
-    </Modal>
-  );
-}
diff --git a/frontend/src/core/components/shared/AppConfigModal.tsx b/frontend/src/core/components/shared/AppConfigModal.tsx
index 6dd7491d40..42e6099e36 100644
--- a/frontend/src/core/components/shared/AppConfigModal.tsx
+++ b/frontend/src/core/components/shared/AppConfigModal.tsx
@@ -69,7 +69,7 @@ const AppConfigModalInner: React.FC<AppConfigModalProps> = ({ opened, onClose })
   }), []);
 
   // Get isAdmin and runningEE from app config
-  const isAdmin = true // config?.isAdmin ?? false;
+  const isAdmin = config?.isAdmin ?? false;
   const runningEE = config?.runningEE ?? false;
   const loginEnabled = config?.enableLogin ?? false;
 
diff --git a/frontend/src/core/components/shared/Footer.tsx b/frontend/src/core/components/shared/Footer.tsx
index 172861d1bb..6a03a2f542 100644
--- a/frontend/src/core/components/shared/Footer.tsx
+++ b/frontend/src/core/components/shared/Footer.tsx
@@ -95,6 +95,22 @@ export default function Footer({
           >
             {t('legal.terms', 'Terms and Conditions')}
           </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://discord.gg/Cn8pWhQRxZ"
+          >
+            {t('footer.discord', 'Discord')}
+          </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://github.com/Stirling-Tools/Stirling-PDF"
+          >
+            {t('footer.issues', 'GitHub')}
+          </a>
           <a
             className="footer-link px-3"
             target="_blank"
diff --git a/frontend/src/core/components/shared/LanguageSelector.tsx b/frontend/src/core/components/shared/LanguageSelector.tsx
index 7eb35d1f73..4129e32094 100644
--- a/frontend/src/core/components/shared/LanguageSelector.tsx
+++ b/frontend/src/core/components/shared/LanguageSelector.tsx
@@ -173,7 +173,7 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({
     .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB))
     .map(([code, name]) => ({
       value: code,
-      label: `${name} (${code})`,
+      label: name,
     }));
 
   // Hide the language selector if there's only one language option
diff --git a/frontend/src/core/components/shared/QuickAccessBar.tsx b/frontend/src/core/components/shared/QuickAccessBar.tsx
index e81afcda9a..3aba740a8c 100644
--- a/frontend/src/core/components/shared/QuickAccessBar.tsx
+++ b/frontend/src/core/components/shared/QuickAccessBar.tsx
@@ -11,6 +11,7 @@ import { useSidebarNavigation } from '@app/hooks/useSidebarNavigation';
 import { handleUnlessSpecialClick } from '@app/utils/clickHandlers';
 import { ButtonConfig } from '@app/types/sidebar';
 import '@app/components/shared/quickAccessBar/QuickAccessBar.css';
+import { Tooltip } from '@app/components/shared/Tooltip';
 import AllToolsNavButton from '@app/components/shared/AllToolsNavButton';
 import ActiveToolButton from "@app/components/shared/quickAccessBar/ActiveToolButton";
 import AppConfigModal from '@app/components/shared/AppConfigModal';
@@ -18,6 +19,7 @@ import { useAppConfig } from '@app/contexts/AppConfigContext';
 import { useLicenseAlert } from "@app/hooks/useLicenseAlert";
 import { requestStartTour } from '@app/constants/events';
 import QuickAccessButton from '@app/components/shared/quickAccessBar/QuickAccessButton';
+import { useToursTooltip } from '@app/components/shared/quickAccessBar/useToursTooltip';
 
 import {
   isNavButtonActive,
@@ -41,6 +43,14 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
   const [configModalOpen, setConfigModalOpen] = useState(false);
   const [activeButton, setActiveButton] = useState<string>('tools');
   const scrollableRef = useRef<HTMLDivElement>(null);
+  const {
+    tooltipOpen,
+    manualCloseOnly,
+    showCloseButton,
+    toursMenuOpen,
+    setToursMenuOpen,
+    handleTooltipOpenChange,
+  } = useToursTooltip();
 
   const isRTL = typeof document !== 'undefined' && document.documentElement.dir === 'rtl';
 
@@ -166,8 +176,8 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
   const bottomButtons: ButtonConfig[] = [
     {
       id: 'help',
-      name: t("quickAccess.help", "Help"),
-      icon: <LocalIcon icon="help-rounded" width="1.25rem" height="1.25rem" />,
+      name: t("quickAccess.tours", "Tours"),
+      icon: <LocalIcon icon="explore-rounded" width="1.25rem" height="1.25rem" />,
       isRound: true,
       size: 'md',
       type: 'action',
@@ -192,6 +202,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
     <div
       ref={ref}
       data-sidebar="quick-access"
+      data-tour="quick-access-bar"
       className={`h-screen flex flex-col w-16 quick-access-bar-main ${isRainbowMode ? 'rainbow-mode' : ''}`}
     >
       {/* Fixed header outside scrollable area */}
@@ -247,58 +258,83 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
               // Handle help button with menu or direct action
               if (buttonConfig.id === 'help') {
                 const isAdmin = config?.isAdmin === true;
+                const toursTooltipContent = isAdmin
+                  ? t('quickAccess.toursTooltip.admin', 'Watch walkthroughs here: Tools tour, New V2 layout tour, and the Admin tour.')
+                  : t('quickAccess.toursTooltip.user', 'Watch walkthroughs here: Tools tour and the New V2 layout tour.');
+                const tourItems = [
+                  {
+                    key: 'whatsnew',
+                    icon: <LocalIcon icon="auto-awesome-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.whatsNewTour", "See what's new in V2"),
+                    description: t("quickAccess.helpMenu.whatsNewTourDesc", "Tour the updated layout"),
+                    onClick: () => requestStartTour('whatsnew'),
+                  },
+                  {
+                    key: 'tools',
+                    icon: <LocalIcon icon="view-carousel-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.toolsTour", "Tools Tour"),
+                    description: t("quickAccess.helpMenu.toolsTourDesc", "Learn what the tools can do"),
+                    onClick: () => requestStartTour('tools'),
+                  },
+                  ...(isAdmin ? [{
+                    key: 'admin',
+                    icon: <LocalIcon icon="admin-panel-settings-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.adminTour", "Admin Tour"),
+                    description: t("quickAccess.helpMenu.adminTourDesc", "Explore admin settings & features"),
+                    onClick: () => requestStartTour('admin'),
+                  }] : []),
+                ];
 
-                // If not admin, just show button that starts tools tour directly
-                if (!isAdmin) {
-                  return (
-                    <div
-                      key={buttonConfig.id}
-                      data-tour="help-button"
-                      onClick={() => requestStartTour('tools')}
+                const helpButtonNode = (
+                  <div data-tour="help-button">
+                    <Menu
+                      position={isRTL ? 'left' : 'right'}
+                      offset={10}
+                      zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}
+                      opened={toursMenuOpen}
+                      onChange={setToursMenuOpen}
                     >
-                      {renderNavButton(buttonConfig, index)}
-                    </div>
-                  );
-                }
-
-                // If admin, show menu with both options
-                return (
-                  <div key={buttonConfig.id} data-tour="help-button">
-                    <Menu position={isRTL ? 'left' : 'right'} offset={10} zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}>
                       <Menu.Target>
                         <div>{renderNavButton(buttonConfig, index)}</div>
                       </Menu.Target>
                       <Menu.Dropdown>
-                        <Menu.Item
-                          leftSection={<LocalIcon icon="view-carousel-rounded" width="1.25rem" height="1.25rem" />}
-                          onClick={() => requestStartTour('tools')}
-                        >
-                          <div>
-                            <div style={{ fontWeight: 500 }}>
-                              {t("quickAccess.helpMenu.toolsTour", "Tools Tour")}
+                        {tourItems.map((item) => (
+                          <Menu.Item
+                            key={item.key}
+                            leftSection={item.icon}
+                            onClick={item.onClick}
+                          >
+                            <div>
+                              <div style={{ fontWeight: 500 }}>
+                                {item.title}
+                              </div>
+                              <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
+                                {item.description}
+                              </div>
                             </div>
-                            <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
-                              {t("quickAccess.helpMenu.toolsTourDesc", "Learn what the tools can do")}
-                            </div>
-                          </div>
-                        </Menu.Item>
-                        <Menu.Item
-                          leftSection={<LocalIcon icon="admin-panel-settings-rounded" width="1.25rem" height="1.25rem" />}
-                          onClick={() => requestStartTour('admin')}
-                        >
-                          <div>
-                            <div style={{ fontWeight: 500 }}>
-                              {t("quickAccess.helpMenu.adminTour", "Admin Tour")}
-                            </div>
-                            <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
-                              {t("quickAccess.helpMenu.adminTourDesc", "Explore admin settings & features")}
-                            </div>
-                          </div>
-                        </Menu.Item>
+                          </Menu.Item>
+                        ))}
                       </Menu.Dropdown>
                     </Menu>
                   </div>
                 );
+
+                return (
+                  <Tooltip
+                    position="right"
+                    arrow
+                    offset={8}
+                    open={tooltipOpen}
+                    manualCloseOnly={manualCloseOnly}
+                    showCloseButton={showCloseButton}
+                    closeOnOutside={false}
+                    openOnFocus={false}
+                    content={toursTooltipContent}
+                    onOpenChange={handleTooltipOpenChange}
+                  >
+                    {helpButtonNode}
+                  </Tooltip>
+                );
               }
 
               const buttonNode = renderNavButton(buttonConfig, index);
diff --git a/frontend/src/core/components/shared/Tooltip.tsx b/frontend/src/core/components/shared/Tooltip.tsx
index db6bce849a..10fefec023 100644
--- a/frontend/src/core/components/shared/Tooltip.tsx
+++ b/frontend/src/core/components/shared/Tooltip.tsx
@@ -33,6 +33,10 @@ export interface TooltipProps {
   disabled?: boolean;
   /** If false, tooltip will not open on focus (hover only) */
   openOnFocus?: boolean;
+  /** If true, tooltip stays open until explicitly closed (ignores hover/blur/esc/outside) */
+  manualCloseOnly?: boolean;
+  /** Show a close button even when not pinned */
+  showCloseButton?: boolean;
 }
 
 export const Tooltip: React.FC<TooltipProps> = ({
@@ -55,6 +59,8 @@ export const Tooltip: React.FC<TooltipProps> = ({
   closeOnOutside = true,
   disabled = false,
   openOnFocus = true,
+  manualCloseOnly = false,
+  showCloseButton = false,
 }) => {
   const [internalOpen, setInternalOpen] = useState(false);
   const [isPinned, setIsPinned] = useState(false);
@@ -81,6 +87,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
 
   const isControlled = controlledOpen !== undefined;
   const open = (isControlled ? !!controlledOpen : internalOpen) && !disabled;
+  const allowAutoClose = !manualCloseOnly;
 
   const resolvedPosition: NonNullable<TooltipProps['position']> = useMemo(() => {
     const htmlDir = typeof document !== 'undefined' ? document.documentElement.dir : 'ltr';
@@ -132,11 +139,11 @@ export const Tooltip: React.FC<TooltipProps> = ({
       }
 
       // Not pinned and configured to close on outside
-      if (closeOnOutside && !insideTooltip && !insideTrigger) {
+      if (allowAutoClose && closeOnOutside && !insideTooltip && !insideTrigger) {
         setOpen(false);
       }
     },
-    [isPinned, closeOnOutside, setOpen]
+    [isPinned, closeOnOutside, setOpen, allowAutoClose]
   );
 
   useEffect(() => {
@@ -200,10 +207,10 @@ export const Tooltip: React.FC<TooltipProps> = ({
       }
 
       clearTimers();
-      if (!isPinned) setOpen(false);
+      if (allowAutoClose && !isPinned) setOpen(false);
       (children.props as any)?.onPointerLeave?.(e);
     },
-    [clearTimers, isPinned, setOpen, children.props]
+    [clearTimers, isPinned, setOpen, children.props, allowAutoClose]
   );
 
   const handleMouseDown = useCallback(
@@ -256,15 +263,17 @@ export const Tooltip: React.FC<TooltipProps> = ({
         (children.props as any)?.onBlur?.(e);
         return;
       }
-      if (!isPinned) setOpen(false);
+      clearTimers();
+      if (allowAutoClose && !isPinned) setOpen(false);
       (children.props as any)?.onBlur?.(e);
     },
-    [isPinned, setOpen, children.props]
+    [isPinned, setOpen, children.props, allowAutoClose, clearTimers]
   );
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
+    if (manualCloseOnly) return;
     if (e.key === 'Escape') setOpen(false);
-  }, [setOpen]);
+  }, [setOpen, manualCloseOnly]);
 
   // Keep open while pointer is over the tooltip; close when leaving it (if not pinned)
   const handleTooltipPointerEnter = useCallback(() => {
@@ -275,9 +284,9 @@ export const Tooltip: React.FC<TooltipProps> = ({
     (e: React.PointerEvent) => {
       const related = e.relatedTarget as Node | null;
       if (isDomNode(related) && triggerRef.current && triggerRef.current.contains(related)) return;
-      if (!isPinned) setOpen(false);
+      if (allowAutoClose && !isPinned) setOpen(false);
     },
-    [isPinned, setOpen]
+    [isPinned, setOpen, allowAutoClose]
   );
 
   // Enhance child with handlers and ref
@@ -300,6 +309,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
   });
 
   const shouldShowTooltip = open;
+  const shouldShowCloseButton = showCloseButton || isPinned;
 
   const tooltipElement = shouldShowTooltip ? (
     <div
@@ -324,7 +334,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
       className={`${styles['tooltip-container']} ${isPinned ? styles.pinned : ''}`}
       onClick={pinOnClick ? (e) => { e.stopPropagation(); setIsPinned(true); } : undefined}
     >
-      {isPinned && (
+      {shouldShowCloseButton && (
         <button
           className={styles['tooltip-pin-button']}
           onClick={(e) => {
@@ -362,7 +372,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
           <span className={styles['tooltip-title']}>{header.title}</span>
         </div>
       )}
-      <TooltipContent content={content} tips={tips} />
+      <TooltipContent content={content} tips={tips} extraRightPadding={shouldShowCloseButton ? 48 : 0} />
     </div>
   ) : null;
 
diff --git a/frontend/src/core/components/shared/config/types.ts b/frontend/src/core/components/shared/config/types.ts
index d4bd9a83c8..740e6130e7 100644
--- a/frontend/src/core/components/shared/config/types.ts
+++ b/frontend/src/core/components/shared/config/types.ts
@@ -3,6 +3,7 @@ export const VALID_NAV_KEYS = [
   'preferences',
   'notifications',
   'connections',
+  'account',
   'general',
   'people',
   'teams',
diff --git a/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts b/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts
new file mode 100644
index 0000000000..bed983fdd7
--- /dev/null
+++ b/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts
@@ -0,0 +1,81 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { TOUR_STATE_EVENT, type TourStatePayload } from '@app/constants/events';
+import { isOnboardingCompleted, hasShownToursTooltip, markToursTooltipShown } from '@app/components/onboarding/orchestrator/onboardingStorage';
+
+export interface ToursTooltipState {
+  tooltipOpen: boolean | undefined;
+  manualCloseOnly: boolean;
+  showCloseButton: boolean;
+  toursMenuOpen: boolean;
+  setToursMenuOpen: (open: boolean) => void;
+  handleTooltipOpenChange: (next: boolean) => void;
+}
+
+/**
+ * Encapsulates all the logic for the tours tooltip:
+ * - Shows automatically after onboarding/tour completes (once per user)
+ * - Hides while the tours menu is open
+ * - After dismissal, reverts to hover-only tooltip
+ */
+export function useToursTooltip(): ToursTooltipState {
+  const [showToursTooltip, setShowToursTooltip] = useState(false);
+  const [toursMenuOpen, setToursMenuOpen] = useState(false);
+  const tourWasOpenRef = useRef(false);
+
+  // Auto-show when a tour ends (fires once per user)
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+
+    const handleTourStateChange = (event: Event) => {
+      const { detail } = event as CustomEvent<TourStatePayload>;
+      const wasOpen = tourWasOpenRef.current;
+      tourWasOpenRef.current = detail.isOpen;
+
+      if (wasOpen && !detail.isOpen && !hasShownToursTooltip()) {
+        setShowToursTooltip(true);
+      }
+    };
+
+    window.addEventListener(TOUR_STATE_EVENT, handleTourStateChange);
+    return () => window.removeEventListener(TOUR_STATE_EVENT, handleTourStateChange);
+  }, []);
+
+  // Show once after onboarding is complete
+  useEffect(() => {
+    if (isOnboardingCompleted() && !hasShownToursTooltip()) {
+      setShowToursTooltip(true);
+    }
+  }, []);
+
+  const handleDismissToursTooltip = useCallback(() => {
+    markToursTooltipShown();
+    setShowToursTooltip(false);
+  }, []);
+
+  const hasBeenDismissed = hasShownToursTooltip();
+
+  const handleTooltipOpenChange = useCallback(
+    (next: boolean) => {
+      if (!next) {
+        if (!hasBeenDismissed) {
+          handleDismissToursTooltip();
+        }
+      } else if (!hasBeenDismissed && !toursMenuOpen) {
+        setShowToursTooltip(true);
+      }
+    },
+    [hasBeenDismissed, toursMenuOpen, handleDismissToursTooltip]
+  );
+
+  const tooltipOpen = toursMenuOpen ? false : hasBeenDismissed ? undefined : showToursTooltip;
+
+  return {
+    tooltipOpen,
+    manualCloseOnly: !hasBeenDismissed,
+    showCloseButton: !hasBeenDismissed,
+    toursMenuOpen,
+    setToursMenuOpen,
+    handleTooltipOpenChange,
+  };
+}
+
diff --git a/frontend/src/core/components/shared/tooltip/Tooltip.module.css b/frontend/src/core/components/shared/tooltip/Tooltip.module.css
index 62c4bf6963..9d3bdb80a6 100644
--- a/frontend/src/core/components/shared/tooltip/Tooltip.module.css
+++ b/frontend/src/core/components/shared/tooltip/Tooltip.module.css
@@ -39,7 +39,7 @@
   background: var(--bg-raised);
   padding: 0.25rem;
   border-radius: 0.25rem;
-  border: 0.0625rem solid var(--primary-color, #3b82f6);
+  border: 0.0625rem solid var(--border-default);
   cursor: pointer;
   transition: background-color 0.2s ease, border-color 0.2s ease;
   z-index: 1;
@@ -60,6 +60,13 @@
   border-color: #ef4444 !important;
 }
 
+.tooltip-pin-button:focus,
+.tooltip-pin-button:focus-visible {
+  outline: none;
+  border-color: var(--border-default) !important;
+  background-color: var(--bg-raised) !important;
+}
+
 /* Tooltip Header */
 .tooltip-header {
   display: flex;
@@ -91,7 +98,7 @@
 
 /* Tooltip Body */
 .tooltip-body {
-  padding: 1rem !important;
+  padding: 1rem;
   color: var(--text-primary) !important;
   font-size: 0.875rem !important;
   line-height: 1.6 !important;
diff --git a/frontend/src/core/components/shared/tooltip/TooltipContent.tsx b/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
index 8bd85966a3..42ee19af36 100644
--- a/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
+++ b/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
@@ -5,18 +5,20 @@ import { TooltipTip } from '@app/types/tips';
 interface TooltipContentProps {
   content?: React.ReactNode;
   tips?: TooltipTip[];
+  extraRightPadding?: number;
 }
 
 export const TooltipContent: React.FC<TooltipContentProps> = ({
   content,
   tips,
+  extraRightPadding = 0,
 }) => {
   return (
     <div
       className={`${styles['tooltip-body']}`}
       style={{
         color: 'var(--text-primary)',
-        padding: '16px',
+        padding: `16px ${16 + extraRightPadding}px 16px 16px`,
         fontSize: '14px',
         lineHeight: '1.6'
       }}
diff --git a/frontend/src/core/components/tools/compress/CompressSettings.tsx b/frontend/src/core/components/tools/compress/CompressSettings.tsx
index 398e0b7b47..f444da2631 100644
--- a/frontend/src/core/components/tools/compress/CompressSettings.tsx
+++ b/frontend/src/core/components/tools/compress/CompressSettings.tsx
@@ -1,8 +1,9 @@
-import { useState } from "react";
-import { Stack, Text, NumberInput, Select, Divider, Checkbox } from "@mantine/core";
+import { useState, useEffect } from "react";
+import { Stack, Text, NumberInput, Select, Divider, Checkbox, Slider, SegmentedControl } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { CompressParameters } from "@app/hooks/tools/compress/useCompressParameters";
 import ButtonSelector from "@app/components/shared/ButtonSelector";
+import apiClient from "@app/services/apiClient";
 
 interface CompressSettingsProps {
   parameters: CompressParameters;
@@ -13,6 +14,20 @@ interface CompressSettingsProps {
 const CompressSettings = ({ parameters, onParameterChange, disabled = false }: CompressSettingsProps) => {
   const { t } = useTranslation();
   const [isSliding, setIsSliding] = useState(false);
+  const [imageMagickAvailable, setImageMagickAvailable] = useState<boolean | null>(null);
+
+  useEffect(() => {
+    const checkImageMagick = async () => {
+      try {
+        const response = await apiClient.get<boolean>('/api/v1/config/group-enabled?group=ImageMagick');
+        setImageMagickAvailable(response.data);
+      } catch (error) {
+        console.error('Failed to check ImageMagick availability:', error);
+        setImageMagickAvailable(true); // Optimistic fallback
+      }
+    };
+    checkImageMagick();
+  }, []);
 
   return (
     <Stack gap="md">
@@ -129,6 +144,62 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
           disabled={disabled}
           label={t("compress.grayscale.label", "Apply Grayscale for compression")}
         />
+        <Checkbox
+          checked={parameters.lineArt}
+          onChange={(event) => onParameterChange('lineArt', event.currentTarget.checked)}
+          disabled={disabled || imageMagickAvailable === false}
+          label={t("compress.lineArt.label", "Convert images to line art (bilevel)")}
+          description={
+            imageMagickAvailable === false
+              ? t("compress.lineArt.unavailable", "ImageMagick is not installed or enabled on this server")
+              : t("compress.lineArt.description", "Uses ImageMagick to reduce pages to high-contrast black and white for maximum size reduction.")
+          }
+        />
+        {parameters.lineArt && (
+          <Stack gap="xs" style={{ opacity: (disabled || imageMagickAvailable === false) ? 0.6 : 1 }}>
+            <Text size="sm" fw={600}>{t('compress.lineArt.detailLevel', 'Detail level')}</Text>
+            <Slider
+              min={1}
+              max={5}
+              step={1}
+              value={(() => {
+                // Map threshold to slider position
+                const thresholdMap = [20, 35, 50, 65, 80];
+                const closest = thresholdMap.reduce((prev, curr, idx) =>
+                  Math.abs(curr - parameters.lineArtThreshold) < Math.abs(thresholdMap[prev] - parameters.lineArtThreshold)
+                    ? idx : prev, 0);
+                return closest + 1;
+              })()}
+              onChange={(value) => {
+                // Map slider position to threshold: 1=20%, 2=35%, 3=50%, 4=65%, 5=80%
+                const thresholdMap = [20, 35, 50, 65, 80];
+                onParameterChange('lineArtThreshold', thresholdMap[value - 1]);
+              }}
+              disabled={disabled || imageMagickAvailable === false}
+              label={null}
+              marks={[
+                { value: 1 },
+                { value: 2 },
+                { value: 3 },
+                { value: 4 },
+                { value: 5 },
+              ]}
+            />
+
+            <Text size="sm" fw={600}>{t('compress.lineArt.edgeEmphasis', 'Edge emphasis')}</Text>
+            <SegmentedControl
+              fullWidth
+              disabled={disabled || imageMagickAvailable === false}
+              data={[
+                { value: '1', label: t('compress.lineArt.edgeLow', 'Gentle') },
+                { value: '2', label: t('compress.lineArt.edgeMedium', 'Balanced') },
+                { value: '3', label: t('compress.lineArt.edgeHigh', 'Strong') },
+              ]}
+              value={parameters.lineArtEdgeLevel.toString()}
+              onChange={(value) => onParameterChange('lineArtEdgeLevel', parseInt(value) as 1 | 2 | 3)}
+            />
+          </Stack>
+        )}
       </Stack>
     </Stack>
   );
diff --git a/frontend/src/core/components/tools/sign/SignSettings.tsx b/frontend/src/core/components/tools/sign/SignSettings.tsx
index 233b87373c..12de2cadda 100644
--- a/frontend/src/core/components/tools/sign/SignSettings.tsx
+++ b/frontend/src/core/components/tools/sign/SignSettings.tsx
@@ -853,6 +853,12 @@ const SignSettings = ({
           textColor={parameters.textColor || '#000000'}
           onTextColorChange={(color) => onParameterChange('textColor', color)}
           disabled={disabled}
+          label={translate('text.name', 'Text')}
+          placeholder={translate('text.placeholder', 'Enter text')}
+          fontLabel={translate('text.fontLabel', 'Font')}
+          fontSizeLabel={translate('text.fontSizeLabel', 'Font size')}
+          fontSizePlaceholder={translate('text.fontSizePlaceholder', 'Type or select font size (8-200)')}
+          colorLabel={translate('text.colorLabel', 'Text colour')}
           onAnyChange={() => {
             setPlacementManuallyPaused(false);
             lastAppliedPlacementKey.current = null;
diff --git a/frontend/src/core/components/tooltips/useCompressTips.ts b/frontend/src/core/components/tooltips/useCompressTips.ts
index c49ceaca21..3b5299e08e 100644
--- a/frontend/src/core/components/tooltips/useCompressTips.ts
+++ b/frontend/src/core/components/tooltips/useCompressTips.ts
@@ -24,6 +24,13 @@ export const useCompressTips = (): TooltipContent => {
       {
         title: t("compress.tooltip.grayscale.title", "Grayscale"),
         description: t("compress.tooltip.grayscale.text", "Select this option to convert all images to black and white, which can significantly reduce file size especially for scanned PDFs or image-heavy documents.")
+      },
+      {
+        title: t("compress.tooltip.lineArt.title", "Line Art"),
+        description: t(
+          "compress.tooltip.lineArt.text",
+          "Convert pages to high-contrast black and white using ImageMagick. Use line thickness to control the threshold percentage and detection strength to choose how aggressively edges are outlined."
+        )
       }
     ]
   };
diff --git a/frontend/src/core/components/viewer/CustomSearchLayer.tsx b/frontend/src/core/components/viewer/CustomSearchLayer.tsx
index 05b50ecab0..29f3b528c7 100644
--- a/frontend/src/core/components/viewer/CustomSearchLayer.tsx
+++ b/frontend/src/core/components/viewer/CustomSearchLayer.tsx
@@ -44,8 +44,10 @@ export function CustomSearchLayer({
     }
 
     const unsubscribe = searchProvides.onSearchResultStateChange?.((state: SearchResultState) => {
+      if (!state) return;
+
       // Auto-scroll to active search result
-      if (state?.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
+      if (state.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
         const activeResult = state.results[state.activeResultIndex];
         if (activeResult) {
           const pageNumber = activeResult.pageIndex + 1; // Convert to 1-based page number
diff --git a/frontend/src/core/components/viewer/EmbedPdfViewer.tsx b/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
index 9ca8bac0ae..94bff5a352 100644
--- a/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
+++ b/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
@@ -43,6 +43,8 @@ const EmbedPdfViewerContent = ({
     isThumbnailSidebarVisible,
     toggleThumbnailSidebar,
     isBookmarkSidebarVisible,
+    isSearchInterfaceVisible,
+    searchInterfaceActions,
     zoomActions,
     panActions: _panActions,
     rotationActions: _rotationActions,
@@ -184,7 +186,7 @@ const EmbedPdfViewerContent = ({
     onZoomOut: zoomActions.zoomOut,
   });
 
-  // Handle keyboard zoom shortcuts
+  // Handle keyboard shortcuts (zoom and search)
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (!isViewerHovered) return;
@@ -199,6 +201,16 @@ const EmbedPdfViewerContent = ({
           // Ctrl+- for zoom out
           event.preventDefault();
           zoomActions.zoomOut();
+        } else if (event.key === 'f' || event.key === 'F') {
+          // Ctrl+F for search
+          event.preventDefault();
+          if (isSearchInterfaceVisible) {
+            // If already open, trigger refocus event
+            window.dispatchEvent(new CustomEvent('refocus-search-input'));
+          } else {
+            // Open search interface
+            searchInterfaceActions.open();
+          }
         }
       }
     };
@@ -207,7 +219,7 @@ const EmbedPdfViewerContent = ({
     return () => {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [isViewerHovered]);
+  }, [isViewerHovered, isSearchInterfaceVisible, zoomActions, searchInterfaceActions]);
 
   // Register checker for unsaved changes (annotations only for now)
   useEffect(() => {
diff --git a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
index 3e5fa5f1c6..0b79604fd6 100644
--- a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
+++ b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
@@ -46,6 +46,7 @@ import { PrintAPIBridge } from '@app/components/viewer/PrintAPIBridge';
 import { isPdfFile } from '@app/utils/fileUtils';
 import { useTranslation } from 'react-i18next';
 import { LinkLayer } from '@app/components/viewer/LinkLayer';
+import { absoluteWithBasePath } from '@app/constants/app';
 
 interface LocalEmbedPDFProps {
   file?: File | Blob;
@@ -167,8 +168,10 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
     ];
   }, [pdfUrl]);
 
-  // Initialize the engine with the React hook
-  const { engine, isLoading, error } = usePdfiumEngine();
+  // Initialize the engine with the React hook - use local WASM for offline support
+  const { engine, isLoading, error } = usePdfiumEngine({
+    wasmUrl: absoluteWithBasePath('/pdfium/pdfium.wasm'),
+  });
 
 
   // Early return if no file or URL provided
diff --git a/frontend/src/core/components/viewer/SearchAPIBridge.tsx b/frontend/src/core/components/viewer/SearchAPIBridge.tsx
index 4b0eadd237..4003e1d0b7 100644
--- a/frontend/src/core/components/viewer/SearchAPIBridge.tsx
+++ b/frontend/src/core/components/viewer/SearchAPIBridge.tsx
@@ -28,11 +28,13 @@ export function SearchAPIBridge() {
     if (!search) return;
 
     const unsubscribe = search.onSearchResultStateChange?.((state: any) => {
+      if (!state) return;
+
       const newState = {
-        results: state?.results || null,
-        activeIndex: (state?.activeResultIndex || 0) + 1 // Convert to 1-based index
+        results: state.results || null,
+        activeIndex: (state.activeResultIndex || 0) + 1 // Convert to 1-based index
       };
-      
+
       setLocalState(prevState => {
         // Only update if state actually changed
         if (prevState.results !== newState.results || prevState.activeIndex !== newState.activeIndex) {
@@ -52,16 +54,42 @@ export function SearchAPIBridge() {
         state: localState,
         api: {
           search: async (query: string) => {
-            search.startSearch();
-            return search.searchAllPages(query);
+            if (search?.startSearch && search?.searchAllPages) {
+              search.startSearch();
+              return search.searchAllPages(query);
+            }
           },
           clear: () => {
-            search.stopSearch();
+            try {
+              if (search?.stopSearch) {
+                search.stopSearch();
+              }
+            } catch (error) {
+              console.warn('Error stopping search:', error);
+            }
             setLocalState({ results: null, activeIndex: 0 });
           },
-          next: () => search.nextResult(),
-          previous: () => search.previousResult(),
-          goToResult: (index: number) => search.goToResult(index),
+          next: () => {
+            try {
+              search?.nextResult?.();
+            } catch (error) {
+              console.warn('Error navigating to next result:', error);
+            }
+          },
+          previous: () => {
+            try {
+              search?.previousResult?.();
+            } catch (error) {
+              console.warn('Error navigating to previous result:', error);
+            }
+          },
+          goToResult: (index: number) => {
+            try {
+              search?.goToResult?.(index);
+            } catch (error) {
+              console.warn('Error going to result:', error);
+            }
+          },
         }
       });
     }
diff --git a/frontend/src/core/components/viewer/SearchInterface.tsx b/frontend/src/core/components/viewer/SearchInterface.tsx
index da6f6472aa..eefac81544 100644
--- a/frontend/src/core/components/viewer/SearchInterface.tsx
+++ b/frontend/src/core/components/viewer/SearchInterface.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Box, TextInput, ActionIcon, Text, Group } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { LocalIcon } from '@app/components/shared/LocalIcon';
@@ -12,7 +12,9 @@ interface SearchInterfaceProps {
 export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   const { t } = useTranslation();
   const viewerContext = React.useContext(ViewerContext);
-  
+  const inputRef = useRef<HTMLInputElement>(null);
+  const searchTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
   const searchState = viewerContext?.getSearchState();
   const searchResults = searchState?.results;
   const searchActiveIndex = searchState?.activeIndex;
@@ -26,6 +28,61 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   } | null>(null);
   const [isSearching, setIsSearching] = useState(false);
 
+  // Auto-focus search input when visible
+  useEffect(() => {
+    if (visible) {
+      inputRef.current?.focus();
+    }
+  }, [visible]);
+
+  // Listen for refocus event (when Ctrl+F pressed while already open)
+  useEffect(() => {
+    const handleRefocus = () => {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    };
+
+    window.addEventListener('refocus-search-input', handleRefocus);
+    return () => {
+      window.removeEventListener('refocus-search-input', handleRefocus);
+    };
+  }, []);
+
+  // Auto-search as user types (debounced)
+  useEffect(() => {
+    // Clear existing timeout
+    if (searchTimeoutRef.current) {
+      clearTimeout(searchTimeoutRef.current);
+    }
+
+    // If query is empty, clear search immediately
+    if (!searchQuery.trim()) {
+      searchActions?.clear();
+      setResultInfo(null);
+      return;
+    }
+
+    // Debounce search by 300ms
+    searchTimeoutRef.current = setTimeout(async () => {
+      if (searchQuery.trim() && searchActions) {
+        setIsSearching(true);
+        try {
+          await searchActions.search(searchQuery.trim());
+        } catch (error) {
+          console.error('Search failed:', error);
+        } finally {
+          setIsSearching(false);
+        }
+      }
+    }, 300);
+
+    return () => {
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
+      }
+    };
+  }, [searchQuery, searchActions]);
+
   // Monitor search state changes
   useEffect(() => {
     if (!visible) return;
@@ -59,30 +116,21 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     return () => clearInterval(interval);
   }, [visible, searchResults, searchActiveIndex, searchQuery]);
 
-  const handleSearch = async (query: string) => {
-    if (!query.trim()) {
-      // If query is empty, clear the search
-      handleClearSearch();
-      return;
-    }
-
-    if (query.trim() && searchActions) {
-      setIsSearching(true);
-      try {
-        await searchActions.search(query.trim());
-      } catch (error) {
-        console.error('Search failed:', error);
-      } finally {
-        setIsSearching(false);
-      }
-    }
-  };
-
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
     if (event.key === 'Enter') {
-      handleSearch(searchQuery);
+      // Navigate to next result on Enter
+      event.preventDefault();
+      handleNext();
     } else if (event.key === 'Escape') {
       onClose();
+    } else if (event.key === 'ArrowDown') {
+      // Navigate to next result
+      event.preventDefault();
+      handleNext();
+    } else if (event.key === 'ArrowUp') {
+      // Navigate to previous result
+      event.preventDefault();
+      handlePrevious();
     }
   };
 
@@ -103,17 +151,17 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   // No longer need to sync with external API on mount - removed
 
   const handleJumpToResult = (index: number) => {
-    // Use context actions instead of window API - functionality simplified for now
     if (resultInfo && index >= 1 && index <= resultInfo.totalResults) {
-      // Note: goToResult functionality would need to be implemented in SearchAPIBridge
-      console.log('Jump to result:', index);
+      // Convert to 0-based index for the API
+      searchActions?.goToResult?.(index - 1);
     }
   };
 
   const handleJumpToSubmit = () => {
-    const index = parseInt(jumpToValue);
-    if (index && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
+    const index = parseInt(jumpToValue, 10);
+    if (!isNaN(index) && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
       handleJumpToResult(index);
+      setJumpToValue(''); // Clear the input after jumping
     }
   };
 
@@ -123,7 +171,14 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     }
   };
 
-  const _handleClose = () => {
+  const handleInputBlur = () => {
+    // Close popover on blur if no text is entered
+    if (!searchQuery.trim()) {
+      onClose();
+    }
+  };
+
+  const handleCloseClick = () => {
     handleClearSearch();
     onClose();
   };
@@ -135,100 +190,99 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
         padding: '0px'
       }}
     >
-      {/* Header */}
-      <Group mb="md">
+      {/* Header with close button */}
+      <Group mb="md" justify="space-between">
         <Text size="sm" fw={600}>
           {t('search.title', 'Search PDF')}
         </Text>
+        <ActionIcon
+          variant="subtle"
+          size="sm"
+          onClick={handleCloseClick}
+          aria-label="Close search"
+        >
+          <LocalIcon icon="close" width="1rem" height="1rem" />
+        </ActionIcon>
       </Group>
 
       {/* Search input */}
       <Group mb="md">
         <TextInput
+          ref={inputRef}
           placeholder={t('search.placeholder', 'Enter search term...')}
           value={searchQuery}
           onChange={(e) => {
             const newValue = e.currentTarget.value;
             setSearchQuery(newValue);
-            // If user clears the input, clear the search highlights
-            if (!newValue.trim()) {
-              handleClearSearch();
-            }
           }}
           onKeyDown={handleKeyDown}
+          onBlur={handleInputBlur}
           style={{ flex: 1 }}
           rightSection={
-            <ActionIcon
-              variant="subtle"
-              onClick={() => handleSearch(searchQuery)}
-              disabled={!searchQuery.trim() || isSearching}
-              loading={isSearching}
-            >
-              <LocalIcon icon="search" width="1rem" height="1rem" />
-            </ActionIcon>
+            searchQuery.trim() && (
+              <ActionIcon
+                variant="subtle"
+                onClick={handleClearSearch}
+                aria-label="Clear search"
+              >
+                <LocalIcon icon="close" width="0.875rem" height="0.875rem" />
+              </ActionIcon>
+            )
           }
         />
       </Group>
 
-      {/* Results info and navigation */}
-      {resultInfo && (
-        <Group justify="space-between" align="center">
-          {resultInfo.totalResults === 0 ? (
-            <Text size="sm" c="dimmed">
-              {t('search.noResults', 'No results found')}
-            </Text>
-          ) : (
-            <Group gap="xs" align="center">
-              <TextInput
-                size="xs"
-                value={jumpToValue}
-                onChange={(e) => setJumpToValue(e.currentTarget.value)}
-                onKeyDown={handleJumpToKeyDown}
-                onBlur={handleJumpToSubmit}
-                placeholder={resultInfo.currentIndex.toString()}
-                style={{ width: '3rem' }}
-                type="number"
-                min="1"
-                max={resultInfo.totalResults}
-              />
-              <Text size="sm" c="dimmed">
-                of {resultInfo.totalResults}
-              </Text>
-            </Group>
-          )}
-          
-          {resultInfo.totalResults > 0 && (
-            <Group gap="xs">
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handlePrevious}
-                disabled={resultInfo.currentIndex <= 1}
-                aria-label="Previous result"
-              >
-                <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
-              </ActionIcon>
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handleNext}
-                disabled={resultInfo.currentIndex >= resultInfo.totalResults}
-                aria-label="Next result"
-              >
-                <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
-              </ActionIcon>
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handleClearSearch}
-                aria-label="Clear search"
-              >
-                <LocalIcon icon="close" width="1rem" height="1rem" />
-              </ActionIcon>
-            </Group>
-          )}
+      {/* Results info and navigation - always show */}
+      <Group justify="space-between" align="center">
+        <Group gap="xs" align="center">
+          <TextInput
+            size="xs"
+            value={jumpToValue}
+            onChange={(e) => {
+              const newValue = e.currentTarget.value;
+              setJumpToValue(newValue);
+
+              // Jump immediately as user types
+              const index = parseInt(newValue, 10);
+              if (resultInfo && !isNaN(index) && index >= 1 && index <= resultInfo.totalResults) {
+                handleJumpToResult(index);
+              }
+            }}
+            onKeyDown={handleJumpToKeyDown}
+            onBlur={() => setJumpToValue('')} // Clear on blur instead of submit
+            placeholder={(resultInfo?.currentIndex || 0).toString()}
+            style={{ width: '3rem' }}
+            type="number"
+            min="1"
+            max={resultInfo?.totalResults || 0}
+            disabled={!resultInfo || resultInfo.totalResults === 0}
+          />
+          <Text size="sm" c="dimmed">
+            of {resultInfo?.totalResults || 0}
+          </Text>
         </Group>
-      )}
+
+        <Group gap="xs">
+          <ActionIcon
+            variant="subtle"
+            size="sm"
+            onClick={handlePrevious}
+            disabled={!resultInfo || resultInfo.currentIndex <= 1}
+            aria-label="Previous result"
+          >
+            <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            size="sm"
+            onClick={handleNext}
+            disabled={!resultInfo || resultInfo.currentIndex >= resultInfo.totalResults}
+            aria-label="Next result"
+          >
+            <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
+          </ActionIcon>
+        </Group>
+      </Group>
 
       {/* Loading state */}
       {isSearching && (
diff --git a/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx b/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
index 995d7d095d..9ef19dd71e 100644
--- a/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
+++ b/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
@@ -36,7 +36,14 @@ export function useViewerRightRailButtons() {
         order: 10,
         render: ({ disabled }) => (
           <Tooltip content={searchLabel} position={tooltipPosition} offset={12} arrow portalTarget={document.body}>
-            <Popover position={tooltipPosition} withArrow shadow="md" offset={8}>
+            <Popover
+              position={tooltipPosition}
+              withArrow
+              shadow="md"
+              offset={8}
+              opened={viewer.isSearchInterfaceVisible}
+              onClose={viewer.searchInterfaceActions.close}
+            >
               <Popover.Target>
                 <div style={{ display: 'inline-flex' }}>
                   <ActionIcon
@@ -45,6 +52,7 @@ export function useViewerRightRailButtons() {
                     className="right-rail-icon"
                     disabled={disabled}
                     aria-label={searchLabel}
+                    onClick={viewer.searchInterfaceActions.toggle}
                   >
                     <LocalIcon icon="search" width="1.5rem" height="1.5rem" />
                   </ActionIcon>
@@ -52,7 +60,7 @@ export function useViewerRightRailButtons() {
               </Popover.Target>
               <Popover.Dropdown>
                 <div style={{ minWidth: '20rem' }}>
-                  <SearchInterface visible={true} onClose={() => {}} />
+                  <SearchInterface visible={viewer.isSearchInterfaceVisible} onClose={viewer.searchInterfaceActions.close} />
                 </div>
               </Popover.Dropdown>
             </Popover>
diff --git a/frontend/src/core/constants/events.ts b/frontend/src/core/constants/events.ts
index e95895f935..a7455fc3fe 100644
--- a/frontend/src/core/constants/events.ts
+++ b/frontend/src/core/constants/events.ts
@@ -25,7 +25,7 @@ export interface UpgradeBannerAlertPayload {
   freeTierLimit?: number;
 }
 
-export type TourType = 'admin' | 'tools';
+export type TourType = 'admin' | 'tools' | 'whatsnew';
 
 export interface StartTourPayload {
   tourType: TourType;
diff --git a/frontend/src/core/contexts/AppConfigContext.tsx b/frontend/src/core/contexts/AppConfigContext.tsx
index 2e42f95812..c8fcdf64c8 100644
--- a/frontend/src/core/contexts/AppConfigContext.tsx
+++ b/frontend/src/core/contexts/AppConfigContext.tsx
@@ -29,6 +29,7 @@ export interface AppConfig {
   enableAnalytics?: boolean | null;
   enablePosthog?: boolean | null;
   enableScarf?: boolean | null;
+  enableDesktopInstallSlide?: boolean;
   premiumEnabled?: boolean;
   premiumKey?: string;
   termsAndConditions?: string;
diff --git a/frontend/src/core/contexts/TourOrchestrationContext.tsx b/frontend/src/core/contexts/TourOrchestrationContext.tsx
index a594e8322b..2c5b9dda52 100644
--- a/frontend/src/core/contexts/TourOrchestrationContext.tsx
+++ b/frontend/src/core/contexts/TourOrchestrationContext.tsx
@@ -111,6 +111,8 @@ export const TourOrchestrationProvider: React.FC<{ children: React.ReactNode }>
 
   const loadSampleFile = useCallback(async () => {
     try {
+      // Hide the modal immediately so the tour targets are visible while we load
+      closeFilesModal();
       const response = await fetch(`${BASE_PATH}/samples/Sample.pdf`);
       const blob = await response.blob();
       const file = new File([blob], 'Sample.pdf', { type: 'application/pdf' });
diff --git a/frontend/src/core/contexts/ViewerContext.tsx b/frontend/src/core/contexts/ViewerContext.tsx
index 937c6067ab..9217511efe 100644
--- a/frontend/src/core/contexts/ViewerContext.tsx
+++ b/frontend/src/core/contexts/ViewerContext.tsx
@@ -80,6 +80,14 @@ interface ViewerContextType {
   isBookmarkSidebarVisible: boolean;
   toggleBookmarkSidebar: () => void;
 
+  // Search interface visibility
+  isSearchInterfaceVisible: boolean;
+  searchInterfaceActions: {
+    open: () => void;
+    close: () => void;
+    toggle: () => void;
+  };
+
   // Annotation visibility toggle
   isAnnotationsVisible: boolean;
   toggleAnnotationsVisibility: () => void;
@@ -145,6 +153,7 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
   // UI state - only state directly managed by this context
   const [isThumbnailSidebarVisible, setIsThumbnailSidebarVisible] = useState(false);
   const [isBookmarkSidebarVisible, setIsBookmarkSidebarVisible] = useState(false);
+  const [isSearchInterfaceVisible, setSearchInterfaceVisible] = useState(false);
   const [isAnnotationsVisible, setIsAnnotationsVisible] = useState(true);
   const [isAnnotationMode, setIsAnnotationModeState] = useState(false);
   const [activeFileIndex, setActiveFileIndex] = useState(0);
@@ -207,6 +216,12 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     setIsBookmarkSidebarVisible(prev => !prev);
   };
 
+  const searchInterfaceActions = {
+    open: () => setSearchInterfaceVisible(true),
+    close: () => setSearchInterfaceVisible(false),
+    toggle: () => setSearchInterfaceVisible(prev => !prev),
+  };
+
   const toggleAnnotationsVisibility = () => {
     setIsAnnotationsVisible(prev => !prev);
   };
@@ -294,6 +309,10 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     isBookmarkSidebarVisible,
     toggleBookmarkSidebar,
 
+    // Search interface
+    isSearchInterfaceVisible,
+    searchInterfaceActions,
+
     // Annotation controls
     isAnnotationsVisible,
     toggleAnnotationsVisibility,
diff --git a/frontend/src/core/contexts/viewer/viewerActions.ts b/frontend/src/core/contexts/viewer/viewerActions.ts
index d32c5077c5..882ba8aa88 100644
--- a/frontend/src/core/contexts/viewer/viewerActions.ts
+++ b/frontend/src/core/contexts/viewer/viewerActions.ts
@@ -52,6 +52,7 @@ export interface SearchActions {
   next: () => void;
   previous: () => void;
   clear: () => void;
+  goToResult: (index: number) => void;
 }
 
 export interface ExportActions {
@@ -287,6 +288,12 @@ export function createViewerActions({
         api.clear();
       }
     },
+    goToResult: (index: number) => {
+      const api = registry.current.search?.api;
+      if (api?.goToResult) {
+        api.goToResult(index);
+      }
+    },
   };
 
   const exportActions: ExportActions = {
diff --git a/frontend/src/core/hooks/tools/compress/useCompressOperation.ts b/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
index 5b1417b21f..8e8f27b331 100644
--- a/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
+++ b/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
@@ -19,6 +19,11 @@ export const buildCompressFormData = (parameters: CompressParameters, file: File
   }
 
   formData.append("grayscale", parameters.grayscale.toString());
+  formData.append("lineArt", parameters.lineArt.toString());
+  if (parameters.lineArt) {
+    formData.append("lineArtThreshold", parameters.lineArtThreshold.toString());
+    formData.append("lineArtEdgeLevel", parameters.lineArtEdgeLevel.toString());
+  }
   return formData;
 };
 
diff --git a/frontend/src/core/hooks/tools/compress/useCompressParameters.ts b/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
index 1ae9298f5e..16f80f1d1e 100644
--- a/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
+++ b/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
@@ -4,6 +4,9 @@ import { useBaseParameters, BaseParametersHook } from '@app/hooks/tools/shared/u
 export interface CompressParameters extends BaseParameters {
   compressionLevel: number;
   grayscale: boolean;
+  lineArt: boolean;
+  lineArtThreshold: number;
+  lineArtEdgeLevel: 1 | 2 | 3;
   expectedSize: string;
   compressionMethod: 'quality' | 'filesize';
   fileSizeValue: string;
@@ -13,6 +16,9 @@ export interface CompressParameters extends BaseParameters {
 export const defaultParameters: CompressParameters = {
   compressionLevel: 5,
   grayscale: false,
+  lineArt: false,
+  lineArtThreshold: 50,
+  lineArtEdgeLevel: 3,
   expectedSize: '',
   compressionMethod: 'quality',
   fileSizeValue: '',
diff --git a/frontend/src/core/hooks/useServerExperience.ts b/frontend/src/core/hooks/useServerExperience.ts
index 28f62c1c57..7b78a58d49 100644
--- a/frontend/src/core/hooks/useServerExperience.ts
+++ b/frontend/src/core/hooks/useServerExperience.ts
@@ -64,7 +64,10 @@ export function useServerExperience(): ServerExperienceValue {
 
   const loginEnabled = config?.enableLogin !== false;
   const configIsAdmin = Boolean(config?.isAdmin);
-  const effectiveIsAdmin = configIsAdmin || (!loginEnabled && selfReportedAdmin);
+  // For no-login servers, treat everyone as a regular user (no effective admin)
+  // Commented out the previous self-reported admin path to avoid elevating users.
+  // const effectiveIsAdmin = configIsAdmin || (!loginEnabled && selfReportedAdmin);
+  const effectiveIsAdmin = loginEnabled ? configIsAdmin : false;
   const hasPaidLicense = config?.license === 'SERVER' || config?.license === 'PRO' || config?.license === 'ENTERPRISE';
 
   const setSelfReportedAdmin = useCallback((value: boolean) => {
diff --git a/frontend/src/core/services/accountService.ts b/frontend/src/core/services/accountService.ts
index 72d9f18732..cc8c2527fc 100644
--- a/frontend/src/core/services/accountService.ts
+++ b/frontend/src/core/services/accountService.ts
@@ -56,4 +56,14 @@ export const accountService = {
     formData.append('newPassword', newPassword);
     await apiClient.post('/api/v1/user/change-password-on-login', formData);
   },
+
+  /**
+   * Change username
+   */
+  async changeUsername(newUsername: string, currentPassword: string): Promise<void> {
+    const formData = new FormData();
+    formData.append('currentPasswordChangeUsername', currentPassword);
+    formData.append('newUsername', newUsername);
+    await apiClient.post('/api/v1/user/change-username', formData);
+  },
 };
diff --git a/frontend/src/core/services/auditService.ts b/frontend/src/core/services/auditService.ts
index ac2da176b3..30951b67b2 100644
--- a/frontend/src/core/services/auditService.ts
+++ b/frontend/src/core/services/auditService.ts
@@ -49,7 +49,9 @@ const auditService = {
    * Get audit system status
    */
   async getSystemStatus(): Promise<AuditSystemStatus> {
-    const response = await apiClient.get<any>('/api/v1/proprietary/ui-data/audit-dashboard');
+    const response = await apiClient.get('/api/v1/proprietary/ui-data/audit-dashboard', {
+      suppressErrorToast: true,
+    });
     const data = response.data;
 
     // Map V1 response to expected format
diff --git a/frontend/src/core/testing/serverExperienceSimulations.ts b/frontend/src/core/testing/serverExperienceSimulations.ts
index f136ce4890..4bb3725459 100644
--- a/frontend/src/core/testing/serverExperienceSimulations.ts
+++ b/frontend/src/core/testing/serverExperienceSimulations.ts
@@ -38,7 +38,7 @@ const FREE_LICENSE_INFO: LicenseInfo = {
 
 const BASE_NO_LOGIN_CONFIG: AppConfig = {
   enableAnalytics: true,
-  appVersion: '2.0.0',
+  appVersion: '2.1.3',
   serverCertificateEnabled: false,
   enableAlphaFunctionality: false,
   serverPort: 8080,
diff --git a/frontend/src/proprietary/components/shared/UpgradeBanner.tsx b/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
index 966a82f2ef..51441f2283 100644
--- a/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
+++ b/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
@@ -13,7 +13,7 @@ import {
   UPGRADE_BANNER_ALERT_EVENT,
 } from '@core/constants/events';
 import { useServerExperience } from '@app/hooks/useServerExperience';
-import { hasSeenStep } from '@core/components/onboarding/orchestrator/onboardingStorage';
+import { isOnboardingCompleted } from '@core/components/onboarding/orchestrator/onboardingStorage';
 
 const FRIENDLY_LAST_SEEN_KEY = 'upgradeBannerFriendlyLastShownAt';
 const WEEK_IN_MS = 7 * 24 * 60 * 60 * 1000;
@@ -26,6 +26,7 @@ const UpgradeBanner: React.FC = () => {
   const onAuthRoute = isAuthRoute(location.pathname);
   const { openCheckout } = useCheckout();
   const {
+    loginEnabled,
     totalUsers,
     userCountResolved,
     userCountLoading,
@@ -34,9 +35,11 @@ const UpgradeBanner: React.FC = () => {
     licenseLoading,
     freeTierLimit,
     overFreeTierLimit,
+    weeklyActiveUsers,
     scenarioKey,
   } = useServerExperience();
-  const onboardingComplete = hasSeenStep('welcome');
+  const onboardingComplete = isOnboardingCompleted();
+  console.log('onboardingComplete', onboardingComplete);
   const [friendlyVisible, setFriendlyVisible] = useState(() => {
     if (typeof window === 'undefined') return false;
     const lastShownRaw = window.localStorage.getItem(FRIENDLY_LAST_SEEN_KEY);
@@ -296,8 +299,18 @@ const UpgradeBanner: React.FC = () => {
     );
   };
 
+  const suppressForNoLogin =
+    !loginEnabled ||
+    (!loginEnabled && (weeklyActiveUsers ?? Number.POSITIVE_INFINITY) > 5);
+
   // Don't show on auth routes or if neither banner type should show
-  if (onAuthRoute || (!friendlyVisible && !shouldEvaluateUrgent)) {
+  // Also suppress entirely for no-login servers (treat them as regular users only)
+  // and, per request, never surface upgrade messaging there when WAU > 5.
+  if (
+    onAuthRoute ||
+    suppressForNoLogin ||
+    (!friendlyVisible && !shouldEvaluateUrgent)
+  ) {
     return null;
   }
 
diff --git a/frontend/src/proprietary/components/shared/config/configNavSections.tsx b/frontend/src/proprietary/components/shared/config/configNavSections.tsx
index 6a64e5fbc6..0073696f9e 100644
--- a/frontend/src/proprietary/components/shared/config/configNavSections.tsx
+++ b/frontend/src/proprietary/components/shared/config/configNavSections.tsx
@@ -16,6 +16,8 @@ import AdminEndpointsSection from '@app/components/shared/config/configSections/
 import AdminAuditSection from '@app/components/shared/config/configSections/AdminAuditSection';
 import AdminUsageSection from '@app/components/shared/config/configSections/AdminUsageSection';
 import ApiKeys from '@app/components/shared/config/configSections/ApiKeys';
+import AccountSection from '@app/components/shared/config/configSections/AccountSection';
+import GeneralSection from '@app/components/shared/config/configSections/GeneralSection';
 
 /**
  * Hook version of proprietary config nav sections with proper i18n support
@@ -30,6 +32,23 @@ export const useConfigNavSections = (
   // Get the core sections (just Preferences)
   const sections = useCoreConfigNavSections(isAdmin, runningEE, loginEnabled);
 
+  // Add account management under Preferences
+  const preferencesSection = sections.find((section) => section.items.some((item) => item.key === 'general'));
+  if (preferencesSection) {
+    preferencesSection.items = preferencesSection.items.map((item) =>
+      item.key === 'general' ? { ...item, component: <GeneralSection /> } : item
+    );
+
+    if (loginEnabled) {
+      preferencesSection.items.push({
+        key: 'account',
+        label: t('account.accountSettings', 'Account'),
+        icon: 'person-rounded',
+        component: <AccountSection />
+      });
+    }
+  }
+
   // Add Admin sections if user is admin OR if login is disabled (but mark as disabled)
   if (isAdmin || !loginEnabled) {
     const requiresLogin = !loginEnabled;
@@ -220,6 +239,23 @@ export const createConfigNavSections = (
   // Get the core sections (just Preferences)
   const sections = createCoreConfigNavSections(isAdmin, runningEE, loginEnabled);
 
+  // Add account management under Preferences
+  const preferencesSection = sections.find((section) => section.items.some((item) => item.key === 'general'));
+  if (preferencesSection) {
+    preferencesSection.items = preferencesSection.items.map((item) =>
+      item.key === 'general' ? { ...item, component: <GeneralSection /> } : item
+    );
+
+    if (loginEnabled) {
+      preferencesSection.items.push({
+        key: 'account',
+        label: 'Account',
+        icon: 'person-rounded',
+        component: <AccountSection />
+      });
+    }
+  }
+
   // Add Admin sections if user is admin OR if login is disabled (but mark as disabled)
   if (isAdmin || !loginEnabled) {
     const requiresLogin = !loginEnabled;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx
new file mode 100644
index 0000000000..f627302b4a
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx
@@ -0,0 +1,260 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { Alert, Button, Group, Modal, Paper, PasswordInput, Stack, Text, TextInput } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { alert as showToast } from '@app/components/toast';
+import { useAuth } from '@app/auth/UseSession';
+import { accountService } from '@app/services/accountService';
+import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+
+const AccountSection: React.FC = () => {
+  const { t } = useTranslation();
+  const { user, signOut } = useAuth();
+  const [passwordModalOpen, setPasswordModalOpen] = useState(false);
+  const [usernameModalOpen, setUsernameModalOpen] = useState(false);
+
+  const [currentPassword, setCurrentPassword] = useState('');
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [passwordError, setPasswordError] = useState('');
+  const [passwordSubmitting, setPasswordSubmitting] = useState(false);
+
+  const [currentPasswordForUsername, setCurrentPasswordForUsername] = useState('');
+  const [newUsername, setNewUsername] = useState('');
+  const [usernameError, setUsernameError] = useState('');
+  const [usernameSubmitting, setUsernameSubmitting] = useState(false);
+
+  const userIdentifier = useMemo(() => user?.email || user?.username || '', [user?.email, user?.username]);
+
+  const redirectToLogin = useCallback(() => {
+    window.location.assign('/login');
+  }, []);
+
+  const handleLogout = useCallback(async () => {
+    try {
+      await signOut();
+    } finally {
+      redirectToLogin();
+    }
+  }, [redirectToLogin, signOut]);
+
+  const handlePasswordSubmit = async (event: React.FormEvent) => {
+    event.preventDefault();
+
+    if (!currentPassword || !newPassword || !confirmPassword) {
+      setPasswordError(t('settings.security.password.required', 'All fields are required.'));
+      return;
+    }
+
+    if (newPassword !== confirmPassword) {
+      setPasswordError(t('settings.security.password.mismatch', 'New passwords do not match.'));
+      return;
+    }
+
+    try {
+      setPasswordSubmitting(true);
+      setPasswordError('');
+
+      await accountService.changePassword(currentPassword, newPassword);
+
+      showToast({
+        alertType: 'success',
+        title: t('settings.security.password.success', 'Password updated successfully. Please sign in again.'),
+      });
+
+      setCurrentPassword('');
+      setNewPassword('');
+      setConfirmPassword('');
+      setPasswordModalOpen(false);
+      await handleLogout();
+    } catch (err) {
+      const axiosError = err as { response?: { data?: { message?: string } } };
+      setPasswordError(
+        axiosError.response?.data?.message ||
+          t('settings.security.password.error', 'Unable to update password. Please verify your current password and try again.')
+      );
+    } finally {
+      setPasswordSubmitting(false);
+    }
+  };
+
+  const handleUsernameSubmit = async (event: React.FormEvent) => {
+    event.preventDefault();
+
+    if (!currentPasswordForUsername || !newUsername) {
+      setUsernameError(t('settings.security.password.required', 'All fields are required.'));
+      return;
+    }
+
+    try {
+      setUsernameSubmitting(true);
+      setUsernameError('');
+
+      await accountService.changeUsername(newUsername, currentPasswordForUsername);
+
+      showToast({
+        alertType: 'success',
+        title: t('changeCreds.credsUpdated', 'Account updated'),
+        body: t('changeCreds.description', 'Changes saved. Please log in again.'),
+      });
+
+      setNewUsername('');
+      setCurrentPasswordForUsername('');
+      setUsernameModalOpen(false);
+      await handleLogout();
+    } catch (err) {
+      const axiosError = err as { response?: { data?: { message?: string } } };
+      setUsernameError(
+        axiosError.response?.data?.message ||
+          t('changeCreds.error', 'Unable to update username. Please verify your password and try again.')
+      );
+    } finally {
+      setUsernameSubmitting(false);
+    }
+  };
+
+  return (
+    <Stack gap="md">
+      <div>
+        <Text fw={600} size="lg">
+          {t('account.accountSettings', 'Account')}
+        </Text>
+        <Text size="sm" c="dimmed">
+          {t('changeCreds.header', 'Update Your Account Details')}
+        </Text>
+      </div>
+
+      <Paper withBorder p="md" radius="md">
+        <Stack gap="sm">
+          <Text size="sm" c="dimmed">
+            {userIdentifier
+              ? t('settings.general.user', 'User') + ': ' + userIdentifier
+              : t('account.accountSettings', 'Account Settings')}
+          </Text>
+
+          <Group gap="sm" wrap="wrap">
+            <Button leftSection={<LocalIcon icon="key-rounded" />} onClick={() => setPasswordModalOpen(true)}>
+              {t('settings.security.password.update', 'Update password')}
+            </Button>
+
+            <Button
+              variant="light"
+              leftSection={<LocalIcon icon="edit-rounded" />}
+              onClick={() => setUsernameModalOpen(true)}
+            >
+              {t('account.changeUsername', 'Change username')}
+            </Button>
+
+            <Button variant="outline" color="red" leftSection={<LocalIcon icon="logout-rounded" />} onClick={handleLogout}>
+              {t('settings.general.logout', 'Log out')}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+
+      <Modal
+        opened={passwordModalOpen}
+        onClose={() => setPasswordModalOpen(false)}
+        title={t('settings.security.title', 'Change password')}
+        withinPortal
+        zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+      >
+        <form onSubmit={handlePasswordSubmit}>
+          <Stack gap="md">
+            <Text size="sm" c="dimmed">
+              {t('settings.security.password.subtitle', 'Change your password. You will be logged out after updating.')}
+            </Text>
+
+            {passwordError && (
+              <Alert icon={<LocalIcon icon="error-rounded" width="1rem" height="1rem" />} color="red" variant="light">
+                {passwordError}
+              </Alert>
+            )}
+
+            <PasswordInput
+              label={t('settings.security.password.current', 'Current password')}
+              placeholder={t('settings.security.password.currentPlaceholder', 'Enter your current password')}
+              value={currentPassword}
+              onChange={(event) => setCurrentPassword(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('settings.security.password.new', 'New password')}
+              placeholder={t('settings.security.password.newPlaceholder', 'Enter a new password')}
+              value={newPassword}
+              onChange={(event) => setNewPassword(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('settings.security.password.confirm', 'Confirm new password')}
+              placeholder={t('settings.security.password.confirmPlaceholder', 'Re-enter your new password')}
+              value={confirmPassword}
+              onChange={(event) => setConfirmPassword(event.currentTarget.value)}
+              required
+            />
+
+            <Group justify="flex-end" gap="sm">
+              <Button variant="default" onClick={() => setPasswordModalOpen(false)}>
+                {t('common.cancel', 'Cancel')}
+              </Button>
+              <Button type="submit" loading={passwordSubmitting} leftSection={<LocalIcon icon="save-rounded" />}>
+                {t('settings.security.password.update', 'Update password')}
+              </Button>
+            </Group>
+          </Stack>
+        </form>
+      </Modal>
+
+      <Modal
+        opened={usernameModalOpen}
+        onClose={() => setUsernameModalOpen(false)}
+        title={t('account.changeUsername', 'Change username')}
+        withinPortal
+        zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+      >
+        <form onSubmit={handleUsernameSubmit}>
+          <Stack gap="md">
+            <Text size="sm" c="dimmed">
+              {t('changeCreds.changeUsername', 'Update your username. You will be logged out after updating.')}
+            </Text>
+
+            {usernameError && (
+              <Alert icon={<LocalIcon icon="error-rounded" width="1rem" height="1rem" />} color="red" variant="light">
+                {usernameError}
+              </Alert>
+            )}
+
+            <TextInput
+              label={t('changeCreds.newUsername', 'New Username')}
+              placeholder={t('changeCreds.newUsername', 'New Username')}
+              value={newUsername}
+              onChange={(event) => setNewUsername(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('changeCreds.oldPassword', 'Current Password')}
+              placeholder={t('changeCreds.oldPassword', 'Current Password')}
+              value={currentPasswordForUsername}
+              onChange={(event) => setCurrentPasswordForUsername(event.currentTarget.value)}
+              required
+            />
+
+            <Group justify="flex-end" gap="sm">
+              <Button variant="default" onClick={() => setUsernameModalOpen(false)}>
+                {t('common.cancel', 'Cancel')}
+              </Button>
+              <Button type="submit" loading={usernameSubmitting} leftSection={<LocalIcon icon="save-rounded" />}>
+                {t('common.save', 'Save')}
+              </Button>
+            </Group>
+          </Stack>
+        </form>
+      </Modal>
+    </Stack>
+  );
+};
+
+export default AccountSection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
index c7142b3d27..1f71b090d0 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
@@ -23,8 +23,14 @@ const AdminAuditSection: React.FC = () => {
         setError(null);
         const status = await auditService.getSystemStatus();
         setSystemStatus(status);
-      } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to load audit system status');
+      } catch (err: any) {
+        // Check if this is a permission/license error (403/404)
+        const status = err?.response?.status;
+        if (status === 403 || status === 404) {
+          setError('enterprise-license-required');
+        } else {
+          setError(err instanceof Error ? err.message : 'Failed to load audit system status');
+        }
       } finally {
         setLoading(false);
       }
@@ -56,6 +62,16 @@ const AdminAuditSection: React.FC = () => {
   }
 
   if (error) {
+    if (error === 'enterprise-license-required') {
+      return (
+        <Alert color="blue" title={t('audit.enterpriseRequired', 'Enterprise License Required')}>
+          {t(
+            'audit.enterpriseRequiredMessage',
+            'The audit logging system is an enterprise feature. Please upgrade to an enterprise license to access audit logs and analytics.'
+          )}
+        </Alert>
+      );
+    }
     return (
       <Alert color="red" title={t('audit.error.title', 'Error loading audit system')}>
         {error}
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
index 2c86c9ced7..0b47cf1481 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import { Divider, Loader, Alert, Group, Text, Collapse, Button, TextInput, Stack, Paper, SegmentedControl, FileButton } from '@mantine/core';
+import { Divider, Loader, Alert } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { usePlans } from '@app/hooks/usePlans';
 import licenseService, { PlanTierGroup, mapLicenseToTier } from '@app/services/licenseService';
@@ -7,30 +7,25 @@ import { useCheckout } from '@app/contexts/CheckoutContext';
 import { useLicense } from '@app/contexts/LicenseContext';
 import AvailablePlansSection from '@app/components/shared/config/configSections/plan/AvailablePlansSection';
 import StaticPlanSection from '@app/components/shared/config/configSections/plan/StaticPlanSection';
+import LicenseKeySection from '@app/components/shared/config/configSections/plan/LicenseKeySection';
 import { alert } from '@app/components/toast';
-import LocalIcon from '@app/components/shared/LocalIcon';
 import { InfoBanner } from '@app/components/shared/InfoBanner';
 import { useLicenseAlert } from '@app/hooks/useLicenseAlert';
-import { isSupabaseConfigured } from '@app/services/supabaseClient';
 import { getPreferredCurrency, setCachedCurrency } from '@app/utils/currencyDetection';
 import { useLoginRequired } from '@app/hooks/useLoginRequired';
 import LoginRequiredBanner from '@core/components/shared/config/LoginRequiredBanner';
+import { isSupabaseConfigured } from '@app/services/supabaseClient';
 
 const AdminPlanSection: React.FC = () => {
   const { t, i18n } = useTranslation();
   const { loginEnabled, validateLoginEnabled } = useLoginRequired();
   const { openCheckout } = useCheckout();
-  const { licenseInfo, refetchLicense } = useLicense();
+  const { licenseInfo } = useLicense();
   const [currency, setCurrency] = useState<string>(() => {
     // Initialize with auto-detected currency on first render
     return getPreferredCurrency(i18n.language);
   });
   const [useStaticVersion, setUseStaticVersion] = useState(false);
-  const [showLicenseKey, setShowLicenseKey] = useState(false);
-  const [licenseKeyInput, setLicenseKeyInput] = useState<string>('');
-  const [savingLicense, setSavingLicense] = useState(false);
-  const [inputMethod, setInputMethod] = useState<'text' | 'file'>('text');
-  const [licenseFile, setLicenseFile] = useState<File | null>(null);
   const { plans, loading, error, refetch } = usePlans(currency);
   const licenseAlert = useLicenseAlert();
 
@@ -43,69 +38,6 @@ const AdminPlanSection: React.FC = () => {
     }
   }, [error]);
 
-  const handleSaveLicense = async () => {
-    // Block save if login is disabled
-    if (!validateLoginEnabled()) {
-      return;
-    }
-
-    try {
-      setSavingLicense(true);
-
-      let response;
-
-      if (inputMethod === 'file' && licenseFile) {
-        // Upload file
-        response = await licenseService.saveLicenseFile(licenseFile);
-      } else if (inputMethod === 'text' && licenseKeyInput.trim()) {
-        // Save key string (allow empty string to clear/remove license)
-        response = await licenseService.saveLicenseKey(licenseKeyInput.trim());
-      } else {
-        alert({
-          alertType: 'error',
-          title: t('admin.error', 'Error'),
-          body: t('admin.settings.premium.noInput', 'Please provide a license key or file'),
-        });
-        return;
-      }
-
-      if (response.success) {
-        // Refresh license context to update all components
-        await refetchLicense();
-
-        const successMessage = inputMethod === 'file'
-          ? t('admin.settings.premium.file.successMessage', 'License file uploaded and activated successfully')
-          : t('admin.settings.premium.key.successMessage', 'License key activated successfully');
-
-        alert({
-          alertType: 'success',
-          title: t('success', 'Success'),
-          body: successMessage,
-        });
-
-        // Clear inputs
-        setLicenseKeyInput('');
-        setLicenseFile(null);
-        setInputMethod('text'); // Reset to default
-      } else {
-        alert({
-          alertType: 'error',
-          title: t('admin.error', 'Error'),
-          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
-        });
-      }
-    } catch (error) {
-      console.error('Failed to save license:', error);
-      alert({
-        alertType: 'error',
-        title: t('admin.error', 'Error'),
-        body: t('admin.settings.saveError', 'Failed to save license'),
-      });
-    } finally {
-      setSavingLicense(false);
-    }
-  };
-
   const currencyOptions = [
     { value: 'gbp', label: 'British pound (GBP, £)' },
     { value: 'usd', label: 'US dollar (USD, $)' },
@@ -280,169 +212,7 @@ const AdminPlanSection: React.FC = () => {
       <Divider />
 
       {/* License Key Section */}
-      <div>
-        <Button
-          variant="subtle"
-          leftSection={<LocalIcon icon={showLicenseKey ? "expand-less-rounded" : "expand-more-rounded"} width="1.25rem" height="1.25rem" />}
-          onClick={() => setShowLicenseKey(!showLicenseKey)}
-        >
-          {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
-        </Button>
-
-        <Collapse in={showLicenseKey} mt="md">
-          <Stack gap="md">
-            <Alert
-              variant="light"
-              color="blue"
-              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
-            >
-              <Text size="sm">
-                {t('admin.settings.premium.licenseKey.info', 'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.')}
-              </Text>
-            </Alert>
-
-            {/* Severe warning if license already exists */}
-            {licenseInfo?.licenseKey && (
-              <Alert
-                variant="light"
-                color="red"
-                icon={<LocalIcon icon="warning-rounded" width="1rem" height="1rem" />}
-                title={t('admin.settings.premium.key.overwriteWarning.title', '⚠️ Warning: Existing License Detected')}
-              >
-                <Stack gap="xs">
-                  <Text size="sm" fw={600}>
-                    {t('admin.settings.premium.key.overwriteWarning.line1', 'Overwriting your current license key cannot be undone.')}
-                  </Text>
-                  <Text size="sm">
-                    {t('admin.settings.premium.key.overwriteWarning.line2', 'Your previous license will be permanently lost unless you have backed it up elsewhere.')}
-                  </Text>
-                  <Text size="sm" fw={500}>
-                    {t('admin.settings.premium.key.overwriteWarning.line3', 'Important: Keep license keys private and secure. Never share them publicly.')}
-                  </Text>
-                </Stack>
-              </Alert>
-            )}
-
-            {/* Show current license source */}
-            {licenseInfo?.licenseKey && (
-              <Alert
-                variant="light"
-                color="green"
-                icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
-              >
-                <Stack gap="xs">
-                  <Text size="sm" fw={500}>
-                    {t('admin.settings.premium.currentLicense.title', 'Active License')}
-                  </Text>
-                  <Text size="xs">
-                    {licenseInfo.licenseKey.startsWith('file:')
-                      ? t('admin.settings.premium.currentLicense.file', 'Source: License file ({{path}})', {
-                          path: licenseInfo.licenseKey.substring(5)
-                        })
-                      : t('admin.settings.premium.currentLicense.key', 'Source: License key')}
-                  </Text>
-                  <Text size="xs">
-                    {t('admin.settings.premium.currentLicense.type', 'Type: {{type}}', {
-                      type: licenseInfo.licenseType
-                    })}
-                  </Text>
-                </Stack>
-              </Alert>
-            )}
-
-            {/* Input method selector */}
-            <SegmentedControl
-              value={inputMethod}
-              onChange={(value) => {
-                setInputMethod(value as 'text' | 'file');
-                // Clear opposite input when switching
-                if (value === 'text') setLicenseFile(null);
-                if (value === 'file') setLicenseKeyInput('');
-              }}
-              data={[
-                {
-                  label: t('admin.settings.premium.inputMethod.text', 'License Key'),
-                  value: 'text'
-                },
-                {
-                  label: t('admin.settings.premium.inputMethod.file', 'Certificate File'),
-                  value: 'file'
-                }
-              ]}
-              disabled={!loginEnabled || savingLicense}
-            />
-
-            {/* Input area */}
-            <Paper withBorder p="md" radius="md">
-              <Stack gap="md">
-                {inputMethod === 'text' ? (
-                  /* Existing text input */
-                  <TextInput
-                    label={t('admin.settings.premium.key.label', 'License Key')}
-                    description={t('admin.settings.premium.key.description', 'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.')}
-                    value={licenseKeyInput}
-                    onChange={(e) => setLicenseKeyInput(e.target.value)}
-                    placeholder={licenseInfo?.licenseKey || '00000000-0000-0000-0000-000000000000'}
-                    type="password"
-                    disabled={!loginEnabled || savingLicense}
-                  />
-                ) : (
-                  /* File upload */
-                  <div>
-                    <Text size="sm" fw={500} mb="xs">
-                      {t('admin.settings.premium.file.label', 'License Certificate File')}
-                    </Text>
-                    <Text size="xs" c="dimmed" mb="md">
-                      {t('admin.settings.premium.file.description', 'Upload your .lic or .cert license file')}
-                    </Text>
-                    <FileButton
-                      onChange={setLicenseFile}
-                      accept=".lic,.cert"
-                      disabled={!loginEnabled || savingLicense}
-                    >
-                      {(props) => (
-                        <Button
-                          {...props}
-                          variant="outline"
-                          leftSection={<LocalIcon icon="upload-file-rounded" width="1rem" height="1rem" />}
-                          disabled={!loginEnabled || savingLicense}
-                        >
-                          {licenseFile
-                            ? licenseFile.name
-                            : t('admin.settings.premium.file.choose', 'Choose License File')}
-                        </Button>
-                      )}
-                    </FileButton>
-                    {licenseFile && (
-                      <Text size="xs" c="dimmed" mt="xs">
-                        {t('admin.settings.premium.file.selected', 'Selected: {{filename}} ({{size}})', {
-                          filename: licenseFile.name,
-                          size: (licenseFile.size / 1024).toFixed(2) + ' KB'
-                        })}
-                      </Text>
-                    )}
-                  </div>
-                )}
-
-                <Group justify="flex-end">
-                  <Button
-                    onClick={handleSaveLicense}
-                    loading={savingLicense}
-                    size="sm"
-                    disabled={
-                      !loginEnabled ||
-                      (inputMethod === 'text' && !licenseKeyInput.trim()) ||
-                      (inputMethod === 'file' && !licenseFile)
-                    }
-                  >
-                    {t('admin.settings.save', 'Save Changes')}
-                  </Button>
-                </Group>
-              </Stack>
-            </Paper>
-          </Stack>
-        </Collapse>
-      </div>
+      <LicenseKeySection currentLicenseInfo={licenseInfo ?? undefined} />
     </div>
   );
 };
diff --git a/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx
deleted file mode 100644
index 7894319cb9..0000000000
--- a/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { Stack, Text, Button } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { useAuth } from '@app/auth/UseSession';
-import { useNavigate } from 'react-router-dom';
-import CoreGeneralSection from '@core/components/shared/config/configSections/GeneralSection';
-
-/**
- * Proprietary extension of GeneralSection that adds account management
- */
-const GeneralSection: React.FC = () => {
-  const { t } = useTranslation();
-  const { signOut, user } = useAuth();
-  const navigate = useNavigate();
-
-  const handleLogout = async () => {
-    try {
-      await signOut();
-      navigate('/login');
-    } catch (error) {
-      console.error('Logout error:', error);
-    }
-  };
-
-  return (
-    <Stack gap="lg">
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
-        <div>
-          <Text fw={600} size="lg">{t('settings.general.title', 'General')}</Text>
-          <Text size="sm" c="dimmed">
-            {t('settings.general.description', 'Configure general application preferences.')}
-          </Text>
-        </div>
-
-        {user && (
-          <Stack gap="xs" align="flex-end">
-            <Text size="sm" c="dimmed">
-              {t('settings.general.user', 'User')}: <strong>{user.email || user.username}</strong>
-            </Text>
-            <Button color="red" variant="outline" size="xs" onClick={handleLogout}>
-              {t('settings.general.logout', 'Log out')}
-            </Button>
-          </Stack>
-        )}
-      </div>
-
-      {/* Render core general section preferences (without title since we show it above) */}
-      <CoreGeneralSection hideTitle />
-    </Stack>
-  );
-};
-
-export default GeneralSection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
index a3b8800d10..9aed2ff7d5 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
@@ -5,6 +5,7 @@ import licenseService, { PlanTier, PlanTierGroup, LicenseInfo, mapLicenseToTier
 import PlanCard from '@app/components/shared/config/configSections/plan/PlanCard';
 import FeatureComparisonTable from '@app/components/shared/config/configSections/plan/FeatureComparisonTable';
 import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+import { isCurrentTier as checkIsCurrentTier, isDowngrade as checkIsDowngrade } from '@app/utils/planTierUtils';
 
 interface AvailablePlansSectionProps {
   plans: PlanTier[];
@@ -43,28 +44,12 @@ const AvailablePlansSection: React.FC<AvailablePlansSectionProps> = ({
 
   // Determine if the current tier matches (checks both Stripe subscription and license)
   const isCurrentTier = (tierGroup: PlanTierGroup): boolean => {
-    // Check license tier match
-    if (currentTier && tierGroup.tier === currentTier) {
-      return true;
-    }
-    return false;
+    return checkIsCurrentTier(currentTier, tierGroup.tier);
   };
 
   // Determine if selecting this plan would be a downgrade
   const isDowngrade = (tierGroup: PlanTierGroup): boolean => {
-    if (!currentTier) return false;
-
-    // Define tier hierarchy: enterprise > server > free
-    const tierHierarchy: Record<string, number> = {
-      'enterprise': 3,
-      'server': 2,
-      'free': 1
-    };
-
-    const currentLevel = tierHierarchy[currentTier] || 0;
-    const targetLevel = tierHierarchy[tierGroup.tier] || 0;
-
-    return currentLevel > targetLevel;
+    return checkIsDowngrade(currentTier, tierGroup.tier);
   };
 
   return (
@@ -103,7 +88,7 @@ const AvailablePlansSection: React.FC<AvailablePlansSectionProps> = ({
           display: 'grid',
           gridTemplateColumns: 'repeat(3, 1fr)',
           gap: '1rem',
-          marginBottom: '0.5rem',
+          marginBottom: '0.1rem',
         }}
       >
         {groupedPlans.map((group) => (
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx
new file mode 100644
index 0000000000..e5e90d0489
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx
@@ -0,0 +1,273 @@
+import React, { useState } from 'react';
+import { Button, Collapse, Alert, TextInput, Paper, Stack, Group, Text, SegmentedControl, FileButton } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { alert } from '@app/components/toast';
+import { LicenseInfo } from '@app/services/licenseService';
+import licenseService from '@app/services/licenseService';
+import { useLicense } from '@app/contexts/LicenseContext';
+import { useLoginRequired } from '@app/hooks/useLoginRequired';
+
+interface LicenseKeySectionProps {
+  currentLicenseInfo?: LicenseInfo;
+}
+
+const LicenseKeySection: React.FC<LicenseKeySectionProps> = ({ currentLicenseInfo }) => {
+  const { t } = useTranslation();
+  const { refetchLicense } = useLicense();
+  const { loginEnabled, validateLoginEnabled } = useLoginRequired();
+  const [showLicenseKey, setShowLicenseKey] = useState(false);
+  const [licenseKeyInput, setLicenseKeyInput] = useState<string>('');
+  const [savingLicense, setSavingLicense] = useState(false);
+  const [inputMethod, setInputMethod] = useState<'text' | 'file'>('text');
+  const [licenseFile, setLicenseFile] = useState<File | null>(null);
+
+  const handleSaveLicense = async () => {
+    // Block save if login is disabled
+    if (!validateLoginEnabled()) {
+      return;
+    }
+
+    try {
+      setSavingLicense(true);
+
+      let response;
+
+      if (inputMethod === 'file' && licenseFile) {
+        // Upload file
+        response = await licenseService.saveLicenseFile(licenseFile);
+      } else if (inputMethod === 'text' && licenseKeyInput.trim()) {
+        // Save key string
+        response = await licenseService.saveLicenseKey(licenseKeyInput.trim());
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: t('admin.settings.premium.noInput', 'Please provide a license key or file'),
+        });
+        return;
+      }
+
+      if (response.success) {
+        // Refresh license context to update all components
+        await refetchLicense();
+
+        const successMessage =
+          inputMethod === 'file'
+            ? t('admin.settings.premium.file.successMessage', 'License file uploaded and activated successfully')
+            : t('admin.settings.premium.key.successMessage', 'License key activated successfully');
+
+        alert({
+          alertType: 'success',
+          title: t('success', 'Success'),
+          body: successMessage,
+        });
+
+        // Clear inputs
+        setLicenseKeyInput('');
+        setLicenseFile(null);
+        setInputMethod('text'); // Reset to default
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
+        });
+      }
+    } catch (error) {
+      console.error('Failed to save license:', error);
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.saveError', 'Failed to save license'),
+      });
+    } finally {
+      setSavingLicense(false);
+    }
+  };
+
+  return (
+    <div>
+      <Button
+        variant="subtle"
+        leftSection={
+          <LocalIcon
+            icon={showLicenseKey ? 'expand-less-rounded' : 'expand-more-rounded'}
+            width="1.25rem"
+            height="1.25rem"
+          />
+        }
+        onClick={() => setShowLicenseKey(!showLicenseKey)}
+      >
+        {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
+      </Button>
+
+      <Collapse in={showLicenseKey} mt="md">
+        <Stack gap="md">
+          <Alert variant="light" color="blue" icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}>
+            <Text size="sm">
+              {t(
+                'admin.settings.premium.licenseKey.info',
+                'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.'
+              )}
+            </Text>
+          </Alert>
+
+          {/* Severe warning if license already exists */}
+          {currentLicenseInfo?.licenseKey && (
+            <Alert
+              variant="light"
+              color="red"
+              icon={<LocalIcon icon="warning-rounded" width="1rem" height="1rem" />}
+              title={t('admin.settings.premium.key.overwriteWarning.title', '⚠️ Warning: Existing License Detected')}
+            >
+              <Stack gap="xs">
+                <Text size="sm" fw={600}>
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line1',
+                    'Overwriting your current license key cannot be undone.'
+                  )}
+                </Text>
+                <Text size="sm">
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line2',
+                    'Your previous license will be permanently lost unless you have backed it up elsewhere.'
+                  )}
+                </Text>
+                <Text size="sm" fw={500}>
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line3',
+                    'Important: Keep license keys private and secure. Never share them publicly.'
+                  )}
+                </Text>
+              </Stack>
+            </Alert>
+          )}
+
+          {/* Show current license source */}
+          {currentLicenseInfo?.licenseKey && (
+            <Alert
+              variant="light"
+              color="green"
+              icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
+            >
+              <Stack gap="xs">
+                <Text size="sm" fw={500}>
+                  {t('admin.settings.premium.currentLicense.title', 'Active License')}
+                </Text>
+                <Text size="xs">
+                  {currentLicenseInfo.licenseKey.startsWith('file:')
+                    ? t('admin.settings.premium.currentLicense.file', 'Source: License file ({{path}})', {
+                        path: currentLicenseInfo.licenseKey.substring(5),
+                      })
+                    : t('admin.settings.premium.currentLicense.key', 'Source: License key')}
+                </Text>
+                <Text size="xs">
+                  {t('admin.settings.premium.currentLicense.type', 'Type: {{type}}', {
+                    type: currentLicenseInfo.licenseType,
+                  })}
+                </Text>
+              </Stack>
+            </Alert>
+          )}
+
+          {/* Input method selector */}
+          <SegmentedControl
+            value={inputMethod}
+            onChange={(value) => {
+              setInputMethod(value as 'text' | 'file');
+              // Clear opposite input when switching
+              if (value === 'text') setLicenseFile(null);
+              if (value === 'file') setLicenseKeyInput('');
+            }}
+            data={[
+              {
+                label: t('admin.settings.premium.inputMethod.text', 'License Key'),
+                value: 'text',
+              },
+              {
+                label: t('admin.settings.premium.inputMethod.file', 'Certificate File'),
+                value: 'file',
+              },
+            ]}
+            disabled={!loginEnabled || savingLicense}
+          />
+
+          {/* Input area */}
+          <Paper withBorder p="md" radius="md">
+            <Stack gap="md">
+              {inputMethod === 'text' ? (
+                /* Text input */
+                <TextInput
+                  label={t('admin.settings.premium.key.label', 'License Key')}
+                  description={t(
+                    'admin.settings.premium.key.description',
+                    'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.'
+                  )}
+                  value={licenseKeyInput}
+                  onChange={(e) => setLicenseKeyInput(e.target.value)}
+                  placeholder={currentLicenseInfo?.licenseKey || '00000000-0000-0000-0000-000000000000'}
+                  type="password"
+                  disabled={!loginEnabled || savingLicense}
+                />
+              ) : (
+                /* File upload */
+                <div>
+                  <Text size="sm" fw={500} mb="xs">
+                    {t('admin.settings.premium.file.label', 'License Certificate File')}
+                  </Text>
+                  <Text size="xs" c="dimmed" mb="md">
+                    {t('admin.settings.premium.file.description', 'Upload your .lic or .cert license file')}
+                  </Text>
+                  <FileButton
+                    onChange={setLicenseFile}
+                    accept=".lic,.cert"
+                    disabled={!loginEnabled || savingLicense}
+                  >
+                    {(props) => (
+                      <Button
+                        {...props}
+                        variant="outline"
+                        leftSection={<LocalIcon icon="upload-file-rounded" width="1rem" height="1rem" />}
+                        disabled={!loginEnabled || savingLicense}
+                      >
+                        {licenseFile
+                          ? licenseFile.name
+                          : t('admin.settings.premium.file.choose', 'Choose License File')}
+                      </Button>
+                    )}
+                  </FileButton>
+                  {licenseFile && (
+                    <Text size="xs" c="dimmed" mt="xs">
+                      {t('admin.settings.premium.file.selected', 'Selected: {{filename}} ({{size}})', {
+                        filename: licenseFile.name,
+                        size: (licenseFile.size / 1024).toFixed(2) + ' KB',
+                      })}
+                    </Text>
+                  )}
+                </div>
+              )}
+
+              <Group justify="flex-end">
+                <Button
+                  onClick={handleSaveLicense}
+                  loading={savingLicense}
+                  size="sm"
+                  disabled={
+                    !loginEnabled ||
+                    (inputMethod === 'text' && !licenseKeyInput.trim()) ||
+                    (inputMethod === 'file' && !licenseFile)
+                  }
+                >
+                  {t('admin.settings.save', 'Save Changes')}
+                </Button>
+              </Group>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Collapse>
+    </div>
+  );
+};
+
+export default LicenseKeySection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
index ab56fdad35..b2dce9c658 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
@@ -6,6 +6,7 @@ import { PricingBadge } from '@app/components/shared/stripeCheckout/components/P
 import { PriceDisplay } from '@app/components/shared/stripeCheckout/components/PriceDisplay';
 import { calculateDisplayPricing } from '@app/components/shared/stripeCheckout/utils/pricingUtils';
 import { getBaseCardStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { isEnterpriseBlockedForFree as checkIsEnterpriseBlockedForFree } from '@app/utils/planTierUtils';
 
 interface PlanCardProps {
   planGroup: PlanTierGroup;
@@ -83,7 +84,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
   const isEnterprise = planGroup.tier === 'enterprise';
 
   // Block enterprise for free tier users (must have server first)
-  const isEnterpriseBlockedForFree = isEnterprise && currentTier === 'free';
+  const isEnterpriseBlockedForFree = checkIsEnterpriseBlockedForFree(currentTier, planGroup.tier);
 
   // Calculate "From" pricing - show yearly price divided by 12 for lowest monthly equivalent
   const { displayPrice, displaySeatPrice, displayCurrency } = calculateDisplayPricing(
@@ -174,7 +175,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
           withArrow
         >
           <Button
-            variant={isCurrentTier ? 'filled' : isDowngrade ? 'filled' : isEnterpriseBlockedForFree ? 'light' : 'filled'}
+            variant="filled"
             fullWidth
             onClick={() => isCurrentTier && onManageClick ? onManageClick() : onUpgradeClick(planGroup)}
             disabled={!loginEnabled || isDowngrade || isEnterpriseBlockedForFree}
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx
new file mode 100644
index 0000000000..b9f46bc7c6
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx
@@ -0,0 +1,338 @@
+import React, { useState } from 'react';
+import { Modal, Text, Group, ActionIcon, Stack, Paper, Grid, TextInput, Button, Alert } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { EmailStage } from '@app/components/shared/stripeCheckout/stages/EmailStage';
+import { validateEmail } from '@app/components/shared/stripeCheckout/utils/checkoutUtils';
+import { getClickablePaperStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { STATIC_STRIPE_LINKS, buildStripeUrlWithEmail } from '@app/constants/staticStripeLinks';
+import { alert } from '@app/components/toast';
+import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+import { useIsMobile } from '@app/hooks/useIsMobile';
+import licenseService from '@app/services/licenseService';
+import { useLicense } from '@app/contexts/LicenseContext';
+
+interface StaticCheckoutModalProps {
+  opened: boolean;
+  onClose: () => void;
+  planName: 'server' | 'enterprise';
+  isUpgrade?: boolean;
+}
+
+type Stage = 'email' | 'period-selection' | 'license-activation';
+
+const StaticCheckoutModal: React.FC<StaticCheckoutModalProps> = ({
+  opened,
+  onClose,
+  planName,
+  isUpgrade = false,
+}) => {
+  const { t } = useTranslation();
+  const isMobile = useIsMobile();
+  const { refetchLicense } = useLicense();
+
+  const [stage, setStage] = useState<Stage>('email');
+  const [email, setEmail] = useState('');
+  const [emailError, setEmailError] = useState('');
+  const [stageHistory, setStageHistory] = useState<Stage[]>([]);
+
+  // License activation state
+  const [licenseKey, setLicenseKey] = useState('');
+  const [savingLicense, setSavingLicense] = useState(false);
+  const [licenseActivated, setLicenseActivated] = useState(false);
+
+  const handleEmailSubmit = () => {
+    const validation = validateEmail(email);
+    if (validation.valid) {
+      setEmailError('');
+      setStageHistory([...stageHistory, 'email']);
+      setStage('period-selection');
+    } else {
+      setEmailError(validation.error);
+    }
+  };
+
+  const handlePeriodSelect = (period: 'monthly' | 'yearly') => {
+    const baseUrl = STATIC_STRIPE_LINKS[planName][period];
+    const urlWithEmail = buildStripeUrlWithEmail(baseUrl, email);
+
+    // Open Stripe checkout in new tab
+    window.open(urlWithEmail, '_blank');
+
+    // Transition to license activation stage
+    setStageHistory([...stageHistory, 'period-selection']);
+    setStage('license-activation');
+  };
+
+  const handleActivateLicense = async () => {
+    if (!licenseKey.trim()) {
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.premium.noInput', 'Please provide a license key'),
+      });
+      return;
+    }
+
+    try {
+      setSavingLicense(true);
+      const response = await licenseService.saveLicenseKey(licenseKey.trim());
+
+      if (response.success) {
+        // Refresh license context to update all components
+        await refetchLicense();
+
+        setLicenseActivated(true);
+
+        alert({
+          alertType: 'success',
+          title: t('success', 'Success'),
+          body: t(
+            'admin.settings.premium.key.successMessage',
+            'License key activated successfully'
+          ),
+        });
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
+        });
+      }
+    } catch (error) {
+      console.error('Failed to save license:', error);
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.saveError', 'Failed to save license'),
+      });
+    } finally {
+      setSavingLicense(false);
+    }
+  };
+
+  const handleGoBack = () => {
+    if (stageHistory.length > 0) {
+      const newHistory = [...stageHistory];
+      const previousStage = newHistory.pop();
+      setStageHistory(newHistory);
+      if (previousStage) {
+        setStage(previousStage);
+      }
+    }
+  };
+
+  const handleClose = () => {
+    // Reset state when closing
+    setStage('email');
+    setEmail('');
+    setEmailError('');
+    setStageHistory([]);
+    setLicenseKey('');
+    setSavingLicense(false);
+    setLicenseActivated(false);
+    onClose();
+  };
+
+  const getModalTitle = () => {
+    if (stage === 'email') {
+      if (isUpgrade) {
+        return t('plan.static.upgradeToEnterprise', 'Upgrade to Enterprise');
+      }
+      return planName === 'server'
+        ? t('plan.static.getLicense', 'Get Server License')
+        : t('plan.static.upgradeToEnterprise', 'Upgrade to Enterprise');
+    }
+    if (stage === 'period-selection') {
+      return t('plan.static.selectPeriod', 'Select Billing Period');
+    }
+    if (stage === 'license-activation') {
+      return t('plan.static.activateLicense', 'Activate Your License');
+    }
+    return '';
+  };
+
+  const renderContent = () => {
+    switch (stage) {
+      case 'email':
+        return (
+          <EmailStage
+            emailInput={email}
+            setEmailInput={setEmail}
+            emailError={emailError}
+            onSubmit={handleEmailSubmit}
+          />
+        );
+
+      case 'period-selection':
+        return (
+          <Stack gap="lg" style={{ padding: '1rem 2rem' }}>
+            <Grid gutter="xl" style={{ marginTop: '1rem' }}>
+              {/* Monthly Option */}
+              <Grid.Col span={6}>
+                <Paper
+                  withBorder
+                  p="xl"
+                  radius="md"
+                  style={getClickablePaperStyle()}
+                  onClick={() => handlePeriodSelect('monthly')}
+                >
+                  <Stack gap="md" style={{ height: '100%', minHeight: '120px' }} justify="space-between">
+                    <Text size="lg" fw={600}>
+                      {t('payment.monthly', 'Monthly')}
+                    </Text>
+                    <Text size="sm" c="dimmed">
+                      {t('plan.static.monthlyBilling', 'Monthly Billing')}
+                    </Text>
+                  </Stack>
+                </Paper>
+              </Grid.Col>
+
+              {/* Yearly Option */}
+              <Grid.Col span={6}>
+                <Paper
+                  withBorder
+                  p="xl"
+                  radius="md"
+                  style={getClickablePaperStyle()}
+                  onClick={() => handlePeriodSelect('yearly')}
+                >
+                  <Stack gap="md" style={{ height: '100%', minHeight: '120px' }} justify="space-between">
+                    <Text size="lg" fw={600}>
+                      {t('payment.yearly', 'Yearly')}
+                    </Text>
+                    <Text size="sm" c="dimmed">
+                      {t('plan.static.yearlyBilling', 'Yearly Billing')}
+                    </Text>
+                  </Stack>
+                </Paper>
+              </Grid.Col>
+            </Grid>
+          </Stack>
+        );
+
+      case 'license-activation':
+        return (
+          <Stack gap="lg" style={{ padding: '2rem', maxWidth: '600px', margin: '0 auto' }}>
+            <Alert
+              variant="light"
+              color="blue"
+              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
+            >
+              <Stack gap="sm">
+                <Text size="sm" fw={600}>
+                  {t('plan.static.licenseActivation.checkoutOpened', 'Checkout Opened in New Tab')}
+                </Text>
+                <Text size="sm">
+                  {t(
+                    'plan.static.licenseActivation.instructions',
+                    'Complete your purchase in the Stripe tab. Once your payment is complete, you will receive an email with your license key.'
+                  )}
+                </Text>
+              </Stack>
+            </Alert>
+
+            {licenseActivated ? (
+              <Alert
+                variant="light"
+                color="green"
+                icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
+                title={t('plan.static.licenseActivation.success', 'License Activated!')}
+              >
+                <Text size="sm">
+                  {t(
+                    'plan.static.licenseActivation.successMessage',
+                    'Your license has been successfully activated. You can now close this window.'
+                  )}
+                </Text>
+              </Alert>
+            ) : (
+              <Stack gap="md">
+                <Text size="sm" fw={500}>
+                  {t(
+                    'plan.static.licenseActivation.enterKey',
+                    'Enter your license key below to activate your plan:'
+                  )}
+                </Text>
+
+                <TextInput
+                  label={t('admin.settings.premium.key.label', 'License Key')}
+                  description={t(
+                    'plan.static.licenseActivation.keyDescription',
+                    'Paste the license key from your email'
+                  )}
+                  value={licenseKey}
+                  onChange={(e) => setLicenseKey(e.target.value)}
+                  placeholder="00000000-0000-0000-0000-000000000000"
+                  disabled={savingLicense}
+                  type="password"
+                />
+
+                <Group justify="space-between">
+                  <Button variant="subtle" onClick={handleClose} disabled={savingLicense}>
+                    {t('plan.static.licenseActivation.doLater', "I'll do this later")}
+                  </Button>
+                  <Button
+                    onClick={handleActivateLicense}
+                    loading={savingLicense}
+                    disabled={!licenseKey.trim()}
+                  >
+                    {t('plan.static.licenseActivation.activate', 'Activate License')}
+                  </Button>
+                </Group>
+              </Stack>
+            )}
+
+            {licenseActivated && (
+              <Group justify="flex-end">
+                <Button onClick={handleClose}>
+                  {t('common.close', 'Close')}
+                </Button>
+              </Group>
+            )}
+          </Stack>
+        );
+
+      default:
+        return null;
+    }
+  };
+
+  const canGoBack = stageHistory.length > 0 && stage !== 'license-activation';
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={
+        <Group gap="sm" wrap="nowrap">
+          {canGoBack && (
+            <ActionIcon
+              variant="subtle"
+              size="lg"
+              onClick={handleGoBack}
+              aria-label={t('common.back', 'Back')}
+            >
+              <LocalIcon icon="arrow-back" width={20} height={20} />
+            </ActionIcon>
+          )}
+          <Text fw={600} size="lg">
+            {getModalTitle()}
+          </Text>
+        </Group>
+      }
+      size={isMobile ? '100%' : 600}
+      centered
+      radius="lg"
+      withCloseButton={true}
+      closeOnEscape={true}
+      closeOnClickOutside={false}
+      fullScreen={isMobile}
+      zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+    >
+      {renderContent()}
+    </Modal>
+  );
+};
+
+export default StaticCheckoutModal;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
index ba937263ab..2847ef94e8 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
@@ -1,20 +1,16 @@
-import React, { useState, useEffect } from 'react';
-import { Card, Text, Group, Stack, Badge, Button, Collapse, Alert, TextInput, Paper, Loader, Divider } from '@mantine/core';
+import React, { useState } from 'react';
+import { Card, Text, Stack, Button, Collapse, Divider, Tooltip } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import LocalIcon from '@app/components/shared/LocalIcon';
-import RestartConfirmationModal from '@app/components/shared/config/RestartConfirmationModal';
-import { useRestartServer } from '@app/components/shared/config/useRestartServer';
-import { useAdminSettings } from '@app/hooks/useAdminSettings';
-import PendingBadge from '@app/components/shared/config/PendingBadge';
 import { alert } from '@app/components/toast';
 import { LicenseInfo, mapLicenseToTier } from '@app/services/licenseService';
 import { PLAN_FEATURES, PLAN_HIGHLIGHTS } from '@app/constants/planConstants';
 import FeatureComparisonTable from '@app/components/shared/config/configSections/plan/FeatureComparisonTable';
-
-interface PremiumSettingsData {
-  key?: string;
-  enabled?: boolean;
-}
+import StaticCheckoutModal from '@app/components/shared/config/configSections/plan/StaticCheckoutModal';
+import LicenseKeySection from '@app/components/shared/config/configSections/plan/LicenseKeySection';
+import { STATIC_STRIPE_LINKS } from '@app/constants/staticStripeLinks';
+import { PricingBadge } from '@app/components/shared/stripeCheckout/components/PricingBadge';
+import { getBaseCardStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { isCurrentTier as checkIsCurrentTier, isDowngrade as checkIsDowngrade, isEnterpriseBlockedForFree } from '@app/utils/planTierUtils';
 
 interface StaticPlanSectionProps {
   currentLicenseInfo?: LicenseInfo;
@@ -22,38 +18,45 @@ interface StaticPlanSectionProps {
 
 const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInfo }) => {
   const { t } = useTranslation();
-  const [showLicenseKey, setShowLicenseKey] = useState(false);
   const [showComparison, setShowComparison] = useState(false);
 
-  // Premium/License key management
-  const { restartModalOpened, showRestartModal, closeRestartModal, restartServer } = useRestartServer();
-  const {
-    settings: premiumSettings,
-    setSettings: setPremiumSettings,
-    loading: premiumLoading,
-    saving: premiumSaving,
-    fetchSettings: fetchPremiumSettings,
-    saveSettings: savePremiumSettings,
-    isFieldPending,
-  } = useAdminSettings<PremiumSettingsData>({
-    sectionName: 'premium',
-  });
+  // Static checkout modal state
+  const [checkoutModalOpened, setCheckoutModalOpened] = useState(false);
+  const [selectedPlan, setSelectedPlan] = useState<'server' | 'enterprise'>('server');
+  const [isUpgrade, setIsUpgrade] = useState(false);
 
-  useEffect(() => {
-    fetchPremiumSettings();
-  }, []);
-
-  const handleSaveLicense = async () => {
-    try {
-      await savePremiumSettings();
-      showRestartModal();
-    } catch (_error) {
+  const handleOpenCheckout = (plan: 'server' | 'enterprise', upgrade: boolean) => {
+    // Prevent Free → Enterprise (must have Server first)
+    const currentTier = mapLicenseToTier(currentLicenseInfo || null);
+    if (currentTier === 'free' && plan === 'enterprise') {
       alert({
-        alertType: 'error',
-        title: t('admin.error', 'Error'),
-        body: t('admin.settings.saveError', 'Failed to save settings'),
+        alertType: 'warning',
+        title: t('plan.enterprise.requiresServer', 'Server Plan Required'),
+        body: t(
+          'plan.enterprise.requiresServerMessage',
+          'Please upgrade to the Server plan first before upgrading to Enterprise.'
+        ),
       });
+      return;
     }
+
+    setSelectedPlan(plan);
+    setIsUpgrade(upgrade);
+    setCheckoutModalOpened(true);
+  };
+
+  const handleManageBilling = () => {
+    // Show warning about email verification
+    alert({
+      alertType: 'warning',
+      title: t('plan.static.billingPortal.title', 'Email Verification Required'),
+      body: t(
+        'plan.static.billingPortal.message',
+        'You will need to verify your email address in the Stripe billing portal. Check your email for a login link.'
+      ),
+    });
+
+    window.open(STATIC_STRIPE_LINKS.billingPortal, '_blank');
   };
 
   const staticPlans = [
@@ -122,7 +125,7 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
             display: 'grid',
             gridTemplateColumns: 'repeat(3, 1fr)',
             gap: '1rem',
-            paddingBottom: '1rem',
+            paddingBottom: '0.1rem',
           }}
         >
           {staticPlans.map((plan) => (
@@ -131,53 +134,27 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
               padding="lg"
               radius="md"
               withBorder
-              style={{
-                position: 'relative',
-                display: 'flex',
-                flexDirection: 'column',
-                borderColor: plan.id === currentPlan.id ? 'var(--mantine-color-green-6)' : undefined,
-                borderWidth: plan.id === currentPlan.id ? '2px' : undefined,
-              }}
+              style={getBaseCardStyle(plan.id === currentPlan.id)}
+              className="plan-card"
             >
               {plan.id === currentPlan.id && (
-                <Badge
-                  color="green"
-                  variant="filled"
-                  size="sm"
-                  style={{ position: 'absolute', top: '1rem', right: '1rem' }}
-                >
-                  {t('plan.current', 'Current Plan')}
-                </Badge>
+                <PricingBadge
+                  type="current"
+                  label={t('plan.current', 'Current Plan')}
+                />
               )}
               {plan.popular && plan.id !== currentPlan.id && (
-                <Badge
-                  variant="filled"
-                  size="xs"
-                  style={{ position: 'absolute', top: '0.5rem', right: '0.5rem' }}
-                >
-                  {t('plan.popular', 'Popular')}
-                </Badge>
+                <PricingBadge
+                  type="popular"
+                  label={t('plan.popular', 'Popular')}
+                />
               )}
 
               <Stack gap="md" style={{ height: '100%' }}>
                 <div>
-                  <Text size="lg" fw={600}>
+                  <Text size="xl" fw={700} style={{ fontSize: '2rem' }}>
                     {plan.name}
                   </Text>
-                  <Group gap="xs" style={{ alignItems: 'baseline' }}>
-                    <Text size="xl" fw={700} style={{ fontSize: '2rem' }}>
-                      {plan.price === 0 && plan.id !== 'free'
-                        ? t('plan.customPricing', 'Custom')
-                        : plan.price === 0
-                          ? t('plan.free.name', 'Free')
-                          : `${plan.currency}${plan.price}`}
-                    </Text>
-                    {plan.period && (
-                      <Text size="sm" c="dimmed">
-                        {plan.period}
-                      </Text>
-                    )}
-                  </Group>
                   <Text size="xs" c="dimmed" mt="xs">
                     {typeof plan.maxUsers === 'string'
                       ? plan.maxUsers
@@ -195,18 +172,123 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
 
                 <div style={{ flexGrow: 1 }} />
 
-                <Button
-                  variant={plan.id === currentPlan.id ? 'light' : 'filled'}
-                  disabled={plan.id === currentPlan.id}
-                  fullWidth
-                  onClick={() =>
-                    window.open('https://www.stirling.com/contact', '_blank')
+                {/* Tier-based button logic */}
+                {(() => {
+                  const currentTier = mapLicenseToTier(currentLicenseInfo || null);
+                  const isCurrent = checkIsCurrentTier(currentTier, plan.id);
+                  const isDowngradePlan = checkIsDowngrade(currentTier, plan.id);
+
+                  // Free Plan
+                  if (plan.id === 'free') {
+                    return (
+                      <Button
+                        variant="filled"
+                        disabled
+                        fullWidth
+                        className="plan-button"
+                      >
+                        {isCurrent
+                          ? t('plan.current', 'Current Plan')
+                          : t('plan.free.included', 'Included')}
+                      </Button>
+                    );
                   }
-                >
-                  {plan.id === currentPlan.id
-                    ? t('plan.current', 'Current Plan')
-                    : t('plan.contact', 'Contact Us')}
-                </Button>
+
+                  // Server Plan
+                  if (plan.id === 'server') {
+                    if (currentTier === 'free') {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={() => handleOpenCheckout('server', false)}
+                          className="plan-button"
+                        >
+                          {t('plan.upgrade', 'Upgrade')}
+                        </Button>
+                      );
+                    }
+                    if (isCurrent) {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={handleManageBilling}
+                          className="plan-button"
+                        >
+                          {t('plan.manage', 'Manage')}
+                        </Button>
+                      );
+                    }
+                    if (isDowngradePlan) {
+                      return (
+                        <Button
+                          variant="filled"
+                          disabled
+                          fullWidth
+                          className="plan-button"
+                        >
+                          {t('plan.free.included', 'Included')}
+                        </Button>
+                      );
+                    }
+                  }
+
+                  // Enterprise Plan
+                  if (plan.id === 'enterprise') {
+                    if (isEnterpriseBlockedForFree(currentTier, plan.id)) {
+                      return (
+                        <Tooltip label={t('plan.enterprise.requiresServer', 'Requires Server plan')} position="top" withArrow>
+                          <Button
+                            variant="filled"
+                            disabled
+                            fullWidth
+                            className="plan-button"
+                          >
+                            {t('plan.enterprise.requiresServer', 'Requires Server')}
+                          </Button>
+                        </Tooltip>
+                      );
+                    }
+                    if (currentTier === 'server') {
+                      // TODO: Re-enable checkout flow when account syncing is ready
+                      // return (
+                      //   <Button
+                      //     variant="filled"
+                      //     fullWidth
+                      //     onClick={() => handleOpenCheckout('enterprise', true)}
+                      //     className="plan-button"
+                      //   >
+                      //     {t('plan.selectPlan', 'Select Plan')}
+                      //   </Button>
+                      // );
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          disabled
+                          className="plan-button"
+                        >
+                          {t('plan.contact', 'Contact Us')}
+                        </Button>
+                      );
+                    }
+                    if (isCurrent) {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={handleManageBilling}
+                          className="plan-button"
+                        >
+                          {t('plan.manage', 'Manage')}
+                        </Button>
+                      );
+                    }
+                  }
+
+                  return null;
+                })()}
               </Stack>
             </Card>
           ))}
@@ -230,66 +312,14 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
       <Divider />
 
       {/* License Key Section */}
-      <div>
-        <Button
-          variant="subtle"
-          leftSection={<LocalIcon icon={showLicenseKey ? "expand-less-rounded" : "expand-more-rounded"} width="1.25rem" height="1.25rem" />}
-          onClick={() => setShowLicenseKey(!showLicenseKey)}
-        >
-          {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
-        </Button>
+      <LicenseKeySection currentLicenseInfo={currentLicenseInfo} />
 
-        <Collapse in={showLicenseKey} mt="md">
-          <Stack gap="md">
-            <Alert
-              variant="light"
-              color="blue"
-              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
-            >
-              <Text size="sm">
-                {t('admin.settings.premium.licenseKey.info', 'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.')}
-              </Text>
-            </Alert>
-
-            {premiumLoading ? (
-              <Stack align="center" justify="center" h={100}>
-                <Loader size="md" />
-              </Stack>
-            ) : (
-              <Paper withBorder p="md" radius="md">
-                <Stack gap="md">
-                  <div>
-                    <TextInput
-                      label={
-                        <Group gap="xs">
-                          <span>{t('admin.settings.premium.key.label', 'License Key')}</span>
-                          <PendingBadge show={isFieldPending('key')} />
-                        </Group>
-                      }
-                      description={t('admin.settings.premium.key.description', 'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.')}
-                      value={premiumSettings.key || ''}
-                      onChange={(e) => setPremiumSettings({ ...premiumSettings, key: e.target.value })}
-                      placeholder="00000000-0000-0000-0000-000000000000"
-                    />
-                  </div>
-
-                  <Group justify="flex-end">
-                    <Button onClick={handleSaveLicense} loading={premiumSaving} size="sm">
-                      {t('admin.settings.save', 'Save Changes')}
-                    </Button>
-                  </Group>
-                </Stack>
-              </Paper>
-            )}
-          </Stack>
-        </Collapse>
-      </div>
-
-      {/* Restart Confirmation Modal */}
-      <RestartConfirmationModal
-        opened={restartModalOpened}
-        onClose={closeRestartModal}
-        onRestart={restartServer}
+      {/* Static Checkout Modal */}
+      <StaticCheckoutModal
+        opened={checkoutModalOpened}
+        onClose={() => setCheckoutModalOpened(false)}
+        planName={selectedPlan}
+        isUpgrade={isUpgrade}
       />
     </div>
   );
diff --git a/frontend/src/proprietary/constants/staticStripeLinks.ts b/frontend/src/proprietary/constants/staticStripeLinks.ts
new file mode 100644
index 0000000000..3fb45b28cd
--- /dev/null
+++ b/frontend/src/proprietary/constants/staticStripeLinks.ts
@@ -0,0 +1,56 @@
+/**
+ * Static Stripe payment links for offline/self-hosted environments
+ *
+ * These links are used when Supabase is not configured, allowing users to
+ * purchase licenses directly through Stripe hosted checkout pages.
+ *
+ * NOTE: These are test environment URLs. Replace with production URLs before release.
+ */
+
+export interface StaticStripeLinks {
+  server: {
+    monthly: string;
+    yearly: string;
+  };
+  enterprise: {
+    monthly: string;
+    yearly: string;
+  };
+  billingPortal: string;
+}
+// PRODCUTION LINKS FOR LIVE SERVER
+export const STATIC_STRIPE_LINKS: StaticStripeLinks = {
+  server: {
+    monthly: 'https://buy.stripe.com/fZu4gB8Nv6ysfAj0ts8Zq03',
+    yearly: 'https://buy.stripe.com/9B68wR6Fn0a40Fpcca8Zq02',
+  },
+  enterprise: {
+    monthly: '',
+    yearly: '',
+  },
+  billingPortal: 'https://billing.stripe.com/p/login/test_aFa5kv1Mz2s10Fr3Cp83C00',
+};
+
+// LINKS FOR TEST SERVER: 
+// export const STATIC_STRIPE_LINKS: StaticStripeLinks = {
+//   server: {
+//     monthly: 'https://buy.stripe.com/test_8x27sD4YL9Ut0Fr3Cp83C02',
+//     yearly: 'https://buy.stripe.com/test_4gMdR11Mz4A9ag17SF83C03',
+//   },
+//   enterprise: {
+//     monthly: 'https://buy.stripe.com/test_8x2cMX9f18Qp9bX0qd83C04',
+//     yearly: 'https://buy.stripe.com/test_6oU00b2QD2s173P6OB83C05',
+//   },
+//   billingPortal: 'https://billing.stripe.com/p/login/test_aFa5kv1Mz2s10Fr3Cp83C00',
+// };
+
+/**
+ * Builds a Stripe URL with a prefilled email parameter
+ * @param baseUrl - The base Stripe checkout URL
+ * @param email - The email address to prefill
+ * @returns The complete URL with encoded email parameter
+ */
+export function buildStripeUrlWithEmail(baseUrl: string, email: string): string {
+  const encodedEmail = encodeURIComponent(email);
+  return `${baseUrl}?locked_prefilled_email=${encodedEmail}`;
+}
diff --git a/frontend/src/proprietary/testing/serverExperienceSimulations.ts b/frontend/src/proprietary/testing/serverExperienceSimulations.ts
index 0aa745d54f..022910d0aa 100644
--- a/frontend/src/proprietary/testing/serverExperienceSimulations.ts
+++ b/frontend/src/proprietary/testing/serverExperienceSimulations.ts
@@ -48,9 +48,10 @@ const FREE_LICENSE_INFO: LicenseInfo = {
 
 const BASE_NO_LOGIN_CONFIG: AppConfig = {
   enableAnalytics: true,
-  appVersion: '2.0.0',
+  appVersion: '2.1.3',
   serverCertificateEnabled: false,
   enableAlphaFunctionality: false,
+  enableDesktopInstallSlide: true,
   serverPort: 8080,
   premiumEnabled: false,
   runningProOrHigher: false,
diff --git a/frontend/src/proprietary/utils/planTierUtils.ts b/frontend/src/proprietary/utils/planTierUtils.ts
new file mode 100644
index 0000000000..e4fa12f625
--- /dev/null
+++ b/frontend/src/proprietary/utils/planTierUtils.ts
@@ -0,0 +1,40 @@
+/**
+ * Shared utilities for plan tier comparisons and button logic
+ */
+
+export type PlanTier = 'free' | 'server' | 'enterprise';
+
+const TIER_HIERARCHY: Record<PlanTier, number> = {
+  'free': 1,
+  'server': 2,
+  'enterprise': 3,
+};
+
+/**
+ * Get numeric level for a tier
+ */
+export function getTierLevel(tier: PlanTier | string | null | undefined): number {
+  if (!tier) return 1;
+  return TIER_HIERARCHY[tier as PlanTier] || 1;
+}
+
+/**
+ * Check if target tier is the current tier
+ */
+export function isCurrentTier(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return getTierLevel(currentTier) === getTierLevel(targetTier);
+}
+
+/**
+ * Check if target tier is a downgrade from current tier
+ */
+export function isDowngrade(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return getTierLevel(currentTier) > getTierLevel(targetTier);
+}
+
+/**
+ * Check if enterprise is blocked for free tier users
+ */
+export function isEnterpriseBlockedForFree(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return currentTier === 'free' && targetTier === 'enterprise';
+}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 0eb35e94cc..f8d52908d9 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { viteStaticCopy } from 'vite-plugin-static-copy';
 
 export default defineConfig(({ mode }) => {
   // When DISABLE_ADDITIONAL_FEATURES is false (or unset), enable proprietary features
@@ -20,6 +21,15 @@ export default defineConfig(({ mode }) => {
       tsconfigPaths({
         projects: [tsconfigProject],
       }),
+      viteStaticCopy({
+        targets: [
+          {
+            //provides static pdfium so embedpdf can run without cdn
+            src: 'node_modules/@embedpdf/pdfium/dist/pdfium.wasm',
+            dest: 'pdfium'
+          }
+        ]
+      })
     ],
     server: {
       host: true,