Split cli and gui bins

.dockerignore

@@ -0,0 +1,33 @@
+# Git
+.git/
+.gitignore
+
+# Rust build artifacts
+target/
+Cargo.lock
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Documentation
+*.md
+LICENSE
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+
+# Testing
+tests/
+benches/
+
+# Development files
+*.log
+*.tmp

.github/workflows/main.yml

@@ -7,25 +7,37 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  BINARY_NAME: khm
+  CLI_BINARY_NAME: khm
+  DESKTOP_BINARY_NAME: khm-desktop
 
 jobs:
   build:
     name: Build static binary
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
         include:
+          # - os: ubuntu-latest
+          #   build_target: x86_64-unknown-linux-musl
+          #   platform_name: linux-amd64-musl
+          #   build_type: musl
           - os: ubuntu-latest
-            build_target: x86_64-unknown-linux-musl
+            build_target: x86_64-unknown-linux-gnu
             platform_name: linux-amd64
+            build_type: dynamic
+          - os: ubuntu-latest
+            build_target: aarch64-unknown-linux-gnu
+            platform_name: linux-arm64
+            build_type: dynamic  # CLI only - GUI deps too complex for cross-compilation
           - os: windows-latest
             build_target: x86_64-pc-windows-msvc
             platform_name: windows-amd64
+            build_type: default
           - os: macos-latest
             build_target: aarch64-apple-darwin
             platform_name: macos-arm64
+            build_type: default
     permissions:
       contents: write
     steps:
@@ -60,79 +72,149 @@ jobs:
       - name: Install rust targets
         run: rustup target add ${{ matrix.build_target }}
         
-      - name: Build Linux MUSL
-        if: matrix.os == 'ubuntu-latest'
-        uses: gmiam/rust-musl-action@master
-        with:
-          args: cargo build --target ${{ matrix.build_target }} --release
+      - name: Install Linux x86_64 dependencies
+        if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'dynamic' && matrix.build_target == 'x86_64-unknown-linux-gnu'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libssl-dev pkg-config libgtk-3-dev libglib2.0-dev libcairo2-dev libpango1.0-dev libatk1.0-dev libgdk-pixbuf2.0-dev libxdo-dev libayatana-appindicator3-dev
+          
+      - name: Install Linux ARM64 cross-compilation dependencies
+        if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'dynamic' && matrix.build_target == 'aarch64-unknown-linux-gnu'
+        run: |
+          sudo apt-get update
+          # Install cross-compilation tools and build dependencies for vendored OpenSSL
+          sudo apt-get install -y gcc-aarch64-linux-gnu pkg-config libssl-dev build-essential make perl
+          
+      - name: Build Linux x86_64
+        if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'dynamic' && matrix.build_target == 'x86_64-unknown-linux-gnu'
+        run: |
+          # Build CLI without GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm --no-default-features --features cli
+          # Build Desktop with GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm-desktop
+        
+      - name: Build Linux ARM64 (CLI only)
+        if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'dynamic' && matrix.build_target == 'aarch64-unknown-linux-gnu'
+        env:
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+          CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
+          CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
+        run: cargo build --target ${{ matrix.build_target }} --release --bin khm --no-default-features --features cli
+        
+      # - name: Build Linux MUSL (no GUI)
+      #   if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'musl'
+      #   uses: gmiam/rust-musl-action@master
+      #   with:
+      #     args: |
+      #       sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
+      #       sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list
+      #       sed -i '/buster-updates/d' /etc/apt/sources.list
+      #       apt-get update && apt-get install -y pkg-config
+      #       cargo build --target ${{ matrix.build_target }} --release --no-default-features --features server
           
       - name: Build MacOS
         if: matrix.os == 'macos-latest'
-        run: cargo build --target ${{ matrix.build_target }} --release
+        run: |
+          # Build CLI without GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm --no-default-features --features cli
+          # Build Desktop with GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm-desktop
           
       - name: Build Windows
         if: matrix.os == 'windows-latest'
-        run: cargo build --target ${{ matrix.build_target }} --release
+        run: |
+          # Build CLI without GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm --no-default-features --features cli
+          # Build Desktop with GUI features
+          cargo build --target ${{ matrix.build_target }} --release --bin khm-desktop
           
-      - name: Upload artifact
+      - name: Upload CLI artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-          path: target/${{ matrix.build_target }}/release/${{ env.BINARY_NAME }}*
+          name: ${{ env.CLI_BINARY_NAME }}_${{ matrix.platform_name }}
+          path: |
+            target/${{ matrix.build_target }}/release/${{ env.CLI_BINARY_NAME }}${{ matrix.os == 'windows-latest' && '.exe' || '' }}
+            
+      - name: Upload Desktop artifact
+        # Only upload desktop binary for x86_64 platforms (not ARM64)
+        if: matrix.build_target != 'aarch64-unknown-linux-gnu'
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.DESKTOP_BINARY_NAME }}_${{ matrix.platform_name }}
+          path: |
+            target/${{ matrix.build_target }}/release/${{ env.DESKTOP_BINARY_NAME }}${{ matrix.os == 'windows-latest' && '.exe' || '' }}
+        continue-on-error: true  # Don't fail if desktop binary doesn't build on some platforms
 
   release:
-    name: Create Release Page
+    name: Create Release and Upload Assets
+    if: always()  # Always run even if some builds fail
     needs: build
     runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
+          path: artifacts/
+      
+      - name: Prepare release assets
+        run: |
+          mkdir -p release-assets/
+          # Copy files with proper naming from each artifact directory
+          for artifact_dir in artifacts/*/; do
+            if [[ -d "$artifact_dir" ]]; then
+              artifact_name=$(basename "$artifact_dir")
+              echo "Processing artifact: $artifact_name"
+              
+              # Extract binary type and platform from artifact name
+              if [[ "$artifact_name" =~ ^khm-desktop_(.*)$ ]]; then
+                binary_type="desktop"
+                platform="${BASH_REMATCH[1]}"
+                binary_name="${{ env.DESKTOP_BINARY_NAME }}"
+              elif [[ "$artifact_name" =~ ^khm_(.*)$ ]]; then
+                binary_type="cli"
+                platform="${BASH_REMATCH[1]}"
+                binary_name="${{ env.CLI_BINARY_NAME }}"
+              else
+                echo "Unknown artifact format: $artifact_name"
+                continue
+              fi
+              
+              echo "Binary type: $binary_type, Platform: $platform, Binary name: $binary_name"
+              
+              # For Windows, look for .exe file specifically
+              if [[ "$platform" == "windows-amd64" ]]; then
+                exe_file=$(find "$artifact_dir" -name "${binary_name}.exe" -type f | head -1)
+                if [[ -n "$exe_file" ]]; then
+                  cp "$exe_file" "release-assets/${binary_name}_${platform}.exe"
+                  echo "Copied: $exe_file -> release-assets/${binary_name}_${platform}.exe"
+                fi
+              else
+                # For Linux/macOS, look for binary without extension
+                binary_file=$(find "$artifact_dir" -name "${binary_name}" -type f | head -1)
+                if [[ -n "$binary_file" ]]; then
+                  cp "$binary_file" "release-assets/${binary_name}_${platform}"
+                  echo "Copied: $binary_file -> release-assets/${binary_name}_${platform}"
+                fi
+              fi
+            fi
+          done
+          
+          echo "Final release assets:"
+          ls -la release-assets/
+      
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: Release ${{ github.ref_name }}
+          files: release-assets/*
           draft: false
           prerelease: false
-
-  upload:
-    name: Upload Release Assets
-    needs: release
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - os: ubuntu-latest
-            platform_name: linux-amd64
-          - os: windows-latest
-            platform_name: windows-amd64
-          - os: macos-latest
-            platform_name: macos-arm64
-    steps:
-      - uses: actions/checkout@v4
-      
-      - uses: actions/download-artifact@v4
-        name: Download ${{ matrix.platform_name }} artifact
-        with:
-          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-          path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
-          
-      - name: Upload Release Asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}/${{ env.BINARY_NAME }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
-          asset_name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
-          asset_content_type: application/octet-stream
+          generate_release_notes: true
+          fail_on_unmatched_files: false
 
   build_docker:
     name: Build and Publish Docker Image
@@ -141,15 +223,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
-      - uses: actions/download-artifact@v4
-        name: Download Linux artifact
+      - name: Download Linux AMD64 CLI artifact
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.BINARY_NAME }}_linux-amd64
-          path: .
+          name: ${{ env.CLI_BINARY_NAME }}_linux-amd64
+          path: amd64/
           
-      - name: ls
+      - name: Download Linux ARM64 CLI artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ env.CLI_BINARY_NAME }}_linux-arm64
+          path: arm64/
+          
+      - name: Prepare binaries for multi-arch build
         run: |
-          ls -lah
+          mkdir -p bin/linux_amd64 bin/linux_arm64
+          cp amd64/${{ env.CLI_BINARY_NAME }} bin/linux_amd64/${{ env.CLI_BINARY_NAME }}
+          cp arm64/${{ env.CLI_BINARY_NAME }} bin/linux_arm64/${{ env.CLI_BINARY_NAME }}
+          chmod +x bin/linux_amd64/${{ env.CLI_BINARY_NAME }}
+          chmod +x bin/linux_arm64/${{ env.CLI_BINARY_NAME }}
+          ls -la bin/*/
           
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -163,10 +256,6 @@ jobs:
           username: ultradesu
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           
-      - name: Set exec flag
-        run: |
-          chmod +x ${{ env.BINARY_NAME }}
-          
       - name: Set outputs
         id: get_tag
         run: |
@@ -178,5 +267,5 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ultradesu/${{ env.BINARY_NAME }}:latest,ultradesu/${{ env.BINARY_NAME }}:${{ steps.get_tag.outputs.tag }}
+          tags: ultradesu/${{ env.CLI_BINARY_NAME }}:latest,ultradesu/${{ env.CLI_BINARY_NAME }}:${{ steps.get_tag.outputs.tag }}
 

Cargo.toml

@@ -1,22 +1,65 @@
 [package]
 name = "khm"
-version = "0.6.2"
+version = "0.7.1"
 edition = "2021"
 authors = ["AB <ab@hexor.cy>"]
+description = "KHM - Known Hosts Manager for SSH key management and synchronization"
+homepage = "https://github.com/house-of-vanity/khm"
+repository = "https://github.com/house-of-vanity/khm"
+license = "WTFPL"
+keywords = ["ssh", "known-hosts", "security", "system-admin", "automation"]
+categories = ["command-line-utilities", "network-programming"]
+
+[[bin]]
+name = "khm"
+path = "src/bin/cli.rs"
+
+[[bin]]
+name = "khm-desktop"
+path = "src/bin/desktop.rs"
+required-features = ["gui"]
 
 [dependencies]
 actix-web = "4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-env_logger = "0.11.3"
 log = "0.4"
 regex = "1.10.5"
 base64 = "0.21"
-tokio = { version = "1", features = ["full"] }
+tokio = { version = "1", features = ["full", "sync"] }
 tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 clap = { version = "4", features = ["derive"] }
 chrono = "0.4.38"
 reqwest = { version = "0.12", features = ["json"] }
+trust-dns-resolver = "0.23"
+futures = "0.3"
 hostname = "0.3"
 rust-embed = "8.0"
+tray-icon = { version = "0.21", optional = true }
+notify = { version = "6.1", optional = true }
+notify-debouncer-mini = { version = "0.4", optional = true }
+dirs = "5.0"
+eframe = { version = "0.29", optional = true }
+egui = { version = "0.29", optional = true }
+winit = { version = "0.30", optional = true }
+env_logger = "0.11"
+urlencoding = "2.1"
+
+# Linux-specific dependencies for GTK tray support
+[target.'cfg(target_os = "linux")'.dependencies]
+gtk = { version = "0.18", optional = true }
+glib = { version = "0.18", optional = true }
+
+[features]
+default = ["server", "web", "gui"]
+cli = ["server", "web"]
+desktop = ["gui"]
+gui = ["tray-icon", "eframe", "egui", "winit", "notify", "notify-debouncer-mini", "gtk", "glib"]
+server = []
+web = []
+
+# Target-specific dependencies for cross-compilation
+[target.aarch64-unknown-linux-gnu.dependencies]
+openssl = { version = "0.10", features = ["vendored"] }
+

Dockerfile

@@ -1,5 +1,19 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:latest
-COPY khm /usr/local/bin/khm
-ENTRYPOINT ["/usr/local/bin/khm"]
+FROM debian:12-slim
+
+# Install only essential runtime dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy the CLI binary (without GUI dependencies)
+ARG TARGETARCH
+COPY bin/linux_${TARGETARCH}/khm /usr/local/bin/khm
+RUN chmod +x /usr/local/bin/khm
+
+# Create non-root user
+RUN useradd -m -u 1000 khm
+USER khm
+
+ENTRYPOINT ["/usr/local/bin/khm"]

README.MD

@@ -1,65 +1,166 @@
 # KHM - Known Hosts Manager
 
-KHM allows you to synchronize the `known_hosts` file across multiple hosts. This application manages SSH keys and flows, either as a server or client. In server mode, it stores keys and flows in a PostgreSQL database. In client mode, it sends keys to the server and can update the `known_hosts` file with keys from the server.
+KHM is a comprehensive SSH key management tool that allows you to synchronize `known_hosts` files across multiple hosts and environments. The application supports multiple operation modes: server mode for centralized key storage, client mode for synchronization, and GUI mode for easy management.
 
 ## Features
 
-- Synchronize `known_hosts` file across multiple hosts.
-- Manage SSH keys and flows in a PostgreSQL database.
-- Operate in both server and client modes.
-- Automatically update `known_hosts` file with keys from the server.
+- **Multi-mode operation**: Server, client, and GUI modes
+- **Centralized key management**: Store SSH keys and flows in PostgreSQL database
+- **Cross-platform GUI**: Modern tray application with settings window
+- **Automatic synchronization**: Keep `known_hosts` files updated across environments
+- **Flow-based organization**: Manage different environments (production, staging, development)
+- **Authentication support**: Basic authentication for secure API access
+- **Real-time monitoring**: Auto-sync capabilities with configurable intervals
 
-## Usage
+## Operation Modes
 
 ### Server Mode
-
-To run the application in server mode, use the following command:
+Runs a web server that stores and manages SSH keys in a PostgreSQL database.
 
 ```bash
-khm --server --ip 127.0.0.1 --port 8080 --db-host 127.0.0.1 --db-name khm --db-user admin --db-password <SECRET> --flows work,home
+khm --server --ip 0.0.0.0 --port 1337 --db-host psql.psql.svc --db-name khm --db-user admin --db-password <SECRET> --flows work,home
 ```
 
 ### Client Mode
-
-To run the application in client mode, use the following command:
+Connects to a KHM server to send local keys and optionally sync the `known_hosts` file.
 
 ```bash
-khm --host http://khm.example.com:8080/<FLOW_NAME>/ --known-hosts ~/.ssh/known_hosts --in-place
+khm --host https://khm.example.com --flow work --known-hosts ~/.ssh/known_hosts --in-place
 ```
 
-### Arguments
-Options:
-- `--server` Run in server mode
-- `--in-place` Server mode: Sync the known_hosts file with keys from the server
-- `--flows <FLOWS>...` Server mode: Comma-separated list of flows to manage [default: default]
-- `-i, --ip <IP>` Server mode: IP address to bind the server to [default: 127.0.0.1]
-- `-p, --port <PORT>` Server mode: Port to bind the server to [default: 8080]
-- `--db-host <DB_HOST>` Server mode: Hostname or IP address of the PostgreSQL database [default: 127.0.0.1]
-- `--db-name <DB_NAME>` Server mode: Name of the PostgreSQL database [default: khm]
-- `--db-user <DB_USER>` Server mode: Username for the PostgreSQL database
-- `--db-password <DB_PASSWORD>` Server mode: Password for the PostgreSQL database
-- `--basic-auth <BASIC_AUTH>` Client mode: Basic Auth credentials [default: ""]
-- `--host <HOST>` Client mode: Full host address of the server to connect to. Like `https://khm.example.com/<FLOW_NAME>`
-- `--known-hosts <KNOWN_HOSTS>` Client mode: Path to the known_hosts file [default: ~/.ssh/known_hosts]
+### GUI Mode
+Launches a system tray application with a modern interface for easy management.
 
+```bash
+# Run tray application
+khm --gui
+
+# Run settings window only
+khm --settings-ui
+```
+
+## Command Line Arguments
+
+### General Options
+- `--server` - Run in server mode
+- `--gui` - Run with GUI tray interface
+- `--settings-ui` - Run settings UI window (used with --gui)
+
+### Server Mode Options
+- `-i, --ip <IP>` - IP address to bind the server to [default: 127.0.0.1]
+- `-p, --port <PORT>` - Port to bind the server to [default: 8080]
+- `--flows <FLOWS>` - Comma-separated list of flows to manage [default: default]
+- `--db-host <DB_HOST>` - PostgreSQL database hostname [default: 127.0.0.1]
+- `--db-name <DB_NAME>` - PostgreSQL database name [default: khm]
+- `--db-user <DB_USER>` - PostgreSQL database username (required)
+- `--db-password <DB_PASSWORD>` - PostgreSQL database password (required)
+
+### Client Mode Options
+- `--host <HOST>` - Server URL (e.g., https://khm.example.com) (required)
+- `--flow <FLOW>` - Flow name to use on the server (required)
+- `--known-hosts <PATH>` - Path to known_hosts file [default: ~/.ssh/known_hosts]
+- `--in-place` - Update known_hosts file with server keys after sync
+- `--basic-auth <CREDENTIALS>` - Basic authentication (format: user:pass)
+
+## GUI Features
+
+The GUI mode provides:
+
+- **System Tray Integration**: Runs quietly in the system tray
+- **Settings Management**: Easy configuration through modern UI
+- **Connection Testing**: Built-in server connectivity testing
+- **Manual Synchronization**: On-demand sync operations
+- **Auto-sync Configuration**: Configurable automatic synchronization intervals
+- **Operation Logging**: Real-time activity monitoring
+- **Cross-platform Paths**: Automatic path handling for different operating systems
 
 ## Installation
 
-1. Ensure you have Rust installed. If not, you can install it from [rustup.rs](https://rustup.rs/).
+### From Binary Releases
+Download the latest binary from the [Releases](https://github.com/house-of-vanity/khm/releases) page.
+
+### From Source
+1. Install Rust from [rustup.rs](https://rustup.rs/)
 2. Clone the repository:
-    ```bash
-    git clone https://github.com/house-of-vanity/khm.git
-    cd khm
-    ```
-3. Run the project:
-    ```bash
-    cargo run --release -- --help
-    ```
+   ```bash
+   git clone https://github.com/house-of-vanity/khm.git
+   cd khm
+   ```
+3. Build and run:
+   ```bash
+   # Build both binaries (CLI without GUI, Desktop with GUI)
+   cargo build --release --bin khm --no-default-features --features cli
+   cargo build --release --bin khm-desktop
+   
+   # Or build all at once with default features
+   cargo build --release
+   ```
+
+### System Dependencies
+For GUI features on Linux:
+```bash
+# Build dependencies
+sudo apt-get install libgtk-3-dev libglib2.0-dev libcairo2-dev libpango1.0-dev libatk1.0-dev libgdk-pixbuf2.0-dev
+```
+
+## Configuration
+
+### GUI Configuration
+Settings are automatically saved to:
+- **Windows**: `%USERPROFILE%\.khm\khm_config.json`
+- **macOS**: `~/.khm/khm_config.json`
+- **Linux**: `~/.khm/khm_config.json`
+
+### Example Configuration
+```json
+{
+  "host": "https://khm.example.com",
+  "flow": "production",
+  "known_hosts": "/home/user/.ssh/known_hosts",
+  "basic_auth": "",
+  "in_place": true,
+  "auto_sync_interval_minutes": 60
+}
+```
+
+## Examples
+
+### Complete Server Setup
+```bash
+# Start server with multiple flows
+khm --server \
+    --ip 0.0.0.0 \
+    --port 8080 \
+    --db-host localhost \
+    --db-name khm \
+    --db-user khm_user \
+    --db-password secure_password \
+    --flows production,staging,development
+```
+
+### Client Synchronization
+```bash
+# Send keys and update local known_hosts
+khm --host https://khm.company.com \
+    --flow production \
+    --known-hosts ~/.ssh/known_hosts \
+    --in-place \
+    --basic-auth "username:password"
+```
+
+### GUI Usage
+```bash
+# Launch tray application
+khm --gui
+
+# Open settings window directly
+khm --settings-ui
+```
 
 ## Contributing
 
-Contributions are welcome! Please open an issue or submit a pull request for any changes.
+Contributions are welcome! Please feel free to submit issues, feature requests, or pull requests.
 
 ## License
 
-This project is licensed under the WTFPL License.
+This project is licensed under the WTFPL License - see the [LICENSE](LICENSE) file for details.

docker-compose.yml

@@ -0,0 +1,34 @@
+version: '3.8'
+
+services:
+  khm:
+    image: ultradesu/khm:latest
+    restart: unless-stopped
+    environment:
+      # Server mode configuration
+      - KHM_SERVER=true
+      - KHM_IP=0.0.0.0
+      - KHM_PORT=8080
+      - KHM_DB_HOST=postgres
+      - KHM_DB_NAME=khm
+      - KHM_DB_USER=khm
+      - KHM_DB_PASSWORD=changeme
+      - KHM_FLOWS=prod,staging,dev
+    ports:
+      - "8080:8080"
+    depends_on:
+      - postgres
+    command: ["--server", "--ip", "0.0.0.0", "--port", "8080", "--db-host", "postgres", "--db-name", "khm", "--db-user", "khm", "--db-password", "changeme", "--flows", "prod,staging,dev"]
+
+  postgres:
+    image: postgres:16-alpine
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=khm
+      - POSTGRES_PASSWORD=changeme
+      - POSTGRES_DB=khm
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+volumes:
+  postgres_data:

src/bin/cli.rs

@@ -1,20 +1,16 @@
-mod client;
-mod db;
-mod server;
-mod web;
+use khm::{client, server, Args};
 
 use clap::Parser;
 use env_logger;
 use log::{error, info};
 
-/// This application manages SSH keys and flows, either as a server or client.
-/// In server mode, it stores keys and flows in a PostgreSQL database.
-/// In client mode, it sends keys to the server and can update the known_hosts file with keys from the server.
-#[derive(Parser, Debug)]
+/// CLI version of KHM - Known Hosts Manager for SSH key management and synchronization
+/// Supports server and client modes without GUI dependencies
+#[derive(Parser, Debug, Clone)]
 #[command(
     author = env!("CARGO_PKG_AUTHORS"),
     version = env!("CARGO_PKG_VERSION"),
-    about = "SSH Host Key Manager",
+    about = "SSH Host Key Manager (CLI with Server)",
     long_about = None,
     after_help = "Examples:\n\
     \n\
@@ -26,21 +22,21 @@ use log::{error, info};
     \n\
     "
 )]
-struct Args {
+pub struct CliArgs {
     /// Run in server mode (default: false)
     #[arg(long, help = "Run in server mode")]
-    server: bool,
+    pub server: bool,
 
     /// Update the known_hosts file with keys from the server after sending keys (default: false)
     #[arg(
         long,
         help = "Server mode: Sync the known_hosts file with keys from the server"
     )]
-    in_place: bool,
+    pub in_place: bool,
 
     /// Comma-separated list of flows to manage (default: default)
     #[arg(long, default_value = "default", value_parser, num_args = 1.., value_delimiter = ',', help = "Server mode: Comma-separated list of flows to manage")]
-    flows: Vec<String>,
+    pub flows: Vec<String>,
 
     /// IP address to bind the server or client to (default: 127.0.0.1)
     #[arg(
@@ -49,7 +45,7 @@ struct Args {
         default_value = "127.0.0.1",
         help = "Server mode: IP address to bind the server to"
     )]
-    ip: String,
+    pub ip: String,
 
     /// Port to bind the server or client to (default: 8080)
     #[arg(
@@ -58,7 +54,7 @@ struct Args {
         default_value = "8080",
         help = "Server mode: Port to bind the server to"
     )]
-    port: u16,
+    pub port: u16,
 
     /// Hostname or IP address of the PostgreSQL database (default: 127.0.0.1)
     #[arg(
@@ -66,7 +62,7 @@ struct Args {
         default_value = "127.0.0.1",
         help = "Server mode: Hostname or IP address of the PostgreSQL database"
     )]
-    db_host: String,
+    pub db_host: String,
 
     /// Name of the PostgreSQL database (default: khm)
     #[arg(
@@ -74,7 +70,7 @@ struct Args {
         default_value = "khm",
         help = "Server mode: Name of the PostgreSQL database"
     )]
-    db_name: String,
+    pub db_name: String,
 
     /// Username for the PostgreSQL database (required in server mode)
     #[arg(
@@ -82,7 +78,7 @@ struct Args {
         required_if_eq("server", "true"),
         help = "Server mode: Username for the PostgreSQL database"
     )]
-    db_user: Option<String>,
+    pub db_user: Option<String>,
 
     /// Password for the PostgreSQL database (required in server mode)
     #[arg(
@@ -90,7 +86,7 @@ struct Args {
         required_if_eq("server", "true"),
         help = "Server mode: Password for the PostgreSQL database"
     )]
-    db_password: Option<String>,
+    pub db_password: Option<String>,
 
     /// Host address of the server to connect to in client mode (required in client mode)
     #[arg(
@@ -98,7 +94,7 @@ struct Args {
         required_if_eq("server", "false"),
         help = "Client mode: Full host address of the server to connect to. Like https://khm.example.com"
     )]
-    host: Option<String>,
+    pub host: Option<String>,
 
     /// Flow name to use on the server
     #[arg(
@@ -106,7 +102,7 @@ struct Args {
         required_if_eq("server", "false"),
         help = "Client mode: Flow name to use on the server"
     )]
-    flow: Option<String>,
+    pub flow: Option<String>,
 
     /// Path to the known_hosts file (default: ~/.ssh/known_hosts)
     #[arg(
@@ -114,37 +110,57 @@ struct Args {
         default_value = "~/.ssh/known_hosts",
         help = "Client mode: Path to the known_hosts file"
     )]
-    known_hosts: String,
+    pub known_hosts: String,
 
     /// Basic auth string for client mode. Format: user:pass
     #[arg(long, default_value = "", help = "Client mode: Basic Auth credentials")]
-    basic_auth: String,
+    pub basic_auth: String,
+}
+
+impl From<CliArgs> for Args {
+    fn from(cli_args: CliArgs) -> Self {
+        Args {
+            server: cli_args.server,
+            daemon: false,
+            settings_ui: false,
+            in_place: cli_args.in_place,
+            flows: cli_args.flows,
+            ip: cli_args.ip,
+            port: cli_args.port,
+            db_host: cli_args.db_host,
+            db_name: cli_args.db_name,
+            db_user: cli_args.db_user,
+            db_password: cli_args.db_password,
+            host: cli_args.host,
+            flow: cli_args.flow,
+            known_hosts: cli_args.known_hosts,
+            basic_auth: cli_args.basic_auth,
+        }
+    }
 }
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    env_logger::init();
-    info!("Starting SSH Key Manager");
+    // Configure logging to show only khm logs, filtering out noisy library logs
+    env_logger::Builder::from_default_env()
+        .filter_level(log::LevelFilter::Warn) // Default level for all modules
+        .filter_module("khm", log::LevelFilter::Debug) // Our app logs
+        .filter_module("actix_web", log::LevelFilter::Info) // Server logs
+        .filter_module("reqwest", log::LevelFilter::Warn) // HTTP client
+        .init();
 
-    let args = Args::parse();
+    info!("Starting SSH Key Manager (CLI)");
 
-    // Check if we have the minimum required arguments
+    let cli_args = CliArgs::parse();
+    let args: Args = cli_args.into();
+
+    // Validate arguments - either server mode or client mode with required args
     if !args.server && (args.host.is_none() || args.flow.is_none()) {
-        // Neither server mode nor client mode properly configured
-        eprintln!("Error: You must specify either server mode (--server) or client mode (--host and --flow)");
-        eprintln!();
-        eprintln!("Examples:");
-        eprintln!(
-            "  Server mode: {} --server --db-user admin --db-password pass --flows work,home",
-            env!("CARGO_PKG_NAME")
-        );
-        eprintln!(
-            "  Client mode: {} --host https://khm.example.com --flow work",
-            env!("CARGO_PKG_NAME")
-        );
-        eprintln!();
-        eprintln!("Use --help for more information.");
-        std::process::exit(1);
+        error!("CLI version requires either --server mode or client mode with --host and --flow arguments");
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::InvalidInput,
+            "Invalid arguments for CLI mode",
+        ));
     }
 
     if args.server {
@@ -161,4 +177,4 @@ async fn main() -> std::io::Result<()> {
 
     info!("Application has exited");
     Ok(())
-}
+}

src/bin/desktop.rs

@@ -0,0 +1,142 @@
+use khm::{gui, Args};
+
+use clap::Parser;
+use env_logger;
+use log::{error, info};
+
+/// Desktop version of KHM - Known Hosts Manager with GUI interface
+/// Primarily runs in GUI mode with tray application and settings windows
+#[derive(Parser, Debug, Clone)]
+#[command(
+    author = env!("CARGO_PKG_AUTHORS"),
+    version = env!("CARGO_PKG_VERSION"),
+    about = "SSH Host Key Manager (Desktop)",
+    long_about = None,
+    after_help = "Examples:\n\
+    \n\
+    Running in GUI tray mode (default):\n\
+    khm-desktop\n\
+    \n\
+    Running in GUI tray mode with background daemon:\n\
+    khm-desktop --daemon\n\
+    \n\
+    Running settings window:\n\
+    khm-desktop --settings-ui\n\
+    \n\
+    "
+)]
+pub struct DesktopArgs {
+    /// Hide console window and run in background (default: auto when no arguments)
+    #[arg(long, help = "Hide console window and run in background")]
+    pub daemon: bool,
+
+    /// Run settings UI window
+    #[arg(long, help = "Run settings UI window")]
+    pub settings_ui: bool,
+}
+
+impl From<DesktopArgs> for Args {
+    fn from(desktop_args: DesktopArgs) -> Self {
+        Args {
+            server: false,
+            daemon: desktop_args.daemon,
+            settings_ui: desktop_args.settings_ui,
+            in_place: false,
+            flows: vec!["default".to_string()],
+            ip: "127.0.0.1".to_string(),
+            port: 8080,
+            db_host: "127.0.0.1".to_string(),
+            db_name: "khm".to_string(),
+            db_user: None,
+            db_password: None,
+            host: None,
+            flow: None,
+            known_hosts: "~/.ssh/known_hosts".to_string(),
+            basic_auth: String::new(),
+        }
+    }
+}
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    // Configure logging to show only khm logs, filtering out noisy library logs
+    env_logger::Builder::from_default_env()
+        .filter_level(log::LevelFilter::Warn) // Default level for all modules
+        .filter_module("khm", log::LevelFilter::Debug) // Our app logs
+        .filter_module("winit", log::LevelFilter::Error) // Window management
+        .filter_module("egui", log::LevelFilter::Error) // GUI framework
+        .filter_module("eframe", log::LevelFilter::Error) // GUI framework
+        .filter_module("tray_icon", log::LevelFilter::Error) // Tray icon
+        .filter_module("wgpu", log::LevelFilter::Error) // Graphics
+        .filter_module("naga", log::LevelFilter::Error) // Graphics
+        .filter_module("glow", log::LevelFilter::Error) // Graphics
+        .filter_module("tracing", log::LevelFilter::Error) // Tracing spans
+        .init();
+
+    info!("Starting SSH Key Manager (Desktop)");
+
+    let desktop_args = DesktopArgs::parse();
+    let args: Args = desktop_args.into();
+
+    // Hide console on Windows if daemon flag is set
+    if args.daemon {
+        #[cfg(target_os = "windows")]
+        {
+            extern "system" {
+                fn FreeConsole() -> i32;
+            }
+            unsafe {
+                FreeConsole();
+            }
+        }
+    }
+
+    // Settings UI mode - just show settings window and exit
+    if args.settings_ui {
+        // Always hide console for settings window
+        #[cfg(target_os = "windows")]
+        {
+            extern "system" {
+                fn FreeConsole() -> i32;
+            }
+            unsafe {
+                FreeConsole();
+            }
+        }
+        
+        #[cfg(feature = "gui")]
+        {
+            info!("Running settings UI window");
+            gui::run_settings_window();
+            return Ok(());
+        }
+        #[cfg(not(feature = "gui"))]
+        {
+            error!("GUI features not compiled. Install system dependencies and rebuild with --features gui");
+            return Err(std::io::Error::new(
+                std::io::ErrorKind::Unsupported,
+                "GUI features not compiled",
+            ));
+        }
+    }
+
+    // Default to GUI mode for desktop version
+    info!("Running in GUI mode");
+    #[cfg(feature = "gui")]
+    {
+        if let Err(e) = gui::run_gui().await {
+            error!("Failed to run GUI: {}", e);
+        }
+    }
+    #[cfg(not(feature = "gui"))]
+    {
+        error!("GUI features not compiled. Install system dependencies and rebuild with --features gui");
+        return Err(std::io::Error::new(
+            std::io::ErrorKind::Unsupported,
+            "GUI features not compiled",
+        ));
+    }
+
+    info!("Application has exited");
+    Ok(())
+}

src/client.rs

@@ -8,14 +8,14 @@ use std::io::{self, BufRead, Write};
 use std::path::Path;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
-struct SshKey {
+pub struct SshKey {
     server: String,
     public_key: String,
     #[serde(default)]
     deprecated: bool,
 }
 
-fn read_known_hosts(file_path: &str) -> io::Result<Vec<SshKey>> {
+pub fn read_known_hosts(file_path: &str) -> io::Result<Vec<SshKey>> {
     let path = Path::new(file_path);
     let file = File::open(&path)?;
     let reader = io::BufReader::new(file);

src/db.rs

@@ -69,12 +69,12 @@ impl DbClient {
             .client
             .query(
                 "SELECT EXISTS (
-                    SELECT FROM information_schema.tables 
-                    WHERE table_schema = 'public' 
+                    SELECT FROM information_schema.tables
+                    WHERE table_schema = 'public'
                     AND table_name = 'keys'
                 ) AND EXISTS (
-                    SELECT FROM information_schema.tables 
-                    WHERE table_schema = 'public' 
+                    SELECT FROM information_schema.tables
+                    WHERE table_schema = 'public'
                     AND table_name = 'flows'
                 )",
                 &[],
@@ -144,9 +144,9 @@ impl DbClient {
                 .client
                 .query(
                     "SELECT EXISTS (
-                        SELECT FROM information_schema.columns 
-                        WHERE table_schema = 'public' 
-                        AND table_name = 'keys' 
+                        SELECT FROM information_schema.columns
+                        WHERE table_schema = 'public'
+                        AND table_name = 'keys'
                         AND column_name = 'deprecated'
                     )",
                     &[],
@@ -448,9 +448,9 @@ impl DbClient {
         let result = self
             .client
             .execute(
-                "UPDATE public.keys 
-                 SET deprecated = TRUE, updated = NOW() 
-                 WHERE host = $1 
+                "UPDATE public.keys
+                 SET deprecated = TRUE, updated = NOW()
+                 WHERE host = $1
                  AND key_id IN (
                      SELECT key_id FROM public.flows WHERE name = $2
                  )",
@@ -467,6 +467,75 @@ impl DbClient {
         Ok(affected)
     }
 
+    pub async fn bulk_deprecate_keys_by_servers(
+        &self,
+        server_names: &[String],
+        flow_name: &str,
+    ) -> Result<u64, tokio_postgres::Error> {
+        if server_names.is_empty() {
+            return Ok(0);
+        }
+
+        // Update keys to deprecated status for multiple servers in one query
+        let result = self
+            .client
+            .execute(
+                "UPDATE public.keys
+                 SET deprecated = TRUE, updated = NOW()
+                 WHERE host = ANY($1)
+                 AND key_id IN (
+                     SELECT key_id FROM public.flows WHERE name = $2
+                 )",
+                &[&server_names, &flow_name],
+            )
+            .await;
+        let affected = Self::handle_db_error(result, "bulk deprecating keys")?;
+
+        info!(
+            "Bulk deprecated {} key(s) for {} servers in flow '{}'",
+            affected,
+            server_names.len(),
+            flow_name
+        );
+
+        Ok(affected)
+    }
+
+    pub async fn bulk_restore_keys_by_servers(
+        &self,
+        server_names: &[String],
+        flow_name: &str,
+    ) -> Result<u64, tokio_postgres::Error> {
+        if server_names.is_empty() {
+            return Ok(0);
+        }
+
+        // Update keys to active status for multiple servers in one query
+        let result = self
+            .client
+            .execute(
+                "UPDATE public.keys
+                 SET deprecated = FALSE, updated = NOW()
+                 WHERE host = ANY($1)
+                 AND deprecated = TRUE
+                 AND key_id IN (
+                     SELECT key_id FROM public.flows WHERE name = $2
+                 )",
+                &[&server_names, &flow_name],
+            )
+            .await;
+        let affected = Self::handle_db_error(result, "bulk restoring keys")?;
+
+        info!(
+            "Bulk restored {} key(s) for {} servers in flow '{}'",
+            affected,
+            server_names.len(),
+            flow_name
+        );
+
+        Ok(affected)
+    }
+
     pub async fn restore_key_by_server(
         &self,
         server_name: &str,
@@ -476,9 +545,9 @@ impl DbClient {
         let result = self
             .client
             .execute(
-                "UPDATE public.keys 
-                 SET deprecated = FALSE, updated = NOW() 
-                 WHERE host = $1 
+                "UPDATE public.keys
+                 SET deprecated = FALSE, updated = NOW()
+                 WHERE host = $1
                  AND deprecated = TRUE
                  AND key_id IN (
                      SELECT key_id FROM public.flows WHERE name = $2
@@ -505,8 +574,8 @@ impl DbClient {
         let result = self
             .client
             .query(
-                "SELECT k.key_id FROM public.keys k 
-                 INNER JOIN public.flows f ON k.key_id = f.key_id 
+                "SELECT k.key_id FROM public.keys k
+                 INNER JOIN public.flows f ON k.key_id = f.key_id
                  WHERE k.host = $1 AND f.name = $2",
                 &[&server_name, &flow_name],
             )
@@ -648,6 +717,36 @@ impl ReconnectingDbClient {
         }
     }
 
+    pub async fn bulk_deprecate_keys_by_servers_reconnecting(
+        &self,
+        server_names: Vec<String>,
+        flow_name: String,
+    ) -> Result<u64, tokio_postgres::Error> {
+        match &self.inner {
+            Some(client) => {
+                client
+                    .bulk_deprecate_keys_by_servers(&server_names, &flow_name)
+                    .await
+            }
+            None => panic!("Database client not initialized"),
+        }
+    }
+
+    pub async fn bulk_restore_keys_by_servers_reconnecting(
+        &self,
+        server_names: Vec<String>,
+        flow_name: String,
+    ) -> Result<u64, tokio_postgres::Error> {
+        match &self.inner {
+            Some(client) => {
+                client
+                    .bulk_restore_keys_by_servers(&server_names, &flow_name)
+                    .await
+            }
+            None => panic!("Database client not initialized"),
+        }
+    }
+
     pub async fn restore_key_by_server_reconnecting(
         &self,
         server_name: String,

src/gui/admin/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(feature = "gui")]
+mod state;
+#[cfg(feature = "gui")]
+mod ui;
+
+#[cfg(feature = "gui")]
+pub use state::*;
+#[cfg(feature = "gui")]
+pub use ui::*;

src/gui/admin/state.rs

@@ -0,0 +1,185 @@
+use crate::gui::api::{fetch_keys, SshKey};
+use crate::gui::common::KhmSettings;
+use eframe::egui;
+use log::{error, info};
+use std::collections::HashMap;
+use std::sync::mpsc;
+
+#[derive(Debug, Clone)]
+pub enum AdminOperation {
+    LoadingKeys,
+    DeprecatingKey,
+    RestoringKey,
+    DeletingKey,
+    BulkDeprecating,
+    BulkRestoring,
+    None,
+}
+
+#[derive(Debug, Clone)]
+pub struct AdminState {
+    pub keys: Vec<SshKey>,
+    pub filtered_keys: Vec<SshKey>,
+    pub search_term: String,
+    pub show_deprecated_only: bool,
+    pub selected_servers: HashMap<String, bool>,
+    pub expanded_servers: HashMap<String, bool>,
+    pub current_operation: AdminOperation,
+    pub last_load_time: Option<std::time::Instant>,
+}
+
+impl Default for AdminState {
+    fn default() -> Self {
+        Self {
+            keys: Vec::new(),
+            filtered_keys: Vec::new(),
+            search_term: String::new(),
+            show_deprecated_only: false,
+            selected_servers: HashMap::new(),
+            expanded_servers: HashMap::new(),
+            current_operation: AdminOperation::None,
+            last_load_time: None,
+        }
+    }
+}
+
+impl AdminState {
+    /// Filter keys based on current search term and deprecated filter
+    pub fn filter_keys(&mut self) {
+        let mut filtered = self.keys.clone();
+
+        // Apply deprecated filter
+        if self.show_deprecated_only {
+            filtered.retain(|key| key.deprecated);
+        }
+
+        // Apply search filter
+        if !self.search_term.is_empty() {
+            let search_term = self.search_term.to_lowercase();
+            filtered.retain(|key| {
+                key.server.to_lowercase().contains(&search_term)
+                    || key.public_key.to_lowercase().contains(&search_term)
+            });
+        }
+
+        self.filtered_keys = filtered;
+    }
+
+    /// Load keys from server
+    pub fn load_keys(
+        &mut self,
+        settings: &KhmSettings,
+        ctx: &egui::Context,
+    ) -> Option<mpsc::Receiver<Result<Vec<SshKey>, String>>> {
+        if settings.host.is_empty() || settings.flow.is_empty() {
+            return None;
+        }
+
+        self.current_operation = AdminOperation::LoadingKeys;
+
+        let (tx, rx) = mpsc::channel();
+
+        let host = settings.host.clone();
+        let flow = settings.flow.clone();
+        let basic_auth = settings.basic_auth.clone();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result = rt.block_on(async { fetch_keys(host, flow, basic_auth).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+
+        Some(rx)
+    }
+
+    /// Handle keys load result
+    pub fn handle_keys_loaded(&mut self, result: Result<Vec<SshKey>, String>) {
+        match result {
+            Ok(keys) => {
+                self.keys = keys;
+                self.last_load_time = Some(std::time::Instant::now());
+                self.filter_keys();
+                self.current_operation = AdminOperation::None;
+                info!("Keys loaded successfully: {} keys", self.keys.len());
+            }
+            Err(error) => {
+                self.current_operation = AdminOperation::None;
+                error!("Failed to load keys: {}", error);
+            }
+        }
+    }
+
+    /// Get selected servers list
+    pub fn get_selected_servers(&self) -> Vec<String> {
+        self.selected_servers
+            .iter()
+            .filter_map(|(server, &selected)| if selected { Some(server.clone()) } else { None })
+            .collect()
+    }
+
+    /// Clear selected servers
+    pub fn clear_selection(&mut self) {
+        self.selected_servers.clear();
+    }
+
+    /// Get statistics
+    pub fn get_statistics(&self) -> AdminStatistics {
+        let total_keys = self.keys.len();
+        let active_keys = self.keys.iter().filter(|k| !k.deprecated).count();
+        let deprecated_keys = total_keys - active_keys;
+        let unique_servers = self
+            .keys
+            .iter()
+            .map(|k| &k.server)
+            .collect::<std::collections::HashSet<_>>()
+            .len();
+
+        AdminStatistics {
+            total_keys,
+            active_keys,
+            deprecated_keys,
+            unique_servers,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct AdminStatistics {
+    pub total_keys: usize,
+    pub active_keys: usize,
+    pub deprecated_keys: usize,
+    pub unique_servers: usize,
+}
+
+/// Get SSH key type from public key string
+pub fn get_key_type(public_key: &str) -> String {
+    if public_key.starts_with("ssh-rsa") {
+        "RSA".to_string()
+    } else if public_key.starts_with("ssh-ed25519") {
+        "ED25519".to_string()
+    } else if public_key.starts_with("ecdsa-sha2-nistp") {
+        "ECDSA".to_string()
+    } else if public_key.starts_with("ssh-dss") {
+        "DSA".to_string()
+    } else {
+        "Unknown".to_string()
+    }
+}
+
+/// Get preview of SSH key (first 12 characters of key part)
+pub fn get_key_preview(public_key: &str) -> String {
+    let parts: Vec<&str> = public_key.split_whitespace().collect();
+    if parts.len() >= 2 {
+        let key_part = parts[1];
+        if key_part.len() > 12 {
+            format!("{}...", &key_part[..12])
+        } else {
+            key_part.to_string()
+        }
+    } else {
+        format!("{}...", &public_key[..std::cmp::min(12, public_key.len())])
+    }
+}

src/gui/admin/ui.rs

@@ -0,0 +1,630 @@
+use super::state::{get_key_preview, get_key_type, AdminState};
+use crate::gui::api::SshKey;
+use eframe::egui;
+use std::collections::BTreeMap;
+
+/// Render statistics cards
+pub fn render_statistics(ui: &mut egui::Ui, admin_state: &AdminState) {
+    let stats = admin_state.get_statistics();
+
+    ui.group(|ui| {
+        ui.set_min_width(ui.available_width());
+        ui.vertical(|ui| {
+            ui.label(egui::RichText::new("📊 Statistics").size(16.0).strong());
+            ui.add_space(8.0);
+
+            ui.horizontal(|ui| {
+                ui.columns(4, |cols| {
+                    // Total keys
+                    cols[0].vertical_centered_justified(|ui| {
+                        ui.label(egui::RichText::new("📊").size(20.0));
+                        ui.label(
+                            egui::RichText::new(stats.total_keys.to_string())
+                                .size(24.0)
+                                .strong(),
+                        );
+                        ui.label(
+                            egui::RichText::new("Total Keys")
+                                .size(11.0)
+                                .color(egui::Color32::GRAY),
+                        );
+                    });
+
+                    // Active keys
+                    cols[1].vertical_centered_justified(|ui| {
+                        ui.label(egui::RichText::new("✅").size(20.0));
+                        ui.label(
+                            egui::RichText::new(stats.active_keys.to_string())
+                                .size(24.0)
+                                .strong()
+                                .color(egui::Color32::LIGHT_GREEN),
+                        );
+                        ui.label(
+                            egui::RichText::new("Active")
+                                .size(11.0)
+                                .color(egui::Color32::GRAY),
+                        );
+                    });
+
+                    // Deprecated keys
+                    cols[2].vertical_centered_justified(|ui| {
+                        ui.label(egui::RichText::new("❌").size(20.0));
+                        ui.label(
+                            egui::RichText::new(stats.deprecated_keys.to_string())
+                                .size(24.0)
+                                .strong()
+                                .color(egui::Color32::LIGHT_RED),
+                        );
+                        ui.label(
+                            egui::RichText::new("Deprecated")
+                                .size(11.0)
+                                .color(egui::Color32::GRAY),
+                        );
+                    });
+
+                    // Servers
+                    cols[3].vertical_centered_justified(|ui| {
+                        ui.label(egui::RichText::new("💻").size(20.0));
+                        ui.label(
+                            egui::RichText::new(stats.unique_servers.to_string())
+                                .size(24.0)
+                                .strong()
+                                .color(egui::Color32::LIGHT_BLUE),
+                        );
+                        ui.label(
+                            egui::RichText::new("Servers")
+                                .size(11.0)
+                                .color(egui::Color32::GRAY),
+                        );
+                    });
+                });
+            });
+        });
+    });
+}
+
+/// Render search and filter controls
+pub fn render_search_controls(ui: &mut egui::Ui, admin_state: &mut AdminState) -> bool {
+    let mut changed = false;
+
+    ui.group(|ui| {
+        ui.set_min_width(ui.available_width());
+        ui.vertical(|ui| {
+            ui.label(egui::RichText::new("🔍 Search").size(16.0).strong());
+            ui.add_space(8.0);
+
+            // Search field with full width
+            ui.horizontal(|ui| {
+                ui.label(egui::RichText::new("🔍").size(14.0));
+                let search_response = ui.add_sized(
+                    [ui.available_width() * 0.6, 20.0],
+                    egui::TextEdit::singleline(&mut admin_state.search_term)
+                        .hint_text("Search servers or keys..."),
+                );
+
+                if admin_state.search_term.is_empty() {
+                    ui.label(
+                        egui::RichText::new("Type to search")
+                            .size(11.0)
+                            .color(egui::Color32::GRAY),
+                    );
+                } else {
+                    ui.label(
+                        egui::RichText::new(format!("{} results", admin_state.filtered_keys.len()))
+                            .size(11.0),
+                    );
+                    if ui
+                        .add(
+                            egui::Button::new(
+                                egui::RichText::new("❌").color(egui::Color32::WHITE),
+                            )
+                            .fill(egui::Color32::from_rgb(170, 170, 170))
+                            .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(89, 89, 89)))
+                            .rounding(egui::Rounding::same(3.0))
+                            .min_size(egui::vec2(18.0, 18.0)),
+                        )
+                        .on_hover_text("Clear search")
+                        .clicked()
+                    {
+                        admin_state.search_term.clear();
+                        changed = true;
+                    }
+                }
+
+                // Handle search text changes
+                if search_response.changed() {
+                    changed = true;
+                }
+            });
+
+            ui.add_space(5.0);
+
+            // Filter controls
+            ui.horizontal(|ui| {
+                ui.label("Filter:");
+                let show_deprecated = admin_state.show_deprecated_only;
+                if ui.selectable_label(!show_deprecated, "✅ Active").clicked() {
+                    admin_state.show_deprecated_only = false;
+                    changed = true;
+                }
+                if ui
+                    .selectable_label(show_deprecated, "❗ Deprecated")
+                    .clicked()
+                {
+                    admin_state.show_deprecated_only = true;
+                    changed = true;
+                }
+            });
+        });
+    });
+
+    if changed {
+        admin_state.filter_keys();
+    }
+
+    changed
+}
+
+/// Render bulk actions controls
+pub fn render_bulk_actions(ui: &mut egui::Ui, admin_state: &mut AdminState) -> BulkAction {
+    let selected_count = admin_state
+        .selected_servers
+        .values()
+        .filter(|&&v| v)
+        .count();
+
+    if selected_count == 0 {
+        return BulkAction::None;
+    }
+
+    let mut action = BulkAction::None;
+
+    ui.group(|ui| {
+        ui.set_min_width(ui.available_width());
+        ui.vertical(|ui| {
+            ui.horizontal(|ui| {
+                ui.label(egui::RichText::new("📋").size(14.0));
+                ui.label(
+                    egui::RichText::new(format!("Selected {} servers", selected_count))
+                        .size(14.0)
+                        .strong()
+                        .color(egui::Color32::LIGHT_BLUE),
+                );
+            });
+
+            ui.add_space(5.0);
+
+            ui.horizontal(|ui| {
+                if ui
+                    .add(
+                        egui::Button::new(
+                            egui::RichText::new("❗ Deprecate Selected")
+                                .color(egui::Color32::BLACK),
+                        )
+                        .fill(egui::Color32::from_rgb(255, 200, 0))
+                        .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(102, 94, 72)))
+                        .rounding(egui::Rounding::same(6.0))
+                        .min_size(egui::vec2(130.0, 28.0)),
+                    )
+                    .clicked()
+                {
+                    action = BulkAction::DeprecateSelected;
+                }
+
+                if ui
+                    .add(
+                        egui::Button::new(
+                            egui::RichText::new("✅ Restore Selected").color(egui::Color32::WHITE),
+                        )
+                        .fill(egui::Color32::from_rgb(101, 199, 40))
+                        .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(94, 105, 25)))
+                        .rounding(egui::Rounding::same(6.0))
+                        .min_size(egui::vec2(120.0, 28.0)),
+                    )
+                    .clicked()
+                {
+                    action = BulkAction::RestoreSelected;
+                }
+
+                if ui
+                    .add(
+                        egui::Button::new(
+                            egui::RichText::new("X Clear Selection").color(egui::Color32::WHITE),
+                        )
+                        .fill(egui::Color32::from_rgb(170, 170, 170))
+                        .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(89, 89, 89)))
+                        .rounding(egui::Rounding::same(6.0))
+                        .min_size(egui::vec2(110.0, 28.0)),
+                    )
+                    .clicked()
+                {
+                    admin_state.clear_selection();
+                    action = BulkAction::ClearSelection;
+                }
+            });
+        });
+    });
+
+    action
+}
+
+/// Render keys table grouped by servers
+pub fn render_keys_table(ui: &mut egui::Ui, admin_state: &mut AdminState) -> KeyAction {
+    if admin_state.filtered_keys.is_empty() {
+        render_empty_state(ui, admin_state);
+        return KeyAction::None;
+    }
+
+    let mut action = KeyAction::None;
+
+    // Group keys by server
+    let mut servers: BTreeMap<String, Vec<SshKey>> = BTreeMap::new();
+    for key in &admin_state.filtered_keys {
+        servers
+            .entry(key.server.clone())
+            .or_insert_with(Vec::new)
+            .push(key.clone());
+    }
+
+    // Render each server group
+    for (server_name, server_keys) in servers {
+        let is_expanded = admin_state
+            .expanded_servers
+            .get(&server_name)
+            .copied()
+            .unwrap_or(false);
+        let active_count = server_keys.iter().filter(|k| !k.deprecated).count();
+        let deprecated_count = server_keys.len() - active_count;
+
+        // Server header
+        ui.group(|ui| {
+            ui.horizontal(|ui| {
+                // Server selection checkbox
+                let mut selected = admin_state
+                    .selected_servers
+                    .get(&server_name)
+                    .copied()
+                    .unwrap_or(false);
+                if ui
+                    .add(egui::Checkbox::new(&mut selected, "").indeterminate(false))
+                    .changed()
+                {
+                    admin_state
+                        .selected_servers
+                        .insert(server_name.clone(), selected);
+                }
+
+                // Expand/collapse button
+                let expand_icon = if is_expanded { "-" } else { "+" };
+                if ui
+                    .add(
+                        egui::Button::new(expand_icon)
+                            .fill(egui::Color32::TRANSPARENT)
+                            .stroke(egui::Stroke::NONE)
+                            .min_size(egui::vec2(20.0, 20.0)),
+                    )
+                    .clicked()
+                {
+                    admin_state
+                        .expanded_servers
+                        .insert(server_name.clone(), !is_expanded);
+                }
+
+                // Server icon and name
+                ui.label(egui::RichText::new("💻").size(16.0));
+                ui.label(
+                    egui::RichText::new(&server_name)
+                        .size(15.0)
+                        .strong()
+                        .color(egui::Color32::WHITE),
+                );
+
+                // Keys count badge
+                render_badge(
+                    ui,
+                    &format!("{} keys", server_keys.len()),
+                    egui::Color32::from_rgb(52, 152, 219),
+                    egui::Color32::WHITE,
+                );
+
+                ui.add_space(5.0);
+
+                // Deprecated count badge
+                if deprecated_count > 0 {
+                    render_badge(
+                        ui,
+                        &format!("{} depr", deprecated_count),
+                        egui::Color32::from_rgb(231, 76, 60),
+                        egui::Color32::WHITE,
+                    );
+                }
+
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                    // Server action buttons
+                    if deprecated_count > 0 {
+                        if ui
+                            .add(
+                                egui::Button::new(
+                                    egui::RichText::new("✅ Restore").color(egui::Color32::WHITE),
+                                )
+                                .fill(egui::Color32::from_rgb(101, 199, 40))
+                                .stroke(egui::Stroke::new(
+                                    1.0,
+                                    egui::Color32::from_rgb(94, 105, 25),
+                                ))
+                                .rounding(egui::Rounding::same(4.0))
+                                .min_size(egui::vec2(70.0, 24.0)),
+                            )
+                            .clicked()
+                        {
+                            action = KeyAction::RestoreServer(server_name.clone());
+                        }
+                    }
+
+                    if active_count > 0 {
+                        if ui
+                            .add(
+                                egui::Button::new(
+                                    egui::RichText::new("❗ Deprecate").color(egui::Color32::BLACK),
+                                )
+                                .fill(egui::Color32::from_rgb(255, 200, 0))
+                                .stroke(egui::Stroke::new(
+                                    1.0,
+                                    egui::Color32::from_rgb(102, 94, 72),
+                                ))
+                                .rounding(egui::Rounding::same(4.0))
+                                .min_size(egui::vec2(85.0, 24.0)),
+                            )
+                            .clicked()
+                        {
+                            action = KeyAction::DeprecateServer(server_name.clone());
+                        }
+                    }
+                });
+            });
+        });
+
+        // Expanded key details
+        if is_expanded {
+            ui.indent("server_keys", |ui| {
+                for key in &server_keys {
+                    if let Some(key_action) = render_key_item(ui, key, &server_name) {
+                        action = key_action;
+                    }
+                }
+            });
+        }
+
+        ui.add_space(5.0);
+    }
+
+    action
+}
+
+/// Render empty state when no keys are available
+fn render_empty_state(ui: &mut egui::Ui, admin_state: &AdminState) {
+    ui.vertical_centered(|ui| {
+        ui.add_space(60.0);
+        if admin_state.keys.is_empty() {
+            ui.label(
+                egui::RichText::new("🔑")
+                    .size(48.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new("No SSH keys available")
+                    .size(18.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new("Keys will appear here once loaded from the server")
+                    .size(14.0)
+                    .color(egui::Color32::DARK_GRAY),
+            );
+        } else if !admin_state.search_term.is_empty() {
+            ui.label(
+                egui::RichText::new("🔍")
+                    .size(48.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new("No results found")
+                    .size(18.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new(format!(
+                    "Try adjusting your search: '{}'",
+                    admin_state.search_term
+                ))
+                .size(14.0)
+                .color(egui::Color32::DARK_GRAY),
+            );
+        } else {
+            ui.label(
+                egui::RichText::new("❌")
+                    .size(48.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new("No keys match current filters")
+                    .size(18.0)
+                    .color(egui::Color32::GRAY),
+            );
+            ui.label(
+                egui::RichText::new("Try adjusting your search or filter settings")
+                    .size(14.0)
+                    .color(egui::Color32::DARK_GRAY),
+            );
+        }
+    });
+}
+
+/// Render individual key item
+fn render_key_item(ui: &mut egui::Ui, key: &SshKey, server_name: &str) -> Option<KeyAction> {
+    let mut action = None;
+
+    ui.group(|ui| {
+        ui.horizontal(|ui| {
+            // Key type badge
+            let key_type = get_key_type(&key.public_key);
+            let (badge_color, text_color) = match key_type.as_str() {
+                "RSA" => (egui::Color32::from_rgb(52, 144, 220), egui::Color32::WHITE),
+                "ED25519" => (egui::Color32::from_rgb(46, 204, 113), egui::Color32::WHITE),
+                "ECDSA" => (egui::Color32::from_rgb(241, 196, 15), egui::Color32::BLACK),
+                "DSA" => (egui::Color32::from_rgb(230, 126, 34), egui::Color32::WHITE),
+                _ => (egui::Color32::GRAY, egui::Color32::WHITE),
+            };
+
+            render_small_badge(ui, &key_type, badge_color, text_color);
+            ui.add_space(5.0);
+
+            // Status badge
+            if key.deprecated {
+                ui.label(
+                    egui::RichText::new("❗ DEPR")
+                        .size(10.0)
+                        .color(egui::Color32::from_rgb(231, 76, 60))
+                        .strong(),
+                );
+            } else {
+                ui.label(
+                    egui::RichText::new("✅")
+                        .size(10.0)
+                        .color(egui::Color32::from_rgb(46, 204, 113))
+                        .strong(),
+                );
+            }
+
+            ui.add_space(5.0);
+
+            // Key preview
+            ui.label(
+                egui::RichText::new(get_key_preview(&key.public_key))
+                    .font(egui::FontId::monospace(10.0))
+                    .color(egui::Color32::LIGHT_GRAY),
+            );
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                // Key action buttons
+                if key.deprecated {
+                    if ui
+                        .add(
+                            egui::Button::new(
+                                egui::RichText::new("[R]").color(egui::Color32::WHITE),
+                            )
+                            .fill(egui::Color32::from_rgb(101, 199, 40))
+                            .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(94, 105, 25)))
+                            .rounding(egui::Rounding::same(3.0))
+                            .min_size(egui::vec2(22.0, 18.0)),
+                        )
+                        .on_hover_text("Restore key")
+                        .clicked()
+                    {
+                        action = Some(KeyAction::RestoreKey(server_name.to_string()));
+                    }
+                    if ui
+                        .add(
+                            egui::Button::new(
+                                egui::RichText::new("Del").color(egui::Color32::WHITE),
+                            )
+                            .fill(egui::Color32::from_rgb(246, 36, 71))
+                            .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(129, 18, 17)))
+                            .rounding(egui::Rounding::same(3.0))
+                            .min_size(egui::vec2(26.0, 18.0)),
+                        )
+                        .on_hover_text("Delete key")
+                        .clicked()
+                    {
+                        action = Some(KeyAction::DeleteKey(server_name.to_string()));
+                    }
+                } else {
+                    if ui
+                        .add(
+                            egui::Button::new(
+                                egui::RichText::new("❗").color(egui::Color32::BLACK),
+                            )
+                            .fill(egui::Color32::from_rgb(255, 200, 0))
+                            .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(102, 94, 72)))
+                            .rounding(egui::Rounding::same(3.0))
+                            .min_size(egui::vec2(22.0, 18.0)),
+                        )
+                        .on_hover_text("Deprecate key")
+                        .clicked()
+                    {
+                        action = Some(KeyAction::DeprecateKey(server_name.to_string()));
+                    }
+                }
+
+                if ui
+                    .add(
+                        egui::Button::new(egui::RichText::new("Copy").color(egui::Color32::WHITE))
+                            .fill(egui::Color32::from_rgb(0, 111, 230))
+                            .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(35, 84, 97)))
+                            .rounding(egui::Rounding::same(3.0))
+                            .min_size(egui::vec2(30.0, 18.0)),
+                    )
+                    .on_hover_text("Copy to clipboard")
+                    .clicked()
+                {
+                    ui.output_mut(|o| o.copied_text = key.public_key.clone());
+                }
+            });
+        });
+    });
+
+    action
+}
+
+/// Render a badge with text
+fn render_badge(ui: &mut egui::Ui, text: &str, bg_color: egui::Color32, text_color: egui::Color32) {
+    let (rect, _) = ui.allocate_exact_size(egui::vec2(50.0, 18.0), egui::Sense::hover());
+    ui.painter()
+        .rect_filled(rect, egui::Rounding::same(8.0), bg_color);
+    ui.painter().text(
+        rect.center(),
+        egui::Align2::CENTER_CENTER,
+        text,
+        egui::FontId::proportional(10.0),
+        text_color,
+    );
+}
+
+/// Render a small badge with text
+fn render_small_badge(
+    ui: &mut egui::Ui,
+    text: &str,
+    bg_color: egui::Color32,
+    text_color: egui::Color32,
+) {
+    let (rect, _) = ui.allocate_exact_size(egui::vec2(40.0, 16.0), egui::Sense::hover());
+    ui.painter()
+        .rect_filled(rect, egui::Rounding::same(3.0), bg_color);
+    ui.painter().text(
+        rect.center(),
+        egui::Align2::CENTER_CENTER,
+        text,
+        egui::FontId::proportional(9.0),
+        text_color,
+    );
+}
+
+/// Actions that can be performed on keys
+#[derive(Debug, Clone)]
+pub enum KeyAction {
+    None,
+    DeprecateKey(String),
+    RestoreKey(String),
+    DeleteKey(String),
+    DeprecateServer(String),
+    RestoreServer(String),
+}
+
+/// Bulk actions that can be performed
+#[derive(Debug, Clone)]
+pub enum BulkAction {
+    None,
+    DeprecateSelected,
+    RestoreSelected,
+    ClearSelection,
+}

src/gui/api/client.rs

@@ -0,0 +1,369 @@
+use crate::gui::common::{perform_sync, KhmSettings};
+use log::info;
+use reqwest::Client;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SshKey {
+    pub server: String,
+    pub public_key: String,
+    #[serde(default)]
+    pub deprecated: bool,
+}
+
+/// Test connection to KHM server
+#[cfg(feature = "gui")]
+pub async fn test_connection(
+    host: String,
+    flow: String,
+    basic_auth: String,
+) -> Result<String, String> {
+    if host.is_empty() || flow.is_empty() {
+        return Err("Host and flow must be specified".to_string());
+    }
+
+    let url = format!("{}/{}/keys", host.trim_end_matches('/'), flow);
+    info!("Testing connection to: {}", url);
+
+    let client = create_http_client()?;
+    let mut request = client.get(&url);
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    check_html_response(&body)?;
+
+    let keys: Vec<SshKey> =
+        serde_json::from_str(&body).map_err(|e| format!("Failed to parse response: {}", e))?;
+
+    let message = format!("Found {} SSH keys from flow '{}'", keys.len(), flow);
+    info!("Connection test successful: {}", message);
+    Ok(message)
+}
+
+/// Fetch all SSH keys including deprecated ones
+#[cfg(feature = "gui")]
+pub async fn fetch_keys(
+    host: String,
+    flow: String,
+    basic_auth: String,
+) -> Result<Vec<SshKey>, String> {
+    if host.is_empty() || flow.is_empty() {
+        return Err("Host and flow must be specified".to_string());
+    }
+
+    let url = format!(
+        "{}/{}/keys?include_deprecated=true",
+        host.trim_end_matches('/'),
+        flow
+    );
+    info!("Fetching keys from: {}", url);
+
+    let client = create_http_client()?;
+    let mut request = client.get(&url);
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    check_html_response(&body)?;
+
+    let keys: Vec<SshKey> =
+        serde_json::from_str(&body).map_err(|e| format!("Failed to parse response: {}", e))?;
+
+    info!("Fetched {} SSH keys", keys.len());
+    Ok(keys)
+}
+
+/// Deprecate a key for a specific server
+#[cfg(feature = "gui")]
+pub async fn deprecate_key(
+    host: String,
+    flow: String,
+    basic_auth: String,
+    server: String,
+) -> Result<String, String> {
+    let url = format!(
+        "{}/{}/keys/{}",
+        host.trim_end_matches('/'),
+        flow,
+        urlencoding::encode(&server)
+    );
+    info!("Deprecating key for server '{}' at: {}", server, url);
+
+    let client = create_http_client()?;
+    let mut request = client.delete(&url);
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    parse_api_response(
+        &body,
+        &format!("Successfully deprecated key for server '{}'", server),
+    )
+}
+
+/// Restore a key for a specific server
+#[cfg(feature = "gui")]
+pub async fn restore_key(
+    host: String,
+    flow: String,
+    basic_auth: String,
+    server: String,
+) -> Result<String, String> {
+    let url = format!(
+        "{}/{}/keys/{}/restore",
+        host.trim_end_matches('/'),
+        flow,
+        urlencoding::encode(&server)
+    );
+    info!("Restoring key for server '{}' at: {}", server, url);
+
+    let client = create_http_client()?;
+    let mut request = client.post(&url);
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    parse_api_response(
+        &body,
+        &format!("Successfully restored key for server '{}'", server),
+    )
+}
+
+/// Delete a key permanently for a specific server
+#[cfg(feature = "gui")]
+pub async fn delete_key(
+    host: String,
+    flow: String,
+    basic_auth: String,
+    server: String,
+) -> Result<String, String> {
+    let url = format!(
+        "{}/{}/keys/{}/delete",
+        host.trim_end_matches('/'),
+        flow,
+        urlencoding::encode(&server)
+    );
+    info!(
+        "Permanently deleting key for server '{}' at: {}",
+        server, url
+    );
+
+    let client = create_http_client()?;
+    let mut request = client.delete(&url);
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    parse_api_response(
+        &body,
+        &format!("Successfully deleted key for server '{}'", server),
+    )
+}
+
+/// Bulk deprecate multiple servers
+#[cfg(feature = "gui")]
+pub async fn bulk_deprecate_servers(
+    host: String,
+    flow: String,
+    basic_auth: String,
+    servers: Vec<String>,
+) -> Result<String, String> {
+    let url = format!("{}/{}/bulk-deprecate", host.trim_end_matches('/'), flow);
+    info!("Bulk deprecating {} servers at: {}", servers.len(), url);
+
+    let client = create_http_client()?;
+    let mut request = client.post(&url).json(&serde_json::json!({
+        "servers": servers
+    }));
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    parse_api_response(&body, "Successfully deprecated servers")
+}
+
+/// Bulk restore multiple servers
+#[cfg(feature = "gui")]
+pub async fn bulk_restore_servers(
+    host: String,
+    flow: String,
+    basic_auth: String,
+    servers: Vec<String>,
+) -> Result<String, String> {
+    let url = format!("{}/{}/bulk-restore", host.trim_end_matches('/'), flow);
+    info!("Bulk restoring {} servers at: {}", servers.len(), url);
+
+    let client = create_http_client()?;
+    let mut request = client.post(&url).json(&serde_json::json!({
+        "servers": servers
+    }));
+
+    request = add_auth_if_needed(request, &basic_auth)?;
+
+    let response = request
+        .send()
+        .await
+        .map_err(|e| format!("Request failed: {}", e))?;
+
+    check_response_status(&response)?;
+
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response: {}", e))?;
+
+    parse_api_response(&body, "Successfully restored servers")
+}
+
+/// Perform manual sync operation
+#[cfg(feature = "gui")]
+pub async fn perform_manual_sync(settings: KhmSettings) -> Result<String, String> {
+    match perform_sync(&settings).await {
+        Ok(keys_count) => Ok(format!(
+            "Sync completed successfully with {} keys",
+            keys_count
+        )),
+        Err(e) => Err(e.to_string()),
+    }
+}
+
+// Helper functions
+
+#[cfg(feature = "gui")]
+fn create_http_client() -> Result<Client, String> {
+    Client::builder()
+        .timeout(std::time::Duration::from_secs(30))
+        .redirect(reqwest::redirect::Policy::none())
+        .build()
+        .map_err(|e| format!("Failed to create HTTP client: {}", e))
+}
+
+#[cfg(feature = "gui")]
+fn add_auth_if_needed(
+    request: reqwest::RequestBuilder,
+    basic_auth: &str,
+) -> Result<reqwest::RequestBuilder, String> {
+    if basic_auth.is_empty() {
+        return Ok(request);
+    }
+
+    let auth_parts: Vec<&str> = basic_auth.splitn(2, ':').collect();
+    if auth_parts.len() == 2 {
+        Ok(request.basic_auth(auth_parts[0], Some(auth_parts[1])))
+    } else {
+        Err("Basic auth format should be 'username:password'".to_string())
+    }
+}
+
+#[cfg(feature = "gui")]
+fn check_response_status(response: &reqwest::Response) -> Result<(), String> {
+    let status = response.status().as_u16();
+
+    if status == 401 {
+        return Err(
+            "Authentication required. Please provide valid basic auth credentials.".to_string(),
+        );
+    }
+
+    if status >= 300 && status < 400 {
+        return Err("Server redirects to login page. Authentication may be required.".to_string());
+    }
+
+    if !response.status().is_success() {
+        return Err(format!(
+            "Server returned error: {} {}",
+            status,
+            response.status().canonical_reason().unwrap_or("Unknown")
+        ));
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "gui")]
+fn check_html_response(body: &str) -> Result<(), String> {
+    if body.trim_start().starts_with("<!DOCTYPE") || body.trim_start().starts_with("<html") {
+        return Err("Server returned HTML page instead of JSON. This usually means authentication is required or the endpoint is incorrect.".to_string());
+    }
+    Ok(())
+}
+
+#[cfg(feature = "gui")]
+fn parse_api_response(body: &str, default_message: &str) -> Result<String, String> {
+    if let Ok(json_response) = serde_json::from_str::<serde_json::Value>(body) {
+        if let Some(message) = json_response.get("message").and_then(|v| v.as_str()) {
+            Ok(message.to_string())
+        } else {
+            Ok(default_message.to_string())
+        }
+    } else {
+        Ok(default_message.to_string())
+    }
+}

src/gui/api/mod.rs

@@ -0,0 +1,5 @@
+#[cfg(feature = "gui")]
+mod client;
+
+#[cfg(feature = "gui")]
+pub use client::*;

src/gui/common/mod.rs

@@ -0,0 +1,5 @@
+#[cfg(feature = "gui")]
+mod settings;
+
+#[cfg(feature = "gui")]
+pub use settings::*;

src/gui/common/settings.rs

@@ -0,0 +1,156 @@
+#[cfg(feature = "gui")]
+use dirs::home_dir;
+#[cfg(feature = "gui")]
+use log::{debug, error, info};
+#[cfg(feature = "gui")]
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "gui")]
+use std::fs;
+#[cfg(feature = "gui")]
+use std::path::PathBuf;
+
+#[cfg(feature = "gui")]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct KhmSettings {
+    pub host: String,
+    pub flow: String,
+    pub known_hosts: String,
+    pub basic_auth: String,
+    pub in_place: bool,
+    pub auto_sync_interval_minutes: u32,
+}
+
+#[cfg(feature = "gui")]
+impl Default for KhmSettings {
+    fn default() -> Self {
+        Self {
+            host: String::new(),
+            flow: String::new(),
+            known_hosts: get_default_known_hosts_path(),
+            basic_auth: String::new(),
+            in_place: true,
+            auto_sync_interval_minutes: 60,
+        }
+    }
+}
+
+/// Get default known_hosts file path based on OS
+#[cfg(feature = "gui")]
+fn get_default_known_hosts_path() -> String {
+    if let Some(home) = home_dir() {
+        let ssh_dir = home.join(".ssh");
+        let known_hosts_file = ssh_dir.join("known_hosts");
+        known_hosts_file.to_string_lossy().to_string()
+    } else {
+        "~/.ssh/known_hosts".to_string()
+    }
+}
+
+/// Get configuration file path
+#[cfg(feature = "gui")]
+pub fn get_config_path() -> PathBuf {
+    let mut path = home_dir().expect("Could not find home directory");
+    path.push(".khm");
+    fs::create_dir_all(&path).ok();
+    path.push("khm_config.json");
+    path
+}
+
+/// Load settings from configuration file
+#[cfg(feature = "gui")]
+pub fn load_settings() -> KhmSettings {
+    let path = get_config_path();
+    match fs::read_to_string(&path) {
+        Ok(contents) => {
+            let mut settings: KhmSettings = serde_json::from_str(&contents).unwrap_or_else(|e| {
+                error!("Failed to parse KHM config: {}", e);
+                KhmSettings::default()
+            });
+
+            // Fill in default known_hosts path if empty
+            if settings.known_hosts.is_empty() {
+                settings.known_hosts = get_default_known_hosts_path();
+            }
+
+            settings
+        }
+        Err(_) => {
+            debug!("KHM config file not found, using defaults");
+            KhmSettings::default()
+        }
+    }
+}
+
+/// Save settings to configuration file
+#[cfg(feature = "gui")]
+pub fn save_settings(settings: &KhmSettings) -> Result<(), std::io::Error> {
+    let path = get_config_path();
+    let json = serde_json::to_string_pretty(settings)?;
+    fs::write(&path, json)?;
+    info!("KHM settings saved");
+    Ok(())
+}
+
+/// Expand path with ~ substitution
+#[cfg(feature = "gui")]
+pub fn expand_path(path: &str) -> String {
+    if path.starts_with("~/") {
+        if let Some(home) = home_dir() {
+            return home.join(&path[2..]).to_string_lossy().to_string();
+        }
+    }
+    path.to_string()
+}
+
+/// Perform sync operation using KHM client logic
+#[cfg(feature = "gui")]
+pub async fn perform_sync(settings: &KhmSettings) -> Result<usize, std::io::Error> {
+    use crate::Args;
+
+    info!(
+        "Starting sync with settings: host={}, flow={}, known_hosts={}, in_place={}",
+        settings.host, settings.flow, settings.known_hosts, settings.in_place
+    );
+
+    // Convert KhmSettings to Args for client module
+    let args = Args {
+        server: false,
+        daemon: false,
+        settings_ui: false,
+        in_place: settings.in_place,
+        flows: vec!["default".to_string()], // Not used in client mode
+        ip: "127.0.0.1".to_string(),        // Not used in client mode
+        port: 8080,                         // Not used in client mode
+        db_host: "127.0.0.1".to_string(),   // Not used in client mode
+        db_name: "khm".to_string(),         // Not used in client mode
+        db_user: None,                      // Not used in client mode
+        db_password: None,                  // Not used in client mode
+        host: Some(settings.host.clone()),
+        flow: Some(settings.flow.clone()),
+        known_hosts: expand_path(&settings.known_hosts),
+        basic_auth: settings.basic_auth.clone(),
+    };
+
+    info!("Expanded known_hosts path: {}", args.known_hosts);
+
+    // Get keys count before and after sync
+    let keys_before = crate::client::read_known_hosts(&args.known_hosts)
+        .unwrap_or_else(|_| Vec::new())
+        .len();
+
+    crate::client::run_client(args.clone()).await?;
+
+    let keys_after = if args.in_place {
+        crate::client::read_known_hosts(&args.known_hosts)
+            .unwrap_or_else(|_| Vec::new())
+            .len()
+    } else {
+        keys_before
+    };
+
+    info!(
+        "Sync completed: {} keys before, {} keys after",
+        keys_before, keys_after
+    );
+    Ok(keys_after)
+}

src/gui/mod.rs

@@ -0,0 +1,45 @@
+#[cfg(feature = "gui")]
+use log::info;
+
+// Modules
+#[cfg(feature = "gui")]
+mod admin;
+mod api;
+mod common;
+
+#[cfg(feature = "gui")]
+mod settings;
+#[cfg(feature = "gui")]
+mod tray;
+
+// Re-exports for backward compatibility and external usage
+#[cfg(feature = "gui")]
+pub use settings::run_settings_window;
+#[cfg(feature = "gui")]
+pub use tray::run_tray_app;
+
+// User events for GUI communication
+#[cfg(feature = "gui")]
+#[derive(Debug)]
+pub enum UserEvent {
+    TrayIconEvent,
+    MenuEvent(tray_icon::menu::MenuEvent),
+    ConfigFileChanged,
+    UpdateMenu,
+}
+
+/// Run GUI application in tray mode
+#[cfg(feature = "gui")]
+pub async fn run_gui() -> std::io::Result<()> {
+    info!("Starting KHM tray application");
+    run_tray_app().await
+}
+
+/// Stub function when GUI is disabled
+#[cfg(not(feature = "gui"))]
+pub async fn run_gui() -> std::io::Result<()> {
+    return Err(std::io::Error::new(
+        std::io::ErrorKind::Unsupported,
+        "GUI features not compiled. Install system dependencies and rebuild with --features gui",
+    ));
+}

src/gui/settings/connection.rs

@@ -0,0 +1,228 @@
+use crate::gui::api::{perform_manual_sync, test_connection};
+use crate::gui::common::{save_settings, KhmSettings};
+use eframe::egui;
+use log::{error, info};
+use std::sync::mpsc;
+
+#[derive(Debug, Clone)]
+pub enum ConnectionStatus {
+    Unknown,
+    Connected { keys_count: usize, flow: String },
+    Error(String),
+}
+
+#[derive(Debug, Clone)]
+pub enum SyncStatus {
+    Unknown,
+    Success { keys_count: usize },
+    Error(String),
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum SettingsTab {
+    Connection,
+    Admin,
+}
+
+pub struct ConnectionTab {
+    pub connection_status: ConnectionStatus,
+    pub is_testing_connection: bool,
+    pub test_result_receiver: Option<mpsc::Receiver<Result<String, String>>>,
+    pub is_syncing: bool,
+    pub sync_result_receiver: Option<mpsc::Receiver<Result<String, String>>>,
+    pub sync_status: SyncStatus,
+    pub should_auto_test: bool,
+}
+
+impl Default for ConnectionTab {
+    fn default() -> Self {
+        Self {
+            connection_status: ConnectionStatus::Unknown,
+            is_testing_connection: false,
+            test_result_receiver: None,
+            is_syncing: false,
+            sync_result_receiver: None,
+            sync_status: SyncStatus::Unknown,
+            should_auto_test: false,
+        }
+    }
+}
+
+impl ConnectionTab {
+    /// Start connection test
+    pub fn start_test(&mut self, settings: &KhmSettings, ctx: &egui::Context) {
+        if self.is_testing_connection {
+            return;
+        }
+
+        self.is_testing_connection = true;
+        self.connection_status = ConnectionStatus::Unknown;
+
+        let (tx, rx) = mpsc::channel();
+        self.test_result_receiver = Some(rx);
+
+        let host = settings.host.clone();
+        let flow = settings.flow.clone();
+        let basic_auth = settings.basic_auth.clone();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result = rt.block_on(async { test_connection(host, flow, basic_auth).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    /// Start manual sync
+    pub fn start_sync(&mut self, settings: &KhmSettings, ctx: &egui::Context) {
+        if self.is_syncing {
+            return;
+        }
+
+        self.is_syncing = true;
+        self.sync_status = SyncStatus::Unknown;
+
+        let (tx, rx) = mpsc::channel();
+        self.sync_result_receiver = Some(rx);
+
+        let settings = settings.clone();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result = rt.block_on(async { perform_manual_sync(settings).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    /// Check for test/sync results and handle auto-test
+    pub fn check_results(
+        &mut self,
+        ctx: &egui::Context,
+        settings: &KhmSettings,
+        operation_log: &mut Vec<String>,
+    ) {
+        // Handle auto-test on first frame if needed
+        if self.should_auto_test && !self.is_testing_connection {
+            self.should_auto_test = false;
+            self.start_test(settings, ctx);
+        }
+        // Check for test connection result
+        if let Some(receiver) = &self.test_result_receiver {
+            if let Ok(result) = receiver.try_recv() {
+                self.is_testing_connection = false;
+                match result {
+                    Ok(message) => {
+                        // Parse keys count from message
+                        let keys_count = if let Some(start) = message.find("Found ") {
+                            if let Some(end) = message[start + 6..].find(" SSH keys") {
+                                message[start + 6..start + 6 + end]
+                                    .parse::<usize>()
+                                    .unwrap_or(0)
+                            } else {
+                                0
+                            }
+                        } else {
+                            0
+                        };
+
+                        self.connection_status = ConnectionStatus::Connected {
+                            keys_count,
+                            flow: settings.flow.clone(),
+                        };
+                        info!("Connection test successful: {}", message);
+
+                        // Add to UI log
+                        super::ui::add_log_entry(
+                            operation_log,
+                            format!("✅ Connection test successful: {}", message),
+                        );
+                    }
+                    Err(error) => {
+                        self.connection_status = ConnectionStatus::Error(error.clone());
+                        error!("Connection test failed");
+
+                        // Add to UI log
+                        super::ui::add_log_entry(
+                            operation_log,
+                            format!("❌ Connection test failed: {}", error),
+                        );
+                    }
+                }
+                self.test_result_receiver = None;
+                ctx.request_repaint();
+            }
+        }
+
+        // Check for sync result
+        if let Some(receiver) = &self.sync_result_receiver {
+            if let Ok(result) = receiver.try_recv() {
+                self.is_syncing = false;
+                match result {
+                    Ok(message) => {
+                        // Parse keys count from message
+                        let keys_count = parse_keys_count(&message);
+                        self.sync_status = SyncStatus::Success { keys_count };
+                        info!("Sync successful: {}", message);
+
+                        // Add to UI log
+                        super::ui::add_log_entry(
+                            operation_log,
+                            format!("✅ Sync completed: {}", message),
+                        );
+                    }
+                    Err(error) => {
+                        self.sync_status = SyncStatus::Error(error.clone());
+                        error!("Sync failed");
+
+                        // Add to UI log
+                        super::ui::add_log_entry(
+                            operation_log,
+                            format!("❌ Sync failed: {}", error),
+                        );
+                    }
+                }
+                self.sync_result_receiver = None;
+                ctx.request_repaint();
+            }
+        }
+    }
+}
+
+/// Parse keys count from sync result message
+fn parse_keys_count(message: &str) -> usize {
+    if let Some(start) = message.find("updated with ") {
+        let search_start = start + "updated with ".len();
+        if let Some(end) = message[search_start..].find(" keys") {
+            let number_str = &message[search_start..search_start + end];
+            return number_str.parse::<usize>().unwrap_or(0);
+        }
+    } else if let Some(start) = message.find("Retrieved ") {
+        let search_start = start + "Retrieved ".len();
+        if let Some(end) = message[search_start..].find(" keys") {
+            let number_str = &message[search_start..search_start + end];
+            return number_str.parse::<usize>().unwrap_or(0);
+        }
+    } else if let Some(keys_pos) = message.find(" keys") {
+        let before_keys = &message[..keys_pos];
+        if let Some(space_pos) = before_keys.rfind(' ') {
+            let number_str = &before_keys[space_pos + 1..];
+            return number_str.parse::<usize>().unwrap_or(0);
+        }
+    }
+
+    0
+}
+
+/// Save settings with validation
+pub fn save_settings_validated(settings: &KhmSettings) -> Result<(), String> {
+    if settings.host.is_empty() || settings.flow.is_empty() {
+        return Err("Host URL and Flow Name are required".to_string());
+    }
+
+    save_settings(settings).map_err(|e| format!("Failed to save settings: {}", e))
+}

src/gui/settings/mod.rs

@@ -0,0 +1,5 @@
+mod connection;
+mod ui;
+mod window;
+
+pub use window::*;

src/gui/settings/ui.rs

@@ -0,0 +1,638 @@
+use super::connection::{save_settings_validated, ConnectionStatus, ConnectionTab, SyncStatus};
+use crate::gui::common::{get_config_path, KhmSettings};
+use eframe::egui;
+
+/// Render connection settings tab with modern horizontal UI design
+pub fn render_connection_tab(
+    ui: &mut egui::Ui,
+    ctx: &egui::Context,
+    settings: &mut KhmSettings,
+    auto_sync_interval_str: &mut String,
+    connection_tab: &mut ConnectionTab,
+    operation_log: &mut Vec<String>,
+) {
+    // Check for connection test and sync results
+    connection_tab.check_results(ctx, settings, operation_log);
+
+    // Use scrollable area for the entire content
+    egui::ScrollArea::vertical()
+        .auto_shrink([false; 2])
+        .show(ui, |ui| {
+            ui.spacing_mut().item_spacing = egui::vec2(6.0, 8.0);
+            ui.spacing_mut().button_padding = egui::vec2(12.0, 6.0);
+            ui.spacing_mut().indent = 16.0;
+
+            // Connection Status Card at top (full width)
+            render_connection_status_card(ui, connection_tab);
+
+            // Main configuration area - horizontal layout
+            ui.horizontal_top(|ui| {
+                let available_width = ui.available_width();
+                let left_panel_width = available_width * 0.6;
+                let right_panel_width = available_width * 0.38;
+
+                // Left panel - Connection and Local config
+                ui.allocate_ui_with_layout(
+                    [left_panel_width, ui.available_height()].into(),
+                    egui::Layout::top_down(egui::Align::Min),
+                    |ui| {
+                        // Connection Configuration Card
+                        render_connection_config_card(ui, settings);
+
+                        // Local Configuration Card
+                        render_local_config_card(ui, settings);
+                    },
+                );
+
+                ui.add_space(8.0);
+
+                // Right panel - Auto-sync and System info
+                ui.allocate_ui_with_layout(
+                    [right_panel_width, ui.available_height()].into(),
+                    egui::Layout::top_down(egui::Align::Min),
+                    |ui| {
+                        // Auto-sync Configuration Card
+                        render_auto_sync_card(ui, settings, auto_sync_interval_str);
+
+                        // System Information Card
+                        render_system_info_card(ui);
+                    },
+                );
+            });
+
+            ui.add_space(12.0);
+
+            // Action buttons at bottom
+            render_action_section(ui, ctx, settings, connection_tab, operation_log);
+        });
+}
+
+/// Connection status card with modern visual design
+fn render_connection_status_card(ui: &mut egui::Ui, connection_tab: &ConnectionTab) {
+    let frame = egui::Frame::group(ui.style())
+        .fill(ui.visuals().faint_bg_color)
+        .stroke(egui::Stroke::new(
+            1.0,
+            ui.visuals().widgets.noninteractive.bg_stroke.color,
+        ))
+        .rounding(6.0)
+        .inner_margin(egui::Margin::same(12.0));
+
+    frame.show(ui, |ui| {
+        // Header with status indicator
+        ui.horizontal(|ui| {
+            let (status_icon, status_text, status_color) = match &connection_tab.connection_status {
+                ConnectionStatus::Connected { keys_count, flow } => {
+                    let text = if flow.is_empty() {
+                        format!("Connected • {} keys", keys_count)
+                    } else {
+                        format!("Connected to '{}' • {} keys", flow, keys_count)
+                    };
+                    ("✅", text, egui::Color32::GREEN)
+                }
+                ConnectionStatus::Error(error_msg) => (
+                    "❌",
+                    format!("Connection Error: {}", error_msg),
+                    egui::Color32::RED,
+                ),
+                ConnectionStatus::Unknown => {
+                    ("⚫", "Not Connected".to_string(), ui.visuals().text_color())
+                }
+            };
+
+            ui.label(egui::RichText::new(status_icon).size(14.0));
+            ui.label(egui::RichText::new("Connection Status").size(14.0).strong());
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                if connection_tab.is_testing_connection {
+                    ui.spinner();
+                    ui.label(
+                        egui::RichText::new("Testing...")
+                            .italics()
+                            .color(ui.visuals().weak_text_color()),
+                    );
+                } else {
+                    ui.label(
+                        egui::RichText::new(&status_text)
+                            .size(13.0)
+                            .color(status_color),
+                    );
+                }
+            });
+        });
+
+        // Sync status - always visible
+        ui.add_space(6.0);
+        ui.separator();
+        ui.add_space(6.0);
+
+        ui.horizontal(|ui| {
+            ui.label("🔄");
+            ui.label("Last Sync:");
+
+            match &connection_tab.sync_status {
+                SyncStatus::Success { keys_count } => {
+                    ui.label(
+                        egui::RichText::new(format!("✅ {} keys synced", keys_count))
+                            .size(13.0)
+                            .color(egui::Color32::GREEN),
+                    );
+                }
+                SyncStatus::Error(error_msg) => {
+                    ui.label(
+                        egui::RichText::new("❌ Failed")
+                            .size(13.0)
+                            .color(egui::Color32::RED),
+                    )
+                    .on_hover_text(error_msg);
+                }
+                SyncStatus::Unknown => {
+                    ui.label(
+                        egui::RichText::new("No sync performed yet")
+                            .size(13.0)
+                            .color(ui.visuals().weak_text_color()),
+                    );
+                }
+            }
+        });
+    });
+
+    ui.add_space(8.0);
+}
+
+/// Connection configuration card with input fields
+fn render_connection_config_card(ui: &mut egui::Ui, settings: &mut KhmSettings) {
+    let frame = egui::Frame::group(ui.style())
+        .fill(ui.visuals().faint_bg_color)
+        .stroke(egui::Stroke::new(
+            1.0,
+            ui.visuals().widgets.noninteractive.bg_stroke.color,
+        ))
+        .rounding(6.0)
+        .inner_margin(egui::Margin::same(12.0));
+
+    frame.show(ui, |ui| {
+        // Header
+        ui.horizontal(|ui| {
+            ui.label("🌐");
+            ui.label(
+                egui::RichText::new("Server Configuration")
+                    .size(14.0)
+                    .strong(),
+            );
+        });
+
+        ui.add_space(8.0);
+
+        // Input fields with better spacing
+        ui.vertical(|ui| {
+            ui.spacing_mut().item_spacing.y = 8.0;
+
+            // Host URL
+            ui.vertical(|ui| {
+                ui.label(egui::RichText::new("Host URL").size(13.0).strong());
+                ui.add_space(3.0);
+                ui.add_sized(
+                    [ui.available_width(), 28.0], // Smaller height for better centering
+                    egui::TextEdit::singleline(&mut settings.host)
+                        .hint_text("https://your-khm-server.com")
+                        .font(egui::FontId::new(14.0, egui::FontFamily::Monospace))
+                        .margin(egui::Margin::symmetric(8.0, 6.0)), // Better vertical centering
+                );
+            });
+
+            // Flow Name
+            ui.vertical(|ui| {
+                ui.label(egui::RichText::new("Flow Name").size(13.0).strong());
+                ui.add_space(3.0);
+                ui.add_sized(
+                    [ui.available_width(), 28.0],
+                    egui::TextEdit::singleline(&mut settings.flow)
+                        .hint_text("production, staging, development")
+                        .font(egui::FontId::new(14.0, egui::FontFamily::Proportional))
+                        .margin(egui::Margin::symmetric(8.0, 6.0)),
+                );
+            });
+
+            // Basic Auth (optional)
+            ui.vertical(|ui| {
+                ui.horizontal(|ui| {
+                    ui.label(
+                        egui::RichText::new("Basic Authentication")
+                            .size(13.0)
+                            .strong(),
+                    );
+                    ui.label(
+                        egui::RichText::new("(optional)")
+                            .size(12.0)
+                            .weak()
+                            .italics(),
+                    );
+                });
+                ui.add_space(3.0);
+                ui.add_sized(
+                    [ui.available_width(), 28.0],
+                    egui::TextEdit::singleline(&mut settings.basic_auth)
+                        .hint_text("username:password")
+                        .password(true)
+                        .font(egui::FontId::new(14.0, egui::FontFamily::Monospace))
+                        .margin(egui::Margin::symmetric(8.0, 6.0)),
+                );
+            });
+        });
+    });
+
+    ui.add_space(8.0);
+}
+
+/// Local configuration card
+fn render_local_config_card(ui: &mut egui::Ui, settings: &mut KhmSettings) {
+    let frame = egui::Frame::group(ui.style())
+        .fill(ui.visuals().faint_bg_color)
+        .stroke(egui::Stroke::new(
+            1.0,
+            ui.visuals().widgets.noninteractive.bg_stroke.color,
+        ))
+        .rounding(6.0)
+        .inner_margin(egui::Margin::same(12.0));
+
+    frame.show(ui, |ui| {
+        // Header
+        ui.horizontal(|ui| {
+            ui.label("📁");
+            ui.label(
+                egui::RichText::new("Local Configuration")
+                    .size(14.0)
+                    .strong(),
+            );
+        });
+
+        ui.add_space(8.0);
+
+        // Known hosts file
+        ui.vertical(|ui| {
+            ui.label(
+                egui::RichText::new("Known Hosts File Path")
+                    .size(13.0)
+                    .strong(),
+            );
+            ui.add_space(3.0);
+            ui.add_sized(
+                [ui.available_width(), 28.0],
+                egui::TextEdit::singleline(&mut settings.known_hosts)
+                    .hint_text("~/.ssh/known_hosts")
+                    .font(egui::FontId::new(14.0, egui::FontFamily::Monospace))
+                    .margin(egui::Margin::symmetric(8.0, 6.0)),
+            );
+
+            ui.add_space(8.0);
+
+            // In-place update option with better styling
+            ui.horizontal(|ui| {
+                ui.checkbox(&mut settings.in_place, "");
+                ui.vertical(|ui| {
+                    ui.label(
+                        egui::RichText::new("Update file in-place after sync")
+                            .size(13.0)
+                            .strong(),
+                    );
+                    ui.label(
+                        egui::RichText::new(
+                            "Automatically modify the known_hosts file when synchronizing",
+                        )
+                        .size(12.0)
+                        .weak()
+                        .italics(),
+                    );
+                });
+            });
+        });
+    });
+
+    ui.add_space(8.0);
+}
+
+/// Auto-sync configuration card
+fn render_auto_sync_card(
+    ui: &mut egui::Ui,
+    settings: &mut KhmSettings,
+    auto_sync_interval_str: &mut String,
+) {
+    let frame = egui::Frame::group(ui.style())
+        .fill(ui.visuals().faint_bg_color)
+        .stroke(egui::Stroke::new(
+            1.0,
+            ui.visuals().widgets.noninteractive.bg_stroke.color,
+        ))
+        .rounding(6.0)
+        .inner_margin(egui::Margin::same(12.0));
+
+    frame.show(ui, |ui| {
+        let is_auto_sync_enabled =
+            !settings.host.is_empty() && !settings.flow.is_empty() && settings.in_place;
+
+        // Header with status
+        ui.horizontal(|ui| {
+            ui.label("🔄");
+            ui.label(egui::RichText::new("Auto Sync").size(14.0).strong());
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                let (status_text, status_color) = if is_auto_sync_enabled {
+                    ("✅ Active", egui::Color32::GREEN)
+                } else {
+                    ("❌ Inactive", egui::Color32::from_gray(128))
+                };
+
+                ui.label(
+                    egui::RichText::new(status_text)
+                        .size(12.0)
+                        .color(status_color),
+                );
+            });
+        });
+
+        ui.add_space(8.0);
+
+        // Interval setting
+        ui.horizontal(|ui| {
+            ui.label(egui::RichText::new("Interval").size(13.0).strong());
+            ui.add_space(6.0);
+            ui.add_sized(
+                [80.0, 26.0], // Smaller height
+                egui::TextEdit::singleline(auto_sync_interval_str)
+                    .font(egui::FontId::new(14.0, egui::FontFamily::Monospace))
+                    .margin(egui::Margin::symmetric(6.0, 5.0)),
+            );
+            ui.label("min");
+
+            // Update the actual setting
+            if let Ok(value) = auto_sync_interval_str.parse::<u32>() {
+                if value > 0 {
+                    settings.auto_sync_interval_minutes = value;
+                }
+            }
+        });
+
+        // Requirements - always visible
+        ui.add_space(8.0);
+        ui.separator();
+        ui.add_space(8.0);
+
+        ui.vertical(|ui| {
+            ui.label(egui::RichText::new("Requirements:").size(12.0).strong());
+            ui.add_space(3.0);
+
+            let host_ok = !settings.host.is_empty();
+            let flow_ok = !settings.flow.is_empty();
+            let in_place_ok = settings.in_place;
+
+            ui.horizontal(|ui| {
+                let (icon, color) = if host_ok {
+                    ("✅", egui::Color32::GREEN)
+                } else {
+                    ("❌", egui::Color32::RED)
+                };
+                ui.label(egui::RichText::new(icon).color(color));
+                ui.label(egui::RichText::new("Host URL").size(11.0));
+            });
+
+            ui.horizontal(|ui| {
+                let (icon, color) = if flow_ok {
+                    ("✅", egui::Color32::GREEN)
+                } else {
+                    ("❌", egui::Color32::RED)
+                };
+                ui.label(egui::RichText::new(icon).color(color));
+                ui.label(egui::RichText::new("Flow name").size(11.0));
+            });
+
+            ui.horizontal(|ui| {
+                let (icon, color) = if in_place_ok {
+                    ("✅", egui::Color32::GREEN)
+                } else {
+                    ("❌", egui::Color32::RED)
+                };
+                ui.label(egui::RichText::new(icon).color(color));
+                ui.label(egui::RichText::new("In-place update").size(11.0));
+            });
+        });
+    });
+
+    ui.add_space(8.0);
+}
+
+/// System information card
+fn render_system_info_card(ui: &mut egui::Ui) {
+    let frame = egui::Frame::group(ui.style())
+        .fill(ui.visuals().extreme_bg_color)
+        .stroke(egui::Stroke::new(
+            1.0,
+            ui.visuals().widgets.noninteractive.bg_stroke.color,
+        ))
+        .rounding(6.0)
+        .inner_margin(egui::Margin::same(12.0));
+
+    frame.show(ui, |ui| {
+        // Header
+        ui.horizontal(|ui| {
+            ui.label("🔧");
+            ui.label(egui::RichText::new("System Info").size(14.0).strong());
+        });
+
+        ui.add_space(8.0);
+
+        // Config file location
+        ui.vertical(|ui| {
+            ui.label(egui::RichText::new("Config File").size(13.0).strong());
+            ui.add_space(3.0);
+
+            let config_path = get_config_path();
+            let path_str = config_path.display().to_string();
+
+            ui.vertical(|ui| {
+                ui.add_sized(
+                    [ui.available_width(), 26.0], // Smaller height
+                    egui::TextEdit::singleline(&mut path_str.clone())
+                        .interactive(false)
+                        .font(egui::FontId::new(12.0, egui::FontFamily::Monospace))
+                        .margin(egui::Margin::symmetric(8.0, 5.0)),
+                );
+
+                ui.add_space(4.0);
+
+                if ui.small_button("📋 Copy Path").clicked() {
+                    ui.output_mut(|o| o.copied_text = path_str);
+                }
+            });
+        });
+    });
+
+    ui.add_space(8.0);
+}
+
+/// Action section with buttons only (Activity Log moved to bottom panel)
+fn render_action_section(
+    ui: &mut egui::Ui,
+    ctx: &egui::Context,
+    settings: &KhmSettings,
+    connection_tab: &mut ConnectionTab,
+    operation_log: &mut Vec<String>,
+) {
+    ui.add_space(2.0);
+
+    // Validation for save button
+    let save_enabled = !settings.host.is_empty() && !settings.flow.is_empty();
+
+    // Action buttons with modern styling
+    render_modern_action_buttons(
+        ui,
+        ctx,
+        settings,
+        connection_tab,
+        save_enabled,
+        operation_log,
+    );
+}
+
+/// Modern action buttons with improved styling and layout
+fn render_modern_action_buttons(
+    ui: &mut egui::Ui,
+    ctx: &egui::Context,
+    settings: &KhmSettings,
+    connection_tab: &mut ConnectionTab,
+    save_enabled: bool,
+    operation_log: &mut Vec<String>,
+) {
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 8.0;
+
+        // Primary actions (left side)
+        let mut save_button = ui.add_enabled(
+            save_enabled,
+            egui::Button::new(
+                egui::RichText::new("💾 Save & Close")
+                    .size(13.0)
+                    .color(egui::Color32::WHITE)
+            )
+            .fill(if save_enabled {
+                egui::Color32::from_rgb(0, 120, 212)
+            } else {
+                ui.visuals().widgets.inactive.bg_fill
+            })
+            .min_size(egui::vec2(120.0, 32.0))
+            .rounding(6.0)
+        );
+
+        // Add tooltip when button is disabled
+        if !save_enabled {
+            save_button = save_button.on_hover_text("Complete server configuration to enable saving:\n• Host URL is required\n• Flow name is required");
+        }
+
+        if save_button.clicked() {
+            match save_settings_validated(settings) {
+                Ok(()) => {
+                    add_log_entry(operation_log, "✅ Settings saved successfully".to_string());
+                    ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+                }
+                Err(e) => {
+                    add_log_entry(operation_log, format!("❌ Failed to save settings: {}", e));
+                }
+            }
+        }
+
+        if ui.add(
+            egui::Button::new(
+                egui::RichText::new("✖ Cancel")
+                    .size(13.0)
+                    .color(ui.visuals().text_color())
+            )
+            .stroke(egui::Stroke::new(1.0, ui.visuals().text_color()))
+            .fill(egui::Color32::TRANSPARENT)
+            .min_size(egui::vec2(80.0, 32.0))
+            .rounding(6.0)
+        ).clicked() {
+            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+        }
+
+        // Spacer
+        ui.add_space(ui.available_width() - 220.0);
+
+        // Secondary actions (right side)
+        let can_test = !settings.host.is_empty() && !settings.flow.is_empty() && !connection_tab.is_testing_connection;
+        let can_sync = !settings.host.is_empty() && !settings.flow.is_empty() && !connection_tab.is_syncing;
+
+        if ui.add_enabled(
+            can_test,
+            egui::Button::new(
+                egui::RichText::new(
+                    if connection_tab.is_testing_connection {
+                        "🔄 Testing..."
+                    } else {
+                        "🔍 Test"
+                    }
+                )
+                .size(13.0)
+                .color(egui::Color32::WHITE)
+            )
+            .fill(if can_test {
+                egui::Color32::from_rgb(16, 124, 16)
+            } else {
+                ui.visuals().widgets.inactive.bg_fill
+            })
+            .min_size(egui::vec2(80.0, 32.0))
+            .rounding(6.0)
+        ).on_hover_text("Test server connection").clicked() {
+            add_log_entry(operation_log, "🔍 Testing connection...".to_string());
+            connection_tab.start_test(settings, ctx);
+        }
+
+        if ui.add_enabled(
+            can_sync,
+            egui::Button::new(
+                egui::RichText::new(
+                    if connection_tab.is_syncing {
+                        "🔄 Syncing..."
+                    } else {
+                        "🔄 Sync"
+                    }
+                )
+                .size(13.0)
+                .color(egui::Color32::WHITE)
+            )
+            .fill(if can_sync {
+                egui::Color32::from_rgb(255, 140, 0)
+            } else {
+                ui.visuals().widgets.inactive.bg_fill
+            })
+            .min_size(egui::vec2(80.0, 32.0))
+            .rounding(6.0)
+        ).on_hover_text("Synchronize SSH keys now").clicked() {
+            add_log_entry(operation_log, "🔄 Starting sync...".to_string());
+            connection_tab.start_sync(settings, ctx);
+        }
+    });
+}
+
+/// Add entry to operation log with timestamp
+pub fn add_log_entry(operation_log: &mut Vec<String>, message: String) {
+    let now = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .unwrap();
+    let secs = now.as_secs();
+    let millis = now.subsec_millis();
+
+    // Format as HH:MM:SS.mmm
+    let hours = (secs / 3600) % 24;
+    let minutes = (secs / 60) % 60;
+    let seconds = secs % 60;
+    let timestamp = format!("{:02}:{:02}:{:02}.{:03}", hours, minutes, seconds, millis);
+
+    let log_entry = format!("{} {}", timestamp, message);
+
+    operation_log.push(log_entry);
+
+    // Keep only last 20 entries to prevent memory growth
+    if operation_log.len() > 20 {
+        operation_log.remove(0);
+    }
+}

src/gui/settings/window.rs

@@ -0,0 +1,638 @@
+use crate::gui::admin::{
+    render_bulk_actions, render_keys_table, render_search_controls, render_statistics,
+    AdminOperation, AdminState, BulkAction, KeyAction,
+};
+use crate::gui::api::{
+    bulk_deprecate_servers, bulk_restore_servers, delete_key, deprecate_key, restore_key, SshKey,
+};
+use crate::gui::common::{load_settings, KhmSettings};
+use eframe::egui;
+use log::info;
+use std::sync::mpsc;
+
+use super::connection::{ConnectionTab, SettingsTab};
+use super::ui::{add_log_entry, render_connection_tab};
+
+pub struct SettingsWindow {
+    settings: KhmSettings,
+    auto_sync_interval_str: String,
+    current_tab: SettingsTab,
+    connection_tab: ConnectionTab,
+    admin_state: AdminState,
+    admin_receiver: Option<mpsc::Receiver<Result<Vec<SshKey>, String>>>,
+    operation_receiver: Option<mpsc::Receiver<Result<String, String>>>,
+    operation_log: Vec<String>,
+}
+
+impl SettingsWindow {
+    pub fn new() -> Self {
+        let settings = load_settings();
+        let auto_sync_interval_str = settings.auto_sync_interval_minutes.to_string();
+
+        let mut instance = Self {
+            settings,
+            auto_sync_interval_str,
+            current_tab: SettingsTab::Connection,
+            connection_tab: ConnectionTab::default(),
+            admin_state: AdminState::default(),
+            admin_receiver: None,
+            operation_receiver: None,
+            operation_log: Vec::new(),
+        };
+
+        // Auto-test connection if configuration is found and valid
+        if !instance.settings.host.is_empty() && !instance.settings.flow.is_empty() {
+            add_log_entry(
+                &mut instance.operation_log,
+                "🔍 Auto-testing connection with saved configuration...".to_string(),
+            );
+            // We can't call start_test here because we don't have egui::Context yet
+            // So we set a flag to trigger test on first frame
+            instance.connection_tab.should_auto_test = true;
+        }
+
+        instance
+    }
+}
+
+impl eframe::App for SettingsWindow {
+    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+        // Check for admin operation results
+        self.check_admin_results(ctx);
+
+        // Apply enhanced modern dark theme
+        apply_modern_theme(ctx);
+
+        // Bottom panel for Activity Log (fixed at bottom)
+        egui::TopBottomPanel::bottom("activity_log_panel")
+            .resizable(false)
+            .min_height(140.0)
+            .max_height(140.0)
+            .frame(
+                egui::Frame::none()
+                    .fill(egui::Color32::from_gray(12))
+                    .stroke(egui::Stroke::new(1.0, egui::Color32::from_gray(60))),
+            )
+            .show(ctx, |ui| {
+                render_bottom_activity_log(ui, &mut self.operation_log);
+            });
+
+        egui::CentralPanel::default()
+            .frame(
+                egui::Frame::none()
+                    .fill(egui::Color32::from_gray(18))
+                    .inner_margin(egui::Margin::same(20.0)),
+            )
+            .show(ctx, |ui| {
+                // Modern header with gradient-like styling
+                let header_frame = egui::Frame::none()
+                    .fill(ui.visuals().panel_fill)
+                    .rounding(egui::Rounding::same(8.0))
+                    .inner_margin(egui::Margin::same(12.0))
+                    .stroke(egui::Stroke::new(
+                        1.0,
+                        ui.visuals().widgets.noninteractive.bg_stroke.color,
+                    ));
+
+                header_frame.show(ui, |ui| {
+                    ui.horizontal(|ui| {
+                        ui.add_space(4.0);
+                        ui.label("🔑");
+                        ui.heading(egui::RichText::new("KHM Settings").size(20.0).strong());
+                        ui.label(
+                            egui::RichText::new(
+                                "(Known Hosts Manager for SSH key management and synchronization)",
+                            )
+                            .size(11.0)
+                            .weak()
+                            .italics(),
+                        );
+
+                        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                            // Version from Cargo.toml
+                            let version = env!("CARGO_PKG_VERSION");
+                            if ui
+                                .small_button(format!("v{}", version))
+                                .on_hover_text(format!(
+                                    "{}\n{}\nRepository: {}\nLicense: {}",
+                                    env!("CARGO_PKG_DESCRIPTION"),
+                                    env!("CARGO_PKG_AUTHORS"),
+                                    env!("CARGO_PKG_REPOSITORY"),
+                                    "WTFPL"
+                                ))
+                                .clicked()
+                            {
+                                // Open repository URL
+                                if let Err(_) = std::process::Command::new("open")
+                                    .arg(env!("CARGO_PKG_REPOSITORY"))
+                                    .spawn()
+                                {
+                                    // Fallback for non-macOS systems
+                                    let _ = std::process::Command::new("xdg-open")
+                                        .arg(env!("CARGO_PKG_REPOSITORY"))
+                                        .spawn();
+                                }
+                            }
+                        });
+                    });
+                });
+
+                ui.add_space(12.0);
+
+                // Modern tab selector with card styling
+                ui.horizontal(|ui| {
+                    ui.spacing_mut().item_spacing.x = 6.0;
+
+                    // Connection/Settings Tab
+                    let connection_selected = matches!(self.current_tab, SettingsTab::Connection);
+                    let connection_button =
+                        egui::Button::new(egui::RichText::new("🌐 Connection").size(13.0))
+                            .fill(if connection_selected {
+                                egui::Color32::from_rgb(0, 120, 212)
+                            } else {
+                                ui.visuals().widgets.inactive.bg_fill
+                            })
+                            .stroke(if connection_selected {
+                                egui::Stroke::new(1.0, egui::Color32::from_rgb(0, 120, 212))
+                            } else {
+                                egui::Stroke::new(
+                                    1.0,
+                                    ui.visuals().widgets.noninteractive.bg_stroke.color,
+                                )
+                            })
+                            .rounding(6.0)
+                            .min_size(egui::vec2(110.0, 32.0));
+
+                    if ui.add(connection_button).clicked() {
+                        self.current_tab = SettingsTab::Connection;
+                    }
+
+                    // Admin Tab
+                    let admin_selected = matches!(self.current_tab, SettingsTab::Admin);
+                    let admin_button =
+                        egui::Button::new(egui::RichText::new("🔧 Admin Panel").size(13.0))
+                            .fill(if admin_selected {
+                                egui::Color32::from_rgb(120, 80, 0)
+                            } else {
+                                ui.visuals().widgets.inactive.bg_fill
+                            })
+                            .stroke(if admin_selected {
+                                egui::Stroke::new(1.0, egui::Color32::from_rgb(120, 80, 0))
+                            } else {
+                                egui::Stroke::new(
+                                    1.0,
+                                    ui.visuals().widgets.noninteractive.bg_stroke.color,
+                                )
+                            })
+                            .rounding(6.0)
+                            .min_size(egui::vec2(110.0, 32.0));
+
+                    if ui.add(admin_button).clicked() {
+                        self.current_tab = SettingsTab::Admin;
+                    }
+                });
+
+                ui.add_space(16.0);
+
+                // Content area with proper spacing
+                match self.current_tab {
+                    SettingsTab::Connection => {
+                        render_connection_tab(
+                            ui,
+                            ctx,
+                            &mut self.settings,
+                            &mut self.auto_sync_interval_str,
+                            &mut self.connection_tab,
+                            &mut self.operation_log,
+                        );
+                    }
+                    SettingsTab::Admin => {
+                        self.render_admin_tab(ui, ctx);
+                    }
+                }
+            });
+    }
+}
+
+impl SettingsWindow {
+    fn check_admin_results(&mut self, ctx: &egui::Context) {
+        // Check for admin keys loading result
+        if let Some(receiver) = &self.admin_receiver {
+            if let Ok(result) = receiver.try_recv() {
+                self.admin_state.handle_keys_loaded(result);
+                self.admin_receiver = None;
+                ctx.request_repaint();
+            }
+        }
+
+        // Check for operation results
+        if let Some(receiver) = &self.operation_receiver {
+            if let Ok(result) = receiver.try_recv() {
+                match result {
+                    Ok(message) => {
+                        info!("Operation completed: {}", message);
+                        add_log_entry(&mut self.operation_log, format!("✅ {}", message));
+                        // Reload keys after operation
+                        self.load_admin_keys(ctx);
+                    }
+                    Err(error) => {
+                        add_log_entry(
+                            &mut self.operation_log,
+                            format!("❌ Operation failed: {}", error),
+                        );
+                    }
+                }
+                self.admin_state.current_operation = AdminOperation::None;
+                self.operation_receiver = None;
+                ctx.request_repaint();
+            }
+        }
+    }
+
+    fn render_admin_tab(&mut self, ui: &mut egui::Ui, ctx: &egui::Context) {
+        // Admin tab header
+        ui.horizontal(|ui| {
+            ui.label(egui::RichText::new("🔧 Admin Panel").size(18.0).strong());
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                if ui.button("🔁 Refresh").clicked() {
+                    self.load_admin_keys(ctx);
+                }
+
+                if let Some(last_load) = self.admin_state.last_load_time {
+                    let elapsed = last_load.elapsed().as_secs();
+                    ui.label(format!("Updated {}s ago", elapsed));
+                }
+            });
+        });
+
+        ui.separator();
+        ui.add_space(10.0);
+
+        // Check if connection is configured
+        if self.settings.host.is_empty() || self.settings.flow.is_empty() {
+            ui.vertical_centered(|ui| {
+                ui.label(
+                    egui::RichText::new("❗ Please configure connection settings first")
+                        .size(16.0)
+                        .color(egui::Color32::YELLOW),
+                );
+                ui.add_space(10.0);
+                if ui.button("Go to Connection Settings").clicked() {
+                    self.current_tab = SettingsTab::Connection;
+                }
+            });
+            return;
+        }
+
+        // Load keys automatically on first view
+        if self.admin_state.keys.is_empty()
+            && !matches!(
+                self.admin_state.current_operation,
+                AdminOperation::LoadingKeys
+            )
+        {
+            self.load_admin_keys(ctx);
+        }
+
+        // Show loading state
+        if matches!(
+            self.admin_state.current_operation,
+            AdminOperation::LoadingKeys
+        ) {
+            ui.vertical_centered(|ui| {
+                ui.spinner();
+                ui.label("Loading keys...");
+            });
+            return;
+        }
+
+        // Statistics section
+        render_statistics(ui, &self.admin_state);
+        ui.add_space(10.0);
+
+        // Search and filters
+        render_search_controls(ui, &mut self.admin_state);
+        ui.add_space(10.0);
+
+        // Bulk actions
+        let bulk_action = render_bulk_actions(ui, &mut self.admin_state);
+        self.handle_bulk_action(bulk_action, ctx);
+
+        if self.admin_state.selected_servers.values().any(|&v| v) {
+            ui.add_space(8.0);
+        }
+
+        // Keys table
+        egui::ScrollArea::vertical()
+            .max_height(450.0)
+            .auto_shrink([false; 2])
+            .show(ui, |ui| {
+                let key_action = render_keys_table(ui, &mut self.admin_state);
+                self.handle_key_action(key_action, ctx);
+            });
+    }
+
+    fn load_admin_keys(&mut self, ctx: &egui::Context) {
+        if let Some(receiver) = self.admin_state.load_keys(&self.settings, ctx) {
+            self.admin_receiver = Some(receiver);
+        }
+    }
+
+    fn handle_bulk_action(&mut self, action: BulkAction, ctx: &egui::Context) {
+        match action {
+            BulkAction::DeprecateSelected => {
+                let selected = self.admin_state.get_selected_servers();
+                if !selected.is_empty() {
+                    self.start_bulk_deprecate(selected, ctx);
+                }
+            }
+            BulkAction::RestoreSelected => {
+                let selected = self.admin_state.get_selected_servers();
+                if !selected.is_empty() {
+                    self.start_bulk_restore(selected, ctx);
+                }
+            }
+            BulkAction::ClearSelection => {
+                // Selection already cleared in UI
+            }
+            BulkAction::None => {}
+        }
+    }
+
+    fn handle_key_action(&mut self, action: KeyAction, ctx: &egui::Context) {
+        match action {
+            KeyAction::DeprecateKey(server) | KeyAction::DeprecateServer(server) => {
+                self.start_deprecate_key(&server, ctx);
+            }
+            KeyAction::RestoreKey(server) | KeyAction::RestoreServer(server) => {
+                self.start_restore_key(&server, ctx);
+            }
+            KeyAction::DeleteKey(server) => {
+                self.start_delete_key(&server, ctx);
+            }
+            KeyAction::None => {}
+        }
+    }
+
+    fn start_bulk_deprecate(&mut self, servers: Vec<String>, ctx: &egui::Context) {
+        self.admin_state.current_operation = AdminOperation::BulkDeprecating;
+        add_log_entry(
+            &mut self.operation_log,
+            format!("Deprecating {} servers...", servers.len()),
+        );
+
+        let (tx, rx) = mpsc::channel();
+        self.operation_receiver = Some(rx);
+
+        let host = self.settings.host.clone();
+        let flow = self.settings.flow.clone();
+        let basic_auth = self.settings.basic_auth.clone();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result = rt
+                .block_on(async { bulk_deprecate_servers(host, flow, basic_auth, servers).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    fn start_bulk_restore(&mut self, servers: Vec<String>, ctx: &egui::Context) {
+        self.admin_state.current_operation = AdminOperation::BulkRestoring;
+        add_log_entry(
+            &mut self.operation_log,
+            format!("Restoring {} servers...", servers.len()),
+        );
+
+        let (tx, rx) = mpsc::channel();
+        self.operation_receiver = Some(rx);
+
+        let host = self.settings.host.clone();
+        let flow = self.settings.flow.clone();
+        let basic_auth = self.settings.basic_auth.clone();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result =
+                rt.block_on(async { bulk_restore_servers(host, flow, basic_auth, servers).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    fn start_deprecate_key(&mut self, server: &str, ctx: &egui::Context) {
+        self.admin_state.current_operation = AdminOperation::DeprecatingKey;
+        add_log_entry(
+            &mut self.operation_log,
+            format!("Deprecating key for server: {}", server),
+        );
+
+        let (tx, rx) = mpsc::channel();
+        self.operation_receiver = Some(rx);
+
+        let host = self.settings.host.clone();
+        let flow = self.settings.flow.clone();
+        let basic_auth = self.settings.basic_auth.clone();
+        let server_name = server.to_string();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result =
+                rt.block_on(async { deprecate_key(host, flow, basic_auth, server_name).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    fn start_restore_key(&mut self, server: &str, ctx: &egui::Context) {
+        self.admin_state.current_operation = AdminOperation::RestoringKey;
+        add_log_entry(
+            &mut self.operation_log,
+            format!("Restoring key for server: {}", server),
+        );
+
+        let (tx, rx) = mpsc::channel();
+        self.operation_receiver = Some(rx);
+
+        let host = self.settings.host.clone();
+        let flow = self.settings.flow.clone();
+        let basic_auth = self.settings.basic_auth.clone();
+        let server_name = server.to_string();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result =
+                rt.block_on(async { restore_key(host, flow, basic_auth, server_name).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+
+    fn start_delete_key(&mut self, server: &str, ctx: &egui::Context) {
+        self.admin_state.current_operation = AdminOperation::DeletingKey;
+        add_log_entry(
+            &mut self.operation_log,
+            format!("Deleting key for server: {}", server),
+        );
+
+        let (tx, rx) = mpsc::channel();
+        self.operation_receiver = Some(rx);
+
+        let host = self.settings.host.clone();
+        let flow = self.settings.flow.clone();
+        let basic_auth = self.settings.basic_auth.clone();
+        let server_name = server.to_string();
+        let ctx_clone = ctx.clone();
+
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            let result =
+                rt.block_on(async { delete_key(host, flow, basic_auth, server_name).await });
+
+            let _ = tx.send(result);
+            ctx_clone.request_repaint();
+        });
+    }
+}
+
+/// Apply modern dark theme for the settings window with enhanced styling
+fn apply_modern_theme(ctx: &egui::Context) {
+    let mut visuals = egui::Visuals::dark();
+
+    // Modern color palette
+    visuals.window_fill = egui::Color32::from_gray(18); // Darker background
+    visuals.panel_fill = egui::Color32::from_gray(24); // Panel background
+    visuals.faint_bg_color = egui::Color32::from_gray(32); // Card background
+    visuals.extreme_bg_color = egui::Color32::from_gray(12); // Darkest areas
+
+    // Enhanced widget styling
+    visuals.button_frame = true;
+    visuals.collapsing_header_frame = true;
+    visuals.indent_has_left_vline = true;
+    visuals.striped = true;
+
+    // Modern rounded corners
+    let rounding = egui::Rounding::same(8.0);
+    visuals.menu_rounding = rounding;
+    visuals.window_rounding = egui::Rounding::same(16.0);
+    visuals.widgets.noninteractive.rounding = rounding;
+    visuals.widgets.inactive.rounding = rounding;
+    visuals.widgets.hovered.rounding = rounding;
+    visuals.widgets.active.rounding = rounding;
+
+    // Better widget colors
+    visuals.widgets.noninteractive.bg_fill = egui::Color32::from_gray(40);
+    visuals.widgets.inactive.bg_fill = egui::Color32::from_gray(45);
+    visuals.widgets.hovered.bg_fill = egui::Color32::from_gray(55);
+    visuals.widgets.active.bg_fill = egui::Color32::from_gray(60);
+
+    // Subtle borders
+    let border_color = egui::Color32::from_gray(60);
+    visuals.widgets.noninteractive.bg_stroke = egui::Stroke::new(1.0, border_color);
+    visuals.widgets.inactive.bg_stroke = egui::Stroke::new(1.0, border_color);
+    visuals.widgets.hovered.bg_stroke = egui::Stroke::new(1.5, egui::Color32::from_gray(80));
+    visuals.widgets.active.bg_stroke = egui::Stroke::new(1.5, egui::Color32::from_gray(100));
+
+    ctx.set_visuals(visuals);
+}
+
+/// Render bottom activity log panel
+fn render_bottom_activity_log(ui: &mut egui::Ui, operation_log: &mut Vec<String>) {
+    ui.add_space(18.0); // Larger top padding
+
+    ui.horizontal(|ui| {
+        ui.add_space(8.0);
+        ui.label("📋");
+        ui.label(egui::RichText::new("Activity Log").size(13.0).strong());
+
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
+            ui.add_space(8.0);
+            if ui.small_button("🗑 Clear").clicked() {
+                operation_log.clear();
+            }
+        });
+    });
+
+    ui.add_space(8.0);
+
+    // Add horizontal margin for the text area
+    ui.horizontal(|ui| {
+        ui.add_space(8.0); // Left margin
+
+        // Show last 5 log entries in multiline text
+        let log_text = if operation_log.is_empty() {
+            "No recent activity".to_string()
+        } else {
+            let start_idx = if operation_log.len() > 5 {
+                operation_log.len() - 5
+            } else {
+                0
+            };
+            operation_log[start_idx..].join("\n")
+        };
+
+        ui.add_sized(
+            [ui.available_width() - 8.0, 80.0], // Account for right margin
+            egui::TextEdit::multiline(&mut log_text.clone())
+                .font(egui::FontId::new(11.0, egui::FontFamily::Monospace))
+                .interactive(false),
+        );
+
+        ui.add_space(8.0); // Right margin
+    });
+}
+
+/// Create window icon for settings window
+pub fn create_window_icon() -> egui::IconData {
+    // Create a simple programmatic icon (blue square with white border)
+    let icon_size = 32;
+    let icon_data: Vec<u8> = (0..icon_size * icon_size)
+        .flat_map(|i| {
+            let y = i / icon_size;
+            let x = i % icon_size;
+            if x < 2 || x >= 30 || y < 2 || y >= 30 {
+                [255, 255, 255, 255] // White border
+            } else {
+                [64, 128, 255, 255] // Blue center
+            }
+        })
+        .collect();
+
+    egui::IconData {
+        rgba: icon_data,
+        width: icon_size as u32,
+        height: icon_size as u32,
+    }
+}
+
+/// Run the settings window application with modern horizontal styling
+pub fn run_settings_window() {
+    let options = eframe::NativeOptions {
+        viewport: egui::ViewportBuilder::default()
+            .with_title("KHM Settings")
+            .with_inner_size([900.0, 905.0]) // Decreased height by another 15px
+            .with_min_inner_size([900.0, 905.0]) // Fixed size
+            .with_max_inner_size([900.0, 905.0]) // Same as min - fixed size
+            .with_resizable(false) // Disable resizing since window is fixed size
+            .with_icon(create_window_icon())
+            .with_decorations(true)
+            .with_transparent(false),
+        centered: true,
+        ..Default::default()
+    };
+
+    let _ = eframe::run_native(
+        "KHM Settings",
+        options,
+        Box::new(|_cc| Ok(Box::new(SettingsWindow::new()))),
+    );
+}

src/gui/tray/app.rs

@@ -0,0 +1,476 @@
+use log::{error, info};
+
+#[cfg(feature = "gui")]
+use notify::RecursiveMode;
+#[cfg(feature = "gui")]
+use notify_debouncer_mini::{new_debouncer, DebounceEventResult};
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+use tray_icon::{menu::MenuEvent, TrayIcon};
+use winit::{
+    application::ApplicationHandler,
+    event_loop::{EventLoop, EventLoopProxy},
+};
+
+#[cfg(target_os = "macos")]
+use winit::platform::macos::EventLoopBuilderExtMacOS;
+
+#[cfg(target_os = "linux")]
+use gtk::glib;
+
+// Channel for Linux tray communication
+
+#[cfg(target_os = "linux")]
+enum LinuxTrayCommand {
+    CreateTray {
+        settings: KhmSettings,
+        sync_status: SyncStatus,
+    },
+    UpdateMenu {
+        settings: KhmSettings,
+    },
+    SetTooltip {
+        tooltip: String,
+    },
+    #[allow(dead_code)]
+    Quit,
+}
+
+#[cfg(target_os = "linux")]
+enum LinuxTrayResponse {
+    TrayCreated {
+        menu_ids: TrayMenuIds,
+    },
+    #[allow(dead_code)]
+    MenuUpdated {
+        menu_ids: TrayMenuIds,
+    },
+    Error(String),
+}
+
+use super::{
+    create_tooltip, create_tray_icon, start_auto_sync_task, update_sync_status, update_tray_menu,
+    SyncStatus, TrayMenuIds,
+};
+use crate::gui::common::{get_config_path, load_settings, perform_sync, KhmSettings};
+
+pub struct TrayApplication {
+    #[cfg(not(target_os = "linux"))]
+    tray_icon: Option<TrayIcon>,
+    #[cfg(target_os = "linux")]
+    linux_tray_tx: Option<std::sync::mpsc::Sender<LinuxTrayCommand>>,
+    #[cfg(target_os = "linux")]
+    linux_tray_handle: Option<std::thread::JoinHandle<()>>,
+    menu_ids: Option<TrayMenuIds>,
+    settings: Arc<Mutex<KhmSettings>>,
+    sync_status: Arc<Mutex<SyncStatus>>,
+    #[cfg(feature = "gui")]
+    _debouncer: Option<notify_debouncer_mini::Debouncer<notify::RecommendedWatcher>>,
+    proxy: EventLoopProxy<crate::gui::UserEvent>,
+    auto_sync_handle: Option<std::thread::JoinHandle<()>>,
+}
+
+impl TrayApplication {
+    pub fn new(proxy: EventLoopProxy<crate::gui::UserEvent>) -> Self {
+        Self {
+            #[cfg(not(target_os = "linux"))]
+            tray_icon: None,
+            #[cfg(target_os = "linux")]
+            linux_tray_tx: None,
+            #[cfg(target_os = "linux")]
+            linux_tray_handle: None,
+            menu_ids: None,
+            settings: Arc::new(Mutex::new(load_settings())),
+            sync_status: Arc::new(Mutex::new(SyncStatus::default())),
+            #[cfg(feature = "gui")]
+            _debouncer: None,
+            proxy,
+            auto_sync_handle: None,
+        }
+    }
+
+    #[cfg(feature = "gui")]
+    fn setup_file_watcher(&mut self) {
+        let config_path = get_config_path();
+        let (tx, rx) = std::sync::mpsc::channel::<DebounceEventResult>();
+        let proxy = self.proxy.clone();
+
+        std::thread::spawn(move || {
+            while let Ok(result) = rx.recv() {
+                if let Ok(events) = result {
+                    if events
+                        .iter()
+                        .any(|e| e.path.to_string_lossy().contains("khm_config.json"))
+                    {
+                        let _ = proxy.send_event(crate::gui::UserEvent::ConfigFileChanged);
+                    }
+                }
+            }
+        });
+
+        if let Ok(mut debouncer) = new_debouncer(Duration::from_millis(500), tx) {
+            if let Some(config_dir) = config_path.parent() {
+                if debouncer
+                    .watcher()
+                    .watch(config_dir, RecursiveMode::NonRecursive)
+                    .is_ok()
+                {
+                    info!("File watcher started");
+                    self._debouncer = Some(debouncer);
+                } else {
+                    error!("Failed to start file watcher");
+                }
+            }
+        }
+    }
+
+    fn handle_config_change(&mut self) {
+        info!("Config file changed");
+        let new_settings = load_settings();
+        let old_interval = self.settings.lock().unwrap().auto_sync_interval_minutes;
+        let new_interval = new_settings.auto_sync_interval_minutes;
+
+        *self.settings.lock().unwrap() = new_settings;
+
+        // Update menu
+        #[cfg(not(target_os = "linux"))]
+        if let Some(tray_icon) = &self.tray_icon {
+            let settings = self.settings.lock().unwrap();
+            let new_menu_ids = update_tray_menu(tray_icon, &settings);
+            self.menu_ids = Some(new_menu_ids);
+        }
+        
+        #[cfg(target_os = "linux")]
+        if let Some(ref tx) = self.linux_tray_tx {
+            let settings = self.settings.lock().unwrap().clone();
+            let _ = tx.send(LinuxTrayCommand::UpdateMenu { settings });
+        }
+
+        // Update tooltip
+        self.update_tooltip();
+
+        // Restart auto sync if interval changed
+        if old_interval != new_interval {
+            info!(
+                "Auto sync interval changed from {} to {} minutes, restarting auto sync",
+                old_interval, new_interval
+            );
+            self.start_auto_sync();
+        }
+    }
+
+    fn start_auto_sync(&mut self) {
+        if let Some(handle) = self.auto_sync_handle.take() {
+            // Note: In a real implementation, you'd want to properly signal the thread to stop
+            drop(handle);
+        }
+
+        self.auto_sync_handle = start_auto_sync_task(
+            Arc::clone(&self.settings),
+            Arc::clone(&self.sync_status),
+            self.proxy.clone(),
+        );
+    }
+
+    fn update_tooltip(&self) {
+        let settings = self.settings.lock().unwrap();
+        let sync_status = self.sync_status.lock().unwrap();
+        let tooltip = create_tooltip(&settings, &sync_status);
+        
+        #[cfg(not(target_os = "linux"))]
+        if let Some(tray_icon) = &self.tray_icon {
+            let _ = tray_icon.set_tooltip(Some(&tooltip));
+        }
+        
+        #[cfg(target_os = "linux")]
+        if let Some(ref tx) = self.linux_tray_tx {
+            let _ = tx.send(LinuxTrayCommand::SetTooltip { tooltip });
+        }
+    }
+
+    fn handle_menu_event(
+        &mut self,
+        event: MenuEvent,
+        event_loop: &winit::event_loop::ActiveEventLoop,
+    ) {
+        if let Some(menu_ids) = &self.menu_ids {
+            if event.id == menu_ids.settings_id {
+                info!("Settings menu clicked");
+                self.launch_settings_window();
+            } else if event.id == menu_ids.quit_id {
+                info!("Quitting KHM application");
+                event_loop.exit();
+            } else if event.id == menu_ids.sync_id {
+                info!("Starting manual sync operation");
+                self.start_manual_sync();
+            }
+        }
+    }
+
+    fn launch_settings_window(&self) {
+        if let Ok(exe_path) = std::env::current_exe() {
+            std::thread::spawn(move || {
+                if let Err(e) = std::process::Command::new(&exe_path)
+                    .arg("--settings-ui")
+                    .spawn()
+                {
+                    error!("Failed to launch settings window: {}", e);
+                }
+            });
+        }
+    }
+
+    fn start_manual_sync(&self) {
+        let settings = self.settings.lock().unwrap().clone();
+        let sync_status_clone: Arc<Mutex<SyncStatus>> = Arc::clone(&self.sync_status);
+        let proxy_clone = self.proxy.clone();
+
+        // Check if settings are valid
+        if settings.host.is_empty() || settings.flow.is_empty() {
+            error!("Cannot sync: host or flow not configured");
+            return;
+        }
+
+        info!(
+            "Syncing with host: {}, flow: {}",
+            settings.host, settings.flow
+        );
+
+        // Run sync in separate thread with its own tokio runtime
+        std::thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            rt.block_on(async {
+                match perform_sync(&settings).await {
+                    Ok(keys_count) => {
+                        info!("Sync completed successfully with {} keys", keys_count);
+                        let mut status = sync_status_clone.lock().unwrap();
+                        status.last_sync_time = Some(std::time::Instant::now());
+                        status.last_sync_keys = Some(keys_count);
+                        let _ = proxy_clone.send_event(crate::gui::UserEvent::UpdateMenu);
+                    }
+                    Err(e) => {
+                        error!("Sync failed: {}", e);
+                    }
+                }
+            });
+        });
+    }
+
+    fn handle_update_menu(&mut self) {
+        let settings = self.settings.lock().unwrap();
+        if !settings.host.is_empty() && !settings.flow.is_empty() && settings.in_place {
+            let mut sync_status = self.sync_status.lock().unwrap();
+            update_sync_status(&settings, &mut sync_status);
+        }
+        drop(settings);
+
+        self.update_tooltip();
+    }
+}
+
+impl ApplicationHandler<crate::gui::UserEvent> for TrayApplication {
+    fn window_event(
+        &mut self,
+        _event_loop: &winit::event_loop::ActiveEventLoop,
+        _window_id: winit::window::WindowId,
+        _event: winit::event::WindowEvent,
+    ) {
+    }
+
+    fn resumed(&mut self, _event_loop: &winit::event_loop::ActiveEventLoop) {
+        #[cfg(not(target_os = "linux"))]
+        if self.tray_icon.is_none() {
+            info!("Creating tray icon");
+            let settings = self.settings.lock().unwrap();
+            let sync_status = self.sync_status.lock().unwrap();
+            
+            match std::panic::catch_unwind(|| create_tray_icon(&settings, &sync_status)) {
+                Ok((tray_icon, menu_ids)) => {
+                    drop(settings);
+                    drop(sync_status);
+
+                    self.tray_icon = Some(tray_icon);
+                    self.menu_ids = Some(menu_ids);
+
+                    self.setup_file_watcher();
+                    self.start_auto_sync();
+                    info!("KHM tray application ready");
+                }
+                Err(_) => {
+                    drop(settings);
+                    drop(sync_status);
+                    error!("Failed to create tray icon. This usually means the required system libraries are not installed.");
+                    error!("KHM will exit as system tray integration is required for desktop mode.");
+                    std::process::exit(1);
+                }
+            }
+        }
+        
+        #[cfg(target_os = "linux")]
+        if self.linux_tray_tx.is_none() {
+            info!("Creating tray icon on Linux");
+            
+            let (tx, rx) = std::sync::mpsc::channel();
+            let (response_tx, response_rx) = std::sync::mpsc::channel();
+            self.linux_tray_tx = Some(tx.clone());
+            
+            let proxy = self.proxy.clone();
+            
+            // Spawn GTK thread for tray
+            let handle = std::thread::spawn(move || {
+                if let Err(e) = gtk::init() {
+                    error!("Failed to initialize GTK: {}", e);
+                    let _ = response_tx.send(LinuxTrayResponse::Error(format!("GTK init failed: {}", e)));
+                    return;
+                }
+                
+                let mut tray_icon: Option<TrayIcon> = None;
+                
+                // Set up GTK event handlers
+                let _tx_clone = tx.clone();
+                glib::timeout_add_local(std::time::Duration::from_millis(100), move || {
+                    while let Ok(cmd) = rx.try_recv() {
+                        match cmd {
+                            LinuxTrayCommand::CreateTray { settings, sync_status } => {
+                                match std::panic::catch_unwind(|| create_tray_icon(&settings, &sync_status)) {
+                                    Ok((icon, menu_ids)) => {
+                                        tray_icon = Some(icon);
+                                        let _ = response_tx.send(LinuxTrayResponse::TrayCreated { menu_ids });
+                                    }
+                                    Err(_) => {
+                                        let _ = response_tx.send(LinuxTrayResponse::Error("Failed to create tray".to_string()));
+                                    }
+                                }
+                            }
+                            LinuxTrayCommand::UpdateMenu { settings } => {
+                                if let Some(ref icon) = tray_icon {
+                                    let menu_ids = update_tray_menu(icon, &settings);
+                                    let _ = response_tx.send(LinuxTrayResponse::MenuUpdated { menu_ids });
+                                }
+                            }
+                            LinuxTrayCommand::SetTooltip { tooltip } => {
+                                if let Some(ref icon) = tray_icon {
+                                    let _ = icon.set_tooltip(Some(&tooltip));
+                                }
+                            }
+                            LinuxTrayCommand::Quit => {
+                                gtk::main_quit();
+                                return glib::ControlFlow::Break;
+                            }
+                        }
+                    }
+                    
+                    // Check for menu events
+                    if let Ok(event) = MenuEvent::receiver().try_recv() {
+                        let _ = proxy.send_event(crate::gui::UserEvent::MenuEvent(event));
+                    }
+                    
+                    glib::ControlFlow::Continue
+                });
+                
+                gtk::main();
+            });
+            
+            self.linux_tray_handle = Some(handle);
+            
+            // Send command to create tray
+            let settings = self.settings.lock().unwrap().clone();
+            let sync_status = self.sync_status.lock().unwrap().clone();
+            
+            if let Some(ref tx) = self.linux_tray_tx {
+                let _ = tx.send(LinuxTrayCommand::CreateTray { settings, sync_status });
+                
+                // Wait for response
+                match response_rx.recv_timeout(std::time::Duration::from_secs(5)) {
+                    Ok(LinuxTrayResponse::TrayCreated { menu_ids }) => {
+                        self.menu_ids = Some(menu_ids);
+                        self.setup_file_watcher();
+                        self.start_auto_sync();
+                        info!("KHM tray application ready");
+                    }
+                    Ok(LinuxTrayResponse::Error(e)) => {
+                        error!("Failed to create tray icon: {}", e);
+                        error!("This usually means the required system libraries are not installed.");
+                        error!("On Ubuntu/Debian, try installing: sudo apt install libayatana-appindicator3-1");
+                        error!("Alternative: sudo apt install libappindicator3-1");
+                        std::process::exit(1);
+                    }
+                    _ => {
+                        error!("Timeout waiting for tray creation");
+                        std::process::exit(1);
+                    }
+                }
+            }
+        }
+    }
+
+    fn user_event(
+        &mut self,
+        event_loop: &winit::event_loop::ActiveEventLoop,
+        event: crate::gui::UserEvent,
+    ) {
+        match event {
+            crate::gui::UserEvent::TrayIconEvent => {}
+            crate::gui::UserEvent::UpdateMenu => {
+                self.handle_update_menu();
+            }
+            crate::gui::UserEvent::MenuEvent(event) => {
+                self.handle_menu_event(event, event_loop);
+            }
+            crate::gui::UserEvent::ConfigFileChanged => {
+                self.handle_config_change();
+            }
+        }
+    }
+}
+
+/// Run tray application
+pub async fn run_tray_app() -> std::io::Result<()> {
+    #[cfg(target_os = "macos")]
+    let event_loop = {
+        use winit::platform::macos::ActivationPolicy;
+        EventLoop::<crate::gui::UserEvent>::with_user_event()
+            .with_activation_policy(ActivationPolicy::Accessory)
+            .build()
+            .map_err(|e| {
+                std::io::Error::new(
+                    std::io::ErrorKind::Other,
+                    format!("Failed to create event loop: {}", e),
+                )
+            })?
+    };
+
+    #[cfg(not(target_os = "macos"))]
+    let event_loop = EventLoop::<crate::gui::UserEvent>::with_user_event()
+        .build()
+        .map_err(|e| {
+            std::io::Error::new(
+                std::io::ErrorKind::Other,
+                format!("Failed to create event loop: {}", e),
+            )
+        })?;
+
+    let proxy = event_loop.create_proxy();
+
+    // Setup event handlers
+    let proxy_clone = proxy.clone();
+    tray_icon::TrayIconEvent::set_event_handler(Some(move |_event| {
+        let _ = proxy_clone.send_event(crate::gui::UserEvent::TrayIconEvent);
+    }));
+
+    let proxy_clone = proxy.clone();
+    MenuEvent::set_event_handler(Some(move |event: MenuEvent| {
+        let _ = proxy_clone.send_event(crate::gui::UserEvent::MenuEvent(event));
+    }));
+
+    let mut app = TrayApplication::new(proxy);
+
+    event_loop.run_app(&mut app).map_err(|e| {
+        std::io::Error::new(
+            std::io::ErrorKind::Other,
+            format!("Event loop error: {:?}", e),
+        )
+    })?;
+
+    Ok(())
+}

src/gui/tray/icon.rs

@@ -0,0 +1,321 @@
+use crate::gui::common::{perform_sync, KhmSettings};
+use log::{error, info};
+use std::sync::{Arc, Mutex};
+use tray_icon::{
+    menu::{Menu, MenuId, MenuItem},
+    TrayIcon, TrayIconBuilder,
+};
+
+#[derive(Debug, Clone)]
+pub struct SyncStatus {
+    pub last_sync_time: Option<std::time::Instant>,
+    pub last_sync_keys: Option<usize>,
+    pub next_sync_in_seconds: Option<u64>,
+}
+
+impl Default for SyncStatus {
+    fn default() -> Self {
+        Self {
+            last_sync_time: None,
+            last_sync_keys: None,
+            next_sync_in_seconds: None,
+        }
+    }
+}
+
+pub struct TrayMenuIds {
+    pub settings_id: MenuId,
+    pub quit_id: MenuId,
+    pub sync_id: MenuId,
+}
+
+/// Create tray icon with menu
+pub fn create_tray_icon(
+    settings: &KhmSettings,
+    sync_status: &SyncStatus,
+) -> (TrayIcon, TrayMenuIds) {
+    // Create simple blue icon
+    let icon_data: Vec<u8> = (0..32 * 32)
+        .flat_map(|i| {
+            let y = i / 32;
+            let x = i % 32;
+            if x < 2 || x >= 30 || y < 2 || y >= 30 {
+                [255, 255, 255, 255] // White border
+            } else {
+                [64, 128, 255, 255] // Blue center
+            }
+        })
+        .collect();
+
+    let icon = tray_icon::Icon::from_rgba(icon_data, 32, 32).unwrap();
+    let menu = Menu::new();
+
+    // Show current configuration status (static)
+    let host_text = if settings.host.is_empty() {
+        "Host: Not configured"
+    } else {
+        &format!("Host: {}", settings.host)
+    };
+    menu.append(&MenuItem::new(host_text, false, None)).unwrap();
+
+    let flow_text = if settings.flow.is_empty() {
+        "Flow: Not configured"
+    } else {
+        &format!("Flow: {}", settings.flow)
+    };
+    menu.append(&MenuItem::new(flow_text, false, None)).unwrap();
+
+    let is_auto_sync_enabled =
+        !settings.host.is_empty() && !settings.flow.is_empty() && settings.in_place;
+    let sync_text = format!(
+        "Auto sync: {} ({}min)",
+        if is_auto_sync_enabled { "On" } else { "Off" },
+        settings.auto_sync_interval_minutes
+    );
+    menu.append(&MenuItem::new(&sync_text, false, None))
+        .unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Sync Now menu item
+    let sync_item = MenuItem::new(
+        "Sync Now",
+        !settings.host.is_empty() && !settings.flow.is_empty(),
+        None,
+    );
+    let sync_id = sync_item.id().clone();
+    menu.append(&sync_item).unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Settings menu item
+    let settings_item = MenuItem::new("Settings", true, None);
+    let settings_id = settings_item.id().clone();
+    menu.append(&settings_item).unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Quit menu item
+    let quit_item = MenuItem::new("Quit", true, None);
+    let quit_id = quit_item.id().clone();
+    menu.append(&quit_item).unwrap();
+
+    // Create initial tooltip
+    let tooltip = create_tooltip(settings, sync_status);
+
+    let tray_icon = TrayIconBuilder::new()
+        .with_tooltip(&tooltip)
+        .with_icon(icon)
+        .with_menu(Box::new(menu))
+        .build()
+        .unwrap();
+
+    let menu_ids = TrayMenuIds {
+        settings_id,
+        quit_id,
+        sync_id,
+    };
+
+    (tray_icon, menu_ids)
+}
+
+/// Update tray menu with new settings
+pub fn update_tray_menu(tray_icon: &TrayIcon, settings: &KhmSettings) -> TrayMenuIds {
+    let menu = Menu::new();
+
+    // Show current configuration status (static)
+    let host_text = if settings.host.is_empty() {
+        "Host: Not configured"
+    } else {
+        &format!("Host: {}", settings.host)
+    };
+    menu.append(&MenuItem::new(host_text, false, None)).unwrap();
+
+    let flow_text = if settings.flow.is_empty() {
+        "Flow: Not configured"
+    } else {
+        &format!("Flow: {}", settings.flow)
+    };
+    menu.append(&MenuItem::new(flow_text, false, None)).unwrap();
+
+    let is_auto_sync_enabled =
+        !settings.host.is_empty() && !settings.flow.is_empty() && settings.in_place;
+    let sync_text = format!(
+        "Auto sync: {} ({}min)",
+        if is_auto_sync_enabled { "On" } else { "Off" },
+        settings.auto_sync_interval_minutes
+    );
+    menu.append(&MenuItem::new(&sync_text, false, None))
+        .unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Sync Now menu item
+    let sync_item = MenuItem::new(
+        "Sync Now",
+        !settings.host.is_empty() && !settings.flow.is_empty(),
+        None,
+    );
+    let sync_id = sync_item.id().clone();
+    menu.append(&sync_item).unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Settings menu item
+    let settings_item = MenuItem::new("Settings", true, None);
+    let settings_id = settings_item.id().clone();
+    menu.append(&settings_item).unwrap();
+
+    menu.append(&tray_icon::menu::PredefinedMenuItem::separator())
+        .unwrap();
+
+    // Quit menu item
+    let quit_item = MenuItem::new("Quit", true, None);
+    let quit_id = quit_item.id().clone();
+    menu.append(&quit_item).unwrap();
+
+    tray_icon.set_menu(Some(Box::new(menu)));
+
+    TrayMenuIds {
+        settings_id,
+        quit_id,
+        sync_id,
+    }
+}
+
+/// Create tooltip text for tray icon
+pub fn create_tooltip(settings: &KhmSettings, sync_status: &SyncStatus) -> String {
+    let mut tooltip = format!(
+        "KHM - SSH Key Manager\nHost: {}\nFlow: {}",
+        settings.host, settings.flow
+    );
+
+    if let Some(keys_count) = sync_status.last_sync_keys {
+        tooltip.push_str(&format!("\nLast sync: {} keys", keys_count));
+    } else {
+        tooltip.push_str("\nLast sync: Never");
+    }
+
+    if let Some(seconds) = sync_status.next_sync_in_seconds {
+        if seconds > 60 {
+            tooltip.push_str(&format!("\nNext sync: {}m {}s", seconds / 60, seconds % 60));
+        } else {
+            tooltip.push_str(&format!("\nNext sync: {}s", seconds));
+        }
+    }
+
+    tooltip
+}
+
+/// Start auto sync background task
+pub fn start_auto_sync_task(
+    settings: Arc<Mutex<KhmSettings>>,
+    sync_status: Arc<Mutex<SyncStatus>>,
+    event_sender: winit::event_loop::EventLoopProxy<crate::gui::UserEvent>,
+) -> Option<std::thread::JoinHandle<()>> {
+    let initial_settings = settings.lock().unwrap().clone();
+
+    // Only start auto sync if settings are valid and in_place is enabled
+    if initial_settings.host.is_empty()
+        || initial_settings.flow.is_empty()
+        || !initial_settings.in_place
+    {
+        info!("Auto sync disabled or settings invalid");
+        return None;
+    }
+
+    info!(
+        "Starting auto sync with interval {} minutes",
+        initial_settings.auto_sync_interval_minutes
+    );
+
+    let handle = std::thread::spawn(move || {
+        // Initial sync on startup
+        info!("Performing initial sync on startup");
+        let current_settings = settings.lock().unwrap().clone();
+        if !current_settings.host.is_empty() && !current_settings.flow.is_empty() {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            rt.block_on(async {
+                match perform_sync(&current_settings).await {
+                    Ok(keys_count) => {
+                        info!(
+                            "Initial sync completed successfully with {} keys",
+                            keys_count
+                        );
+                        let mut status = sync_status.lock().unwrap();
+                        status.last_sync_time = Some(std::time::Instant::now());
+                        status.last_sync_keys = Some(keys_count);
+                        let _ = event_sender.send_event(crate::gui::UserEvent::UpdateMenu);
+                    }
+                    Err(e) => {
+                        error!("Initial sync failed: {}", e);
+                    }
+                }
+            });
+        }
+
+        // Start menu update timer
+        let timer_sender = event_sender.clone();
+        std::thread::spawn(move || loop {
+            std::thread::sleep(std::time::Duration::from_secs(1));
+            let _ = timer_sender.send_event(crate::gui::UserEvent::UpdateMenu);
+        });
+
+        // Periodic sync
+        loop {
+            let interval_minutes = current_settings.auto_sync_interval_minutes;
+            std::thread::sleep(std::time::Duration::from_secs(interval_minutes as u64 * 60));
+
+            let current_settings = settings.lock().unwrap().clone();
+            if current_settings.host.is_empty()
+                || current_settings.flow.is_empty()
+                || !current_settings.in_place
+            {
+                info!("Auto sync stopped due to invalid settings or disabled in_place");
+                break;
+            }
+
+            info!("Performing scheduled auto sync");
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            rt.block_on(async {
+                match perform_sync(&current_settings).await {
+                    Ok(keys_count) => {
+                        info!("Auto sync completed successfully with {} keys", keys_count);
+                        let mut status = sync_status.lock().unwrap();
+                        status.last_sync_time = Some(std::time::Instant::now());
+                        status.last_sync_keys = Some(keys_count);
+                        let _ = event_sender.send_event(crate::gui::UserEvent::UpdateMenu);
+                    }
+                    Err(e) => {
+                        error!("Auto sync failed: {}", e);
+                    }
+                }
+            });
+        }
+    });
+
+    Some(handle)
+}
+
+/// Update sync status for tooltip
+pub fn update_sync_status(settings: &KhmSettings, sync_status: &mut SyncStatus) {
+    if !settings.host.is_empty() && !settings.flow.is_empty() && settings.in_place {
+        if let Some(last_sync) = sync_status.last_sync_time {
+            let elapsed = last_sync.elapsed().as_secs();
+            let interval_seconds = settings.auto_sync_interval_minutes as u64 * 60;
+
+            if elapsed < interval_seconds {
+                sync_status.next_sync_in_seconds = Some(interval_seconds - elapsed);
+            } else {
+                sync_status.next_sync_in_seconds = Some(0);
+            }
+        } else {
+            sync_status.next_sync_in_seconds = None;
+        }
+    }
+}

src/gui/tray/mod.rs

@@ -0,0 +1,8 @@
+mod app;
+mod icon;
+
+pub use app::*;
+pub use icon::{
+    create_tooltip, create_tray_icon, start_auto_sync_task, update_sync_status, update_tray_menu,
+    SyncStatus, TrayMenuIds,
+};

src/lib.rs

@@ -0,0 +1,113 @@
+pub mod client;
+pub mod db;
+pub mod gui;
+pub mod server;
+#[cfg(feature = "web")]
+pub mod web;
+
+use clap::Parser;
+
+// Common Args structure used by all binaries
+#[derive(Parser, Debug, Clone)]
+pub struct Args {
+    /// Run in server mode (default: false)
+    #[arg(long, help = "Run in server mode")]
+    pub server: bool,
+
+    /// Hide console window and run in background (default: auto when no arguments)
+    #[arg(long, help = "Hide console window and run in background")]
+    pub daemon: bool,
+
+    /// Run settings UI window
+    #[arg(long, help = "Run settings UI window")]
+    pub settings_ui: bool,
+
+    /// Update the known_hosts file with keys from the server after sending keys (default: false)
+    #[arg(
+        long,
+        help = "Server mode: Sync the known_hosts file with keys from the server"
+    )]
+    pub in_place: bool,
+
+    /// Comma-separated list of flows to manage (default: default)
+    #[arg(long, default_value = "default", value_parser, num_args = 1.., value_delimiter = ',', help = "Server mode: Comma-separated list of flows to manage")]
+    pub flows: Vec<String>,
+
+    /// IP address to bind the server or client to (default: 127.0.0.1)
+    #[arg(
+        short,
+        long,
+        default_value = "127.0.0.1",
+        help = "Server mode: IP address to bind the server to"
+    )]
+    pub ip: String,
+
+    /// Port to bind the server or client to (default: 8080)
+    #[arg(
+        short,
+        long,
+        default_value = "8080",
+        help = "Server mode: Port to bind the server to"
+    )]
+    pub port: u16,
+
+    /// Hostname or IP address of the PostgreSQL database (default: 127.0.0.1)
+    #[arg(
+        long,
+        default_value = "127.0.0.1",
+        help = "Server mode: Hostname or IP address of the PostgreSQL database"
+    )]
+    pub db_host: String,
+
+    /// Name of the PostgreSQL database (default: khm)
+    #[arg(
+        long,
+        default_value = "khm",
+        help = "Server mode: Name of the PostgreSQL database"
+    )]
+    pub db_name: String,
+
+    /// Username for the PostgreSQL database (required in server mode)
+    #[arg(
+        long,
+        required_if_eq("server", "true"),
+        help = "Server mode: Username for the PostgreSQL database"
+    )]
+    pub db_user: Option<String>,
+
+    /// Password for the PostgreSQL database (required in server mode)
+    #[arg(
+        long,
+        required_if_eq("server", "true"),
+        help = "Server mode: Password for the PostgreSQL database"
+    )]
+    pub db_password: Option<String>,
+
+    /// Host address of the server to connect to in client mode (required in client mode)
+    #[arg(
+        long,
+        required_if_eq("server", "false"),
+        help = "Client mode: Full host address of the server to connect to. Like https://khm.example.com"
+    )]
+    pub host: Option<String>,
+
+    /// Flow name to use on the server
+    #[arg(
+        long,
+        required_if_eq("server", "false"),
+        help = "Client mode: Flow name to use on the server"
+    )]
+    pub flow: Option<String>,
+
+    /// Path to the known_hosts file (default: ~/.ssh/known_hosts)
+    #[arg(
+        long,
+        default_value = "~/.ssh/known_hosts",
+        help = "Client mode: Path to the known_hosts file"
+    )]
+    pub known_hosts: String,
+
+    /// Basic auth string for client mode. Format: user:pass
+    #[arg(long, default_value = "", help = "Client mode: Basic Auth credentials")]
+    pub basic_auth: String,
+}

src/server.rs

@@ -300,35 +300,60 @@ pub async fn run_server(args: crate::Args) -> std::io::Result<()> {
 
     info!("Starting HTTP server on {}:{}", args.ip, args.port);
     HttpServer::new(move || {
-        App::new()
+        let mut app = App::new()
             .app_data(web::Data::new(flows.clone()))
             .app_data(web::Data::new(db_client.clone()))
             .app_data(allowed_flows.clone())
-            // API routes
-            .route("/api/flows", web::get().to(crate::web::get_flows_api))
-            .route(
-                "/{flow_id}/keys/{server}",
-                web::delete().to(crate::web::delete_key_by_server),
-            )
-            .route(
-                "/{flow_id}/keys/{server}/restore",
-                web::post().to(crate::web::restore_key_by_server),
-            )
-            .route(
-                "/{flow_id}/keys/{server}/delete",
-                web::delete().to(crate::web::permanently_delete_key_by_server),
-            )
             // Original API routes
             .route("/{flow_id}/keys", web::get().to(get_keys))
-            .route("/{flow_id}/keys", web::post().to(add_keys))
-            // Web interface routes
-            .route("/", web::get().to(crate::web::serve_web_interface))
-            .route(
-                "/static/{filename:.*}",
-                web::get().to(crate::web::serve_static_file),
-            )
+            .route("/{flow_id}/keys", web::post().to(add_keys));
+        
+        #[cfg(feature = "web")]
+        {
+            app = app.configure(configure_web_routes);
+        }
+        
+        app
     })
     .bind((args.ip.as_str(), args.port))?
     .run()
     .await
 }
+
+#[cfg(feature = "web")]
+fn configure_web_routes(cfg: &mut web::ServiceConfig) {
+    cfg
+        // API routes
+        .route("/api/version", web::get().to(crate::web::get_version_api))
+        .route("/api/flows", web::get().to(crate::web::get_flows_api))
+        .route(
+            "/{flow_id}/scan-dns",
+            web::post().to(crate::web::scan_dns_resolution),
+        )
+        .route(
+            "/{flow_id}/bulk-deprecate",
+            web::post().to(crate::web::bulk_deprecate_servers),
+        )
+        .route(
+            "/{flow_id}/bulk-restore",
+            web::post().to(crate::web::bulk_restore_servers),
+        )
+        .route(
+            "/{flow_id}/keys/{server}",
+            web::delete().to(crate::web::delete_key_by_server),
+        )
+        .route(
+            "/{flow_id}/keys/{server}/restore",
+            web::post().to(crate::web::restore_key_by_server),
+        )
+        .route(
+            "/{flow_id}/keys/{server}/delete",
+            web::delete().to(crate::web::permanently_delete_key_by_server),
+        )
+        // Web interface routes
+        .route("/", web::get().to(crate::web::serve_web_interface))
+        .route(
+            "/static/{filename:.*}",
+            web::get().to(crate::web::serve_static_file),
+        );
+}

src/web.rs

@@ -1,8 +1,14 @@
 use actix_web::{web, HttpResponse, Result};
+use futures::future;
 use log::info;
 use rust_embed::RustEmbed;
+use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::sync::Arc;
+use tokio::sync::Semaphore;
+use tokio::time::{timeout, Duration};
+use trust_dns_resolver::config::*;
+use trust_dns_resolver::TokioAsyncResolver;
 
 use crate::db::ReconnectingDbClient;
 use crate::server::Flows;
@@ -11,12 +17,261 @@ use crate::server::Flows;
 #[folder = "static/"]
 struct StaticAssets;
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct DnsResolutionResult {
+    pub server: String,
+    pub resolved: bool,
+    pub error: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct BulkDeprecateRequest {
+    pub servers: Vec<String>,
+}
+
+async fn check_dns_resolution(hostname: String, semaphore: Arc<Semaphore>) -> DnsResolutionResult {
+    let _permit = match semaphore.acquire().await {
+        Ok(permit) => permit,
+        Err(_) => {
+            return DnsResolutionResult {
+                server: hostname,
+                resolved: false,
+                error: Some("Failed to acquire semaphore".to_string()),
+            };
+        }
+    };
+
+    let resolver = TokioAsyncResolver::tokio(ResolverConfig::default(), ResolverOpts::default());
+
+    let lookup_result = timeout(Duration::from_secs(5), resolver.lookup_ip(&hostname)).await;
+
+    match lookup_result {
+        Ok(Ok(_)) => DnsResolutionResult {
+            server: hostname,
+            resolved: true,
+            error: None,
+        },
+        Ok(Err(e)) => DnsResolutionResult {
+            server: hostname,
+            resolved: false,
+            error: Some(e.to_string()),
+        },
+        Err(_) => DnsResolutionResult {
+            server: hostname,
+            resolved: false,
+            error: Some("DNS lookup timeout (5s)".to_string()),
+        },
+    }
+}
+
+// API endpoint to get application version
+pub async fn get_version_api() -> Result<HttpResponse> {
+    Ok(HttpResponse::Ok().json(json!({
+        "version": env!("CARGO_PKG_VERSION")
+    })))
+}
+
 // API endpoint to get list of available flows
 pub async fn get_flows_api(allowed_flows: web::Data<Vec<String>>) -> Result<HttpResponse> {
     info!("API request for available flows");
     Ok(HttpResponse::Ok().json(&**allowed_flows))
 }
 
+// API endpoint to scan DNS resolution for all hosts in a flow
+pub async fn scan_dns_resolution(
+    flows: web::Data<Flows>,
+    path: web::Path<String>,
+    allowed_flows: web::Data<Vec<String>>,
+) -> Result<HttpResponse> {
+    let flow_id_str = path.into_inner();
+
+    info!(
+        "API request to scan DNS resolution for flow '{}'",
+        flow_id_str
+    );
+
+    if !allowed_flows.contains(&flow_id_str) {
+        return Ok(HttpResponse::Forbidden().json(json!({
+            "error": "Flow ID not allowed"
+        })));
+    }
+
+    let flows_guard = flows.lock().unwrap();
+    let flow = match flows_guard.iter().find(|flow| flow.name == flow_id_str) {
+        Some(flow) => flow,
+        None => {
+            return Ok(HttpResponse::NotFound().json(json!({
+                "error": "Flow ID not found"
+            })));
+        }
+    };
+
+    // Get unique hostnames
+    let mut hostnames: std::collections::HashSet<String> = std::collections::HashSet::new();
+    for key in &flow.servers {
+        hostnames.insert(key.server.clone());
+    }
+
+    drop(flows_guard);
+
+    info!(
+        "Scanning DNS resolution for {} unique hosts",
+        hostnames.len()
+    );
+
+    // Limit concurrent DNS requests to prevent "too many open files" error
+    let semaphore = Arc::new(Semaphore::new(20));
+
+    // Scan all hostnames concurrently with rate limiting
+    let mut scan_futures = Vec::new();
+    for hostname in hostnames {
+        scan_futures.push(check_dns_resolution(hostname, semaphore.clone()));
+    }
+
+    let results = future::join_all(scan_futures).await;
+
+    let unresolved_count = results.iter().filter(|r| !r.resolved).count();
+    info!(
+        "DNS scan complete: {} unresolved out of {} hosts",
+        unresolved_count,
+        results.len()
+    );
+
+    Ok(HttpResponse::Ok().json(json!({
+        "results": results,
+        "total": results.len(),
+        "unresolved": unresolved_count
+    })))
+}
+
+// API endpoint to bulk deprecate multiple servers
+pub async fn bulk_deprecate_servers(
+    flows: web::Data<Flows>,
+    path: web::Path<String>,
+    request: web::Json<BulkDeprecateRequest>,
+    db_client: web::Data<Arc<ReconnectingDbClient>>,
+    allowed_flows: web::Data<Vec<String>>,
+) -> Result<HttpResponse> {
+    let flow_id_str = path.into_inner();
+
+    info!(
+        "API request to bulk deprecate {} servers in flow '{}'",
+        request.servers.len(),
+        flow_id_str
+    );
+
+    if !allowed_flows.contains(&flow_id_str) {
+        return Ok(HttpResponse::Forbidden().json(json!({
+            "error": "Flow ID not allowed"
+        })));
+    }
+
+    // Use single bulk operation instead of loop
+    let total_deprecated = match db_client
+        .bulk_deprecate_keys_by_servers_reconnecting(request.servers.clone(), flow_id_str.clone())
+        .await
+    {
+        Ok(count) => {
+            info!(
+                "Bulk deprecated {} key(s) for {} servers",
+                count,
+                request.servers.len()
+            );
+            count
+        }
+        Err(e) => {
+            return Ok(HttpResponse::InternalServerError().json(json!({
+                "error": format!("Failed to bulk deprecate keys: {}", e)
+            })));
+        }
+    };
+
+    // Refresh the in-memory flows
+    let updated_flows = match db_client.get_keys_from_db_reconnecting().await {
+        Ok(flows) => flows,
+        Err(e) => {
+            return Ok(HttpResponse::InternalServerError().json(json!({
+                "error": format!("Failed to refresh flows: {}", e)
+            })));
+        }
+    };
+
+    let mut flows_guard = flows.lock().unwrap();
+    *flows_guard = updated_flows;
+
+    let response = json!({
+        "message": format!("Successfully deprecated {} key(s) for {} server(s)", total_deprecated, request.servers.len()),
+        "deprecated_count": total_deprecated,
+        "servers_processed": request.servers.len()
+    });
+
+    Ok(HttpResponse::Ok().json(response))
+}
+
+// API endpoint to bulk restore multiple servers
+pub async fn bulk_restore_servers(
+    flows: web::Data<Flows>,
+    path: web::Path<String>,
+    request: web::Json<BulkDeprecateRequest>,
+    db_client: web::Data<Arc<ReconnectingDbClient>>,
+    allowed_flows: web::Data<Vec<String>>,
+) -> Result<HttpResponse> {
+    let flow_id_str = path.into_inner();
+
+    info!(
+        "API request to bulk restore {} servers in flow '{}'",
+        request.servers.len(),
+        flow_id_str
+    );
+
+    if !allowed_flows.contains(&flow_id_str) {
+        return Ok(HttpResponse::Forbidden().json(json!({
+            "error": "Flow ID not allowed"
+        })));
+    }
+
+    // Use single bulk operation
+    let total_restored = match db_client
+        .bulk_restore_keys_by_servers_reconnecting(request.servers.clone(), flow_id_str.clone())
+        .await
+    {
+        Ok(count) => {
+            info!(
+                "Bulk restored {} key(s) for {} servers",
+                count,
+                request.servers.len()
+            );
+            count
+        }
+        Err(e) => {
+            return Ok(HttpResponse::InternalServerError().json(json!({
+                "error": format!("Failed to bulk restore keys: {}", e)
+            })));
+        }
+    };
+
+    // Refresh the in-memory flows
+    let updated_flows = match db_client.get_keys_from_db_reconnecting().await {
+        Ok(flows) => flows,
+        Err(e) => {
+            return Ok(HttpResponse::InternalServerError().json(json!({
+                "error": format!("Failed to refresh flows: {}", e)
+            })));
+        }
+    };
+
+    let mut flows_guard = flows.lock().unwrap();
+    *flows_guard = updated_flows;
+
+    let response = json!({
+        "message": format!("Successfully restored {} key(s) for {} server(s)", total_restored, request.servers.len()),
+        "restored_count": total_restored,
+        "servers_processed": request.servers.len()
+    });
+
+    Ok(HttpResponse::Ok().json(response))
+}
+
 // API endpoint to deprecate a specific key by server name
 pub async fn delete_key_by_server(
     flows: web::Data<Flows>,

static/index.html

@@ -10,7 +10,10 @@
 <body>
     <div class="container">
         <header>
-            <h1>SSH Key Manager</h1>
+            <div class="header-title">
+                <h1>SSH Key Manager</h1>
+                <span class="version" id="appVersion">Loading...</span>
+            </div>
             <div class="flow-selector">
                 <label for="flowSelect">Flow:</label>
                 <select id="flowSelect">
@@ -26,6 +29,14 @@
                     <span class="stat-value" id="totalKeys">0</span>
                     <span class="stat-label">Total Keys</span>
                 </div>
+                <div class="stat-item">
+                    <span class="stat-value" id="activeKeys">0</span>
+                    <span class="stat-label">Active Keys</span>
+                </div>
+                <div class="stat-item">
+                    <span class="stat-value deprecated" id="deprecatedKeys">0</span>
+                    <span class="stat-label">Deprecated Keys</span>
+                </div>
                 <div class="stat-item">
                     <span class="stat-value" id="uniqueServers">0</span>
                     <span class="stat-label">Unique Servers</span>
@@ -34,7 +45,9 @@
 
             <div class="actions-panel">
                 <button id="addKeyBtn" class="btn btn-primary">Add SSH Key</button>
+                <button id="scanDnsBtn" class="btn btn-secondary">Scan DNS Resolution</button>
                 <button id="bulkDeleteBtn" class="btn btn-danger" disabled>Deprecate Selected</button>
+                <button id="bulkRestoreBtn" class="btn btn-success" disabled style="display: none;">Restore Selected</button>
                 <button id="bulkPermanentDeleteBtn" class="btn btn-danger" disabled style="display: none;">Delete Selected</button>
                 
                 <div class="filter-controls">
@@ -129,6 +142,30 @@
         </div>
     </div>
 
+    <!-- DNS Scan Results Modal -->
+    <div id="dnsScanModal" class="modal">
+        <div class="modal-content modal-large">
+            <div class="modal-header">
+                <h2>DNS Resolution Scan Results</h2>
+                <span class="close">&times;</span>
+            </div>
+            <div class="modal-body">
+                <div id="dnsScanStats" class="scan-stats"></div>
+                <div id="unresolvedHosts" class="unresolved-hosts">
+                    <div class="section-header">
+                        <h3>Unresolved Hosts</h3>
+                        <button id="selectAllUnresolved" class="btn btn-sm btn-secondary">Select All</button>
+                    </div>
+                    <div id="unresolvedList" class="host-list"></div>
+                </div>
+                <div class="form-actions">
+                    <button type="button" class="btn btn-secondary" id="closeDnsScan">Close</button>
+                    <button type="button" class="btn btn-danger" id="deprecateUnresolved" disabled>Deprecate Selected</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Loading Overlay -->
     <div id="loadingOverlay" class="loading-overlay">
         <div class="loading-spinner"></div>

static/khm-icon.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <rect width="32" height="32" rx="4" fill="#2c3e50"/>
+  <rect x="4" y="8" width="24" height="2" rx="1" fill="#3498db"/>
+  <rect x="4" y="12" width="20" height="2" rx="1" fill="#e74c3c"/>
+  <rect x="4" y="16" width="22" height="2" rx="1" fill="#2ecc71"/>
+  <rect x="4" y="20" width="18" height="2" rx="1" fill="#f39c12"/>
+  <circle cx="24" cy="6" r="3" fill="#e67e22"/>
+  <text x="24" y="9" text-anchor="middle" font-family="Arial, sans-serif" font-size="6" fill="white">K</text>
+</svg>

static/script.js

@@ -12,6 +12,7 @@ class SSHKeyManager {
         this.showDeprecatedOnly = false;
         
         this.initializeEventListeners();
+        this.loadVersion();
         this.loadFlows();
     }
 
@@ -39,11 +40,21 @@ class SSHKeyManager {
             this.showAddKeyModal();
         });
 
+        // Scan DNS button
+        document.getElementById('scanDnsBtn').addEventListener('click', () => {
+            this.scanDnsResolution();
+        });
+
         // Bulk delete button
         document.getElementById('bulkDeleteBtn').addEventListener('click', () => {
             this.deleteSelectedKeys();
         });
 
+        // Bulk restore button
+        document.getElementById('bulkRestoreBtn').addEventListener('click', () => {
+            this.restoreSelectedKeys();
+        });
+
         // Bulk permanent delete button
         document.getElementById('bulkPermanentDeleteBtn').addEventListener('click', () => {
             this.permanentlyDeleteSelectedKeys();
@@ -110,6 +121,19 @@ class SSHKeyManager {
             this.copyKeyToClipboard();
         });
 
+        // DNS scan modal
+        document.getElementById('closeDnsScan').addEventListener('click', () => {
+            this.hideModal('dnsScanModal');
+        });
+
+        document.getElementById('selectAllUnresolved').addEventListener('click', () => {
+            this.toggleSelectAllUnresolved();
+        });
+
+        document.getElementById('deprecateUnresolved').addEventListener('click', () => {
+            this.deprecateSelectedUnresolved();
+        });
+
         // Close modals when clicking on close button or outside
         document.querySelectorAll('.modal .close').forEach(closeBtn => {
             closeBtn.addEventListener('click', (e) => {
@@ -126,6 +150,20 @@ class SSHKeyManager {
         });
     }
 
+    async loadVersion() {
+        try {
+            const response = await fetch('/api/version');
+            if (response.ok) {
+                const data = await response.json();
+                document.getElementById('appVersion').textContent = `v${data.version}`;
+            } else {
+                document.getElementById('appVersion').textContent = 'Unknown';
+            }
+        } catch (error) {
+            document.getElementById('appVersion').textContent = 'Error';
+        }
+    }
+
     async loadFlows() {
         try {
             this.showLoading();
@@ -219,9 +257,14 @@ class SSHKeyManager {
     }
 
     updateStats() {
-        document.getElementById('totalKeys').textContent = this.keys.length;
-        
+        const totalKeys = this.keys.length;
+        const deprecatedKeys = this.keys.filter(key => key.deprecated).length;
+        const activeKeys = totalKeys - deprecatedKeys;
         const uniqueServers = new Set(this.keys.map(key => key.server));
+        
+        document.getElementById('totalKeys').textContent = totalKeys;
+        document.getElementById('activeKeys').textContent = activeKeys;
+        document.getElementById('deprecatedKeys').textContent = deprecatedKeys;
         document.getElementById('uniqueServers').textContent = uniqueServers.size;
     }
 
@@ -456,12 +499,15 @@ class SSHKeyManager {
 
     updateBulkDeleteButton() {
         const bulkDeleteBtn = document.getElementById('bulkDeleteBtn');
+        const bulkRestoreBtn = document.getElementById('bulkRestoreBtn');
         const bulkPermanentDeleteBtn = document.getElementById('bulkPermanentDeleteBtn');
         
         if (this.selectedKeys.size === 0) {
-            // No keys selected - hide both buttons
+            // No keys selected - hide all buttons
             bulkDeleteBtn.disabled = true;
             bulkDeleteBtn.textContent = 'Deprecate Selected';
+            bulkRestoreBtn.style.display = 'none';
+            bulkRestoreBtn.disabled = true;
             bulkPermanentDeleteBtn.style.display = 'none';
             bulkPermanentDeleteBtn.disabled = true;
             return;
@@ -491,6 +537,16 @@ class SSHKeyManager {
             bulkDeleteBtn.textContent = 'Deprecate Selected';
         }
 
+        // Show/hide restore button
+        if (deprecatedCount > 0) {
+            bulkRestoreBtn.style.display = 'inline-flex';
+            bulkRestoreBtn.disabled = false;
+            bulkRestoreBtn.textContent = `Restore Selected (${deprecatedCount})`;
+        } else {
+            bulkRestoreBtn.style.display = 'none';
+            bulkRestoreBtn.disabled = true;
+        }
+
         // Show/hide permanent delete button
         if (deprecatedCount > 0) {
             bulkPermanentDeleteBtn.style.display = 'inline-flex';
@@ -703,6 +759,56 @@ class SSHKeyManager {
         }
     }
 
+    async restoreSelectedKeys() {
+        if (this.selectedKeys.size === 0) return;
+
+        // Filter only deprecated keys
+        const deprecatedKeys = Array.from(this.selectedKeys).filter(keyId => {
+            const key = this.findKeyById(keyId);
+            return key && key.deprecated;
+        });
+
+        if (deprecatedKeys.length === 0) {
+            this.showToast('No deprecated keys selected', 'warning');
+            return;
+        }
+
+        if (!confirm(`Are you sure you want to restore ${deprecatedKeys.length} deprecated SSH keys?`)) {
+            return;
+        }
+
+        // Get unique server names
+        const serverNames = [...new Set(deprecatedKeys.map(keyId => {
+            const key = this.findKeyById(keyId);
+            return key ? key.server : null;
+        }).filter(Boolean))];
+
+        try {
+            this.showLoading();
+            
+            const response = await fetch(`/${this.currentFlow}/bulk-restore`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ servers: serverNames })
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                throw new Error(errorText || 'Failed to restore keys');
+            }
+
+            const result = await response.json();
+            this.showToast(result.message, 'success');
+            await this.loadKeys();
+        } catch (error) {
+            this.showToast('Failed to restore selected keys: ' + error.message, 'error');
+        } finally {
+            this.hideLoading();
+        }
+    }
+
     async permanentlyDeleteSelectedKeys() {
         if (this.selectedKeys.size === 0) return;
 
@@ -805,6 +911,8 @@ class SSHKeyManager {
         document.getElementById('keysTableBody').innerHTML = '';
         document.getElementById('noKeysMessage').style.display = 'block';
         document.getElementById('totalKeys').textContent = '0';
+        document.getElementById('activeKeys').textContent = '0';
+        document.getElementById('deprecatedKeys').textContent = '0';
         document.getElementById('uniqueServers').textContent = '0';
         this.selectedKeys.clear();
         this.updateBulkDeleteButton();
@@ -849,6 +957,150 @@ class SSHKeyManager {
             }, 300);
         }, 4000);
     }
+
+    // DNS Resolution Scanning
+    async scanDnsResolution() {
+        if (!this.currentFlow) {
+            this.showToast('Please select a flow first', 'warning');
+            return;
+        }
+
+        try {
+            this.showLoading();
+            const response = await fetch(`/${this.currentFlow}/scan-dns`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                throw new Error(errorText || 'Failed to scan DNS resolution');
+            }
+
+            const scanResults = await response.json();
+            this.showDnsScanResults(scanResults);
+        } catch (error) {
+            this.showToast('Failed to scan DNS resolution: ' + error.message, 'error');
+        } finally {
+            this.hideLoading();
+        }
+    }
+
+    showDnsScanResults(scanResults) {
+        const { results, total, unresolved } = scanResults;
+        
+        // Update stats
+        const statsDiv = document.getElementById('dnsScanStats');
+        statsDiv.innerHTML = `
+            <div class="scan-stat">
+                <span class="scan-stat-value">${total}</span>
+                <span class="scan-stat-label">Total Hosts</span>
+            </div>
+            <div class="scan-stat">
+                <span class="scan-stat-value">${total - unresolved}</span>
+                <span class="scan-stat-label">Resolved</span>
+            </div>
+            <div class="scan-stat">
+                <span class="scan-stat-value unresolved-count">${unresolved}</span>
+                <span class="scan-stat-label">Unresolved</span>
+            </div>
+        `;
+
+        // Show unresolved hosts
+        const unresolvedHosts = results.filter(r => !r.resolved);
+        const unresolvedList = document.getElementById('unresolvedList');
+        
+        if (unresolvedHosts.length === 0) {
+            unresolvedList.innerHTML = '<div class="empty-state">🎉 All hosts resolved successfully!</div>';
+            document.getElementById('selectAllUnresolved').style.display = 'none';
+        } else {
+            document.getElementById('selectAllUnresolved').style.display = 'inline-flex';
+            unresolvedList.innerHTML = unresolvedHosts.map(host => `
+                <div class="host-item">
+                    <label>
+                        <input type="checkbox" value="${this.escapeHtml(host.server)}" class="unresolved-checkbox">
+                        <span class="host-name">${this.escapeHtml(host.server)}</span>
+                    </label>
+                    ${host.error ? `<span class="host-error">${this.escapeHtml(host.error)}</span>` : ''}
+                </div>
+            `).join('');
+
+            // Add event listeners to checkboxes
+            unresolvedList.querySelectorAll('.unresolved-checkbox').forEach(checkbox => {
+                checkbox.addEventListener('change', () => {
+                    this.updateDeprecateUnresolvedButton();
+                });
+            });
+        }
+
+        this.updateDeprecateUnresolvedButton();
+        this.showModal('dnsScanModal');
+    }
+
+    toggleSelectAllUnresolved() {
+        const checkboxes = document.querySelectorAll('.unresolved-checkbox');
+        const allChecked = Array.from(checkboxes).every(cb => cb.checked);
+        
+        checkboxes.forEach(checkbox => {
+            checkbox.checked = !allChecked;
+        });
+        
+        this.updateDeprecateUnresolvedButton();
+    }
+
+    updateDeprecateUnresolvedButton() {
+        const selectedCount = document.querySelectorAll('.unresolved-checkbox:checked').length;
+        const deprecateBtn = document.getElementById('deprecateUnresolved');
+        
+        if (selectedCount > 0) {
+            deprecateBtn.disabled = false;
+            deprecateBtn.textContent = `Deprecate Selected (${selectedCount})`;
+        } else {
+            deprecateBtn.disabled = true;
+            deprecateBtn.textContent = 'Deprecate Selected';
+        }
+    }
+
+    async deprecateSelectedUnresolved() {
+        const selectedHosts = Array.from(document.querySelectorAll('.unresolved-checkbox:checked'))
+            .map(cb => cb.value);
+
+        if (selectedHosts.length === 0) {
+            this.showToast('No hosts selected', 'warning');
+            return;
+        }
+
+        if (!confirm(`Are you sure you want to deprecate SSH keys for ${selectedHosts.length} unresolved hosts?`)) {
+            return;
+        }
+
+        try {
+            this.showLoading();
+            const response = await fetch(`/${this.currentFlow}/bulk-deprecate`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ servers: selectedHosts })
+            });
+
+            if (!response.ok) {
+                const errorText = await response.text();
+                throw new Error(errorText || 'Failed to deprecate hosts');
+            }
+
+            const result = await response.json();
+            this.showToast(result.message, 'success');
+            this.hideModal('dnsScanModal');
+            await this.loadKeys();
+        } catch (error) {
+            this.showToast('Failed to deprecate hosts: ' + error.message, 'error');
+        } finally {
+            this.hideLoading();
+        }
+    }
 }
 
 // Initialize the SSH Key Manager when the page loads

static/style.css

@@ -50,6 +50,23 @@ header h1 {
     font-size: 2.5rem;
     font-weight: 600;
     color: var(--text-primary);
+    margin: 0;
+}
+
+.header-title {
+    display: flex;
+    align-items: baseline;
+    gap: 1rem;
+}
+
+.version {
+    font-size: 0.875rem;
+    color: var(--text-secondary);
+    background: var(--background);
+    padding: 0.25rem 0.5rem;
+    border-radius: var(--border-radius);
+    font-weight: 500;
+    border: 1px solid var(--border);
 }
 
 .flow-selector {
@@ -155,6 +172,10 @@ header h1 {
     color: var(--primary-color);
 }
 
+.stat-value.deprecated {
+    color: var(--danger-color);
+}
+
 .stat-label {
     color: var(--text-secondary);
     font-size: 0.875rem;
@@ -590,6 +611,16 @@ header h1 {
         align-items: stretch;
     }
 
+    .header-title {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.5rem;
+    }
+
+    .header-title h1 {
+        font-size: 2rem;
+    }
+
     .actions-panel {
         flex-direction: column;
         align-items: stretch;
@@ -663,3 +694,132 @@ input[type="checkbox"]:indeterminate {
 .form-group textarea:valid {
     border-color: var(--success-color);
 }
+
+/* DNS Scan Modal Styles */
+.modal-large {
+    max-width: 800px;
+}
+
+.scan-stats {
+    background: var(--background);
+    padding: 1rem;
+    border-radius: var(--border-radius);
+    margin-bottom: 1.5rem;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    gap: 1rem;
+}
+
+.scan-stat {
+    text-align: center;
+}
+
+.scan-stat-value {
+    display: block;
+    font-size: 1.5rem;
+    font-weight: 600;
+    color: var(--primary-color);
+}
+
+.scan-stat-label {
+    color: var(--text-secondary);
+    font-size: 0.875rem;
+}
+
+.unresolved-count {
+    color: var(--danger-color) !important;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 1rem;
+}
+
+.section-header h3 {
+    font-size: 1.125rem;
+    font-weight: 600;
+    color: var(--text-primary);
+}
+
+.host-list {
+    max-height: 300px;
+    overflow-y: auto;
+    border: 1px solid var(--border);
+    border-radius: var(--border-radius);
+}
+
+.host-item {
+    display: flex;
+    align-items: center;
+    padding: 0.75rem;
+    border-bottom: 1px solid var(--border);
+    transition: background-color 0.2s ease;
+}
+
+.host-item:last-child {
+    border-bottom: none;
+}
+
+.host-item:hover {
+    background-color: var(--background);
+}
+
+.host-item label {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    flex: 1;
+    cursor: pointer;
+    margin: 0;
+}
+
+.host-name {
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-weight: 500;
+    color: var(--text-primary);
+}
+
+.host-error {
+    font-size: 0.75rem;
+    color: var(--danger-color);
+    margin-left: auto;
+    max-width: 200px;
+    word-break: break-word;
+}
+
+.empty-state {
+    text-align: center;
+    padding: 2rem;
+    color: var(--text-secondary);
+    font-style: italic;
+}
+
+.scan-progress {
+    background: var(--background);
+    padding: 1rem;
+    border-radius: var(--border-radius);
+    margin-bottom: 1rem;
+    text-align: center;
+}
+
+.scan-progress-text {
+    color: var(--text-secondary);
+    margin-bottom: 0.5rem;
+}
+
+.progress-bar {
+    width: 100%;
+    height: 8px;
+    background: var(--border);
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+.progress-fill {
+    height: 100%;
+    background: var(--primary-color);
+    transition: width 0.3s ease;
+    border-radius: 4px;
+}