diff --git a/.gitignore b/.gitignore
index 8d52d1d..287822c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,7 @@ CMakeUserPresets.json
 /_CPack_Packages
 debug_log*
 debug_*
+.vscode/tasks.json
+/.vscode
+data/session.json
+.vscode/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c88e971..b3d4223 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,6 +241,70 @@ if(WIN32)
 	endif()
 endif()
 
+# Linux: include SDK shared libraries (.so) and resources
+if(UNIX AND NOT APPLE)
+	file(GLOB ULTRALIGHT_SOS "${ULTRALIGHT_SDK_ROOT}/lib/*.so*")
+	list(LENGTH ULTRALIGHT_SOS _so_count)
+	if(_so_count GREATER 0)
+		install(FILES ${ULTRALIGHT_SOS} DESTINATION ${INSTALL_DIR_NAME})
+	endif()
+
+	# Also check for libraries in bin directory (some SDK layouts)
+	file(GLOB ULTRALIGHT_BIN_SOS "${ULTRALIGHT_SDK_ROOT}/bin/*.so*")
+	list(LENGTH ULTRALIGHT_BIN_SOS _bin_so_count)
+	if(_bin_so_count GREATER 0)
+		install(FILES ${ULTRALIGHT_BIN_SOS} DESTINATION ${INSTALL_DIR_NAME})
+	endif()
+
+	# ICU data files (check multiple possible locations)
+	file(GLOB ICU_FILES_LIB "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
+	file(GLOB ICU_FILES_BIN "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
+	file(GLOB ICU_FILES_RES "${ULTRALIGHT_SDK_ROOT}/resources/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
+	set(ICU_FILES ${ICU_FILES_LIB} ${ICU_FILES_BIN} ${ICU_FILES_RES})
+	list(LENGTH ICU_FILES _icu_count)
+	if(_icu_count GREATER 0)
+		install(FILES ${ICU_FILES} DESTINATION ${INSTALL_DIR_NAME}/assets/resources)
+	endif()
+
+	# Include resources directory if it exists
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources")
+		install(DIRECTORY "${ULTRALIGHT_SDK_ROOT}/resources/" DESTINATION ${INSTALL_DIR_NAME}/assets/resources
+			FILES_MATCHING PATTERN "*" PATTERN "*.dat" PATTERN "*.pem" PATTERN "*.bin")
+	endif()
+endif()
+
+# macOS: include SDK dynamic libraries (.dylib) and resources
+if(APPLE)
+	file(GLOB ULTRALIGHT_DYLIBS "${ULTRALIGHT_SDK_ROOT}/lib/*.dylib*")
+	list(LENGTH ULTRALIGHT_DYLIBS _dylib_count)
+	if(_dylib_count GREATER 0)
+		install(FILES ${ULTRALIGHT_DYLIBS} DESTINATION ${INSTALL_DIR_NAME})
+	endif()
+
+	# Also check for libraries in bin directory (some SDK layouts)
+	file(GLOB ULTRALIGHT_BIN_DYLIBS "${ULTRALIGHT_SDK_ROOT}/bin/*.dylib*")
+	list(LENGTH ULTRALIGHT_BIN_DYLIBS _bin_dylib_count)
+	if(_bin_dylib_count GREATER 0)
+		install(FILES ${ULTRALIGHT_BIN_DYLIBS} DESTINATION ${INSTALL_DIR_NAME})
+	endif()
+
+	# ICU data files (check multiple possible locations)
+	file(GLOB ICU_FILES_LIB "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
+	file(GLOB ICU_FILES_BIN "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
+	file(GLOB ICU_FILES_RES "${ULTRALIGHT_SDK_ROOT}/resources/icudt*.dat" "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
+	set(ICU_FILES ${ICU_FILES_LIB} ${ICU_FILES_BIN} ${ICU_FILES_RES})
+	list(LENGTH ICU_FILES _icu_count)
+	if(_icu_count GREATER 0)
+		install(FILES ${ICU_FILES} DESTINATION ${INSTALL_DIR_NAME}/assets/resources)
+	endif()
+
+	# Include resources directory if it exists
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources")
+		install(DIRECTORY "${ULTRALIGHT_SDK_ROOT}/resources/" DESTINATION ${INSTALL_DIR_NAME}/assets/resources
+			FILES_MATCHING PATTERN "*" PATTERN "*.dat" PATTERN "*.pem" PATTERN "*.bin")
+	endif()
+endif()
+
 # Post-build: copy assets and runtime files next to the exe for running from build dir
 if(WIN32)
 	add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
@@ -262,6 +326,108 @@ if(WIN32)
 	)
 endif()
 
+# Post-build: copy assets and runtime files for Linux
+if(UNIX AND NOT APPLE)
+	add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets"
+	)
+	# Copy shared libraries from lib directory
+	file(GLOB _linux_sos "${ULTRALIGHT_SDK_ROOT}/lib/*.so*")
+	foreach(_so ${_linux_sos})
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_so}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
+		)
+	endforeach()
+	# Also check bin directory
+	file(GLOB _linux_bin_sos "${ULTRALIGHT_SDK_ROOT}/bin/*.so*")
+	foreach(_so ${_linux_bin_sos})
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_so}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
+		)
+	endforeach()
+	add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources"
+	)
+	# Copy ICU files from various possible locations
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	endif()
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	endif()
+endif()
+
+# Post-build: copy assets and runtime files for macOS
+if(APPLE)
+	add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets"
+	)
+	# Copy dynamic libraries from lib directory
+	file(GLOB _macos_dylibs "${ULTRALIGHT_SDK_ROOT}/lib/*.dylib*")
+	foreach(_dylib ${_macos_dylibs})
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dylib}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
+		)
+	endforeach()
+	# Also check bin directory
+	file(GLOB _macos_bin_dylibs "${ULTRALIGHT_SDK_ROOT}/bin/*.dylib*")
+	foreach(_dylib ${_macos_bin_dylibs})
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_dylib}" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/"
+		)
+	endforeach()
+	add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources"
+	)
+	# Copy ICU files from various possible locations
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/icudt67l.dat" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/icudt67l.dat"
+		)
+	endif()
+	if(EXISTS "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/bin/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/lib/ICU/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	elseif(EXISTS "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem")
+		add_custom_command(TARGET Ultralight-WebBrowser POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ULTRALIGHT_SDK_ROOT}/resources/cacert.pem" "$<TARGET_FILE_DIR:Ultralight-WebBrowser>/assets/resources/cacert.pem"
+		)
+	endif()
+endif()
+
 # CPack (global scope)
 set(WEBBROWSER_VERSION "dev" CACHE STRING "WebBrowser version to use in package names (defaults to 'dev')")
 set(CPACK_PACKAGE_NAME "Ultralight-WebBrowser")
diff --git a/assets/settings_catalog.json b/assets/settings_catalog.json
index 3e0c7be..bded339 100644
--- a/assets/settings_catalog.json
+++ b/assets/settings_catalog.json
@@ -223,5 +223,21 @@
     "category": "developer",
     "note": null,
     "default": false
+  },
+  {
+    "key": "restore_session_on_startup",
+    "name": "Restore previous session",
+    "description": "Reopen tabs from your last browsing session when starting the browser.",
+    "category": "general",
+    "note": null,
+    "default": true
+  },
+  {
+    "key": "save_session_continuously",
+    "name": "Enable crash recovery",
+    "description": "Continuously save session state so tabs can be restored after crashes or unexpected closures (ALT+F4).",
+    "category": "general",
+    "note": null,
+    "default": true
   }
 ]
diff --git a/assets/ui.css b/assets/ui.css
index c9cc8b1..46f528f 100644
--- a/assets/ui.css
+++ b/assets/ui.css
@@ -300,4 +300,110 @@ body.compact-tabs .icon {
 
 body.compact-tabs #toggle-downloads .downloads-badge {
      top: 0;
+}
+
+/* Session Restore Bar */
+#session-restore-bar {
+     display: none;
+     position: fixed;
+     top: 0;
+     left: 0;
+     right: 0;
+     background: linear-gradient(180deg, #2d4a6f 0%, #1e3a5f 100%);
+     border-bottom: 1px solid #3d6a9f;
+     padding: 8px 16px;
+     z-index: 9999;
+     align-items: center;
+     justify-content: space-between;
+     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+     animation: slideDown 0.3s ease-out;
+}
+
+@keyframes slideDown {
+     from {
+          transform: translateY(-100%);
+          opacity: 0;
+     }
+     to {
+          transform: translateY(0);
+          opacity: 1;
+     }
+}
+
+#session-restore-bar.visible {
+     display: flex;
+}
+
+#session-restore-bar .restore-message {
+     display: flex;
+     align-items: center;
+     gap: 10px;
+     color: #e0e8f0;
+     font-size: 13px;
+}
+
+#session-restore-bar .restore-icon {
+     width: 20px;
+     height: 20px;
+     fill: #7cb3e0;
+}
+
+#session-restore-bar .restore-actions {
+     display: flex;
+     gap: 8px;
+}
+
+#session-restore-bar .restore-btn {
+     padding: 6px 14px;
+     border-radius: 4px;
+     border: none;
+     font-size: 12px;
+     font-weight: 500;
+     cursor: pointer;
+     transition: background-color 0.2s, transform 0.1s;
+}
+
+#session-restore-bar .restore-btn:hover {
+     transform: translateY(-1px);
+}
+
+#session-restore-bar .restore-btn:active {
+     transform: translateY(0);
+}
+
+#session-restore-bar .restore-btn.primary {
+     background: #4a9eff;
+     color: white;
+}
+
+#session-restore-bar .restore-btn.primary:hover {
+     background: #5aadff;
+}
+
+#session-restore-bar .restore-btn.secondary {
+     background: rgba(255, 255, 255, 0.1);
+     color: #c0d0e0;
+     border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+#session-restore-bar .restore-btn.secondary:hover {
+     background: rgba(255, 255, 255, 0.15);
+}
+
+#session-restore-bar .dismiss-btn {
+     background: none;
+     border: none;
+     color: #8090a0;
+     cursor: pointer;
+     padding: 4px;
+     margin-left: 8px;
+     border-radius: 50%;
+     display: flex;
+     align-items: center;
+     justify-content: center;
+}
+
+#session-restore-bar .dismiss-btn:hover {
+     background: rgba(255, 255, 255, 0.1);
+     color: #c0d0e0;
 }
\ No newline at end of file
diff --git a/assets/ui.html b/assets/ui.html
index 34bd438..7f0e2a4 100644
--- a/assets/ui.html
+++ b/assets/ui.html
@@ -94,7 +94,26 @@
         </span>
     </div>
 
-    
+    <!-- Session Restore Bar -->
+    <div id="session-restore-bar" role="alert" aria-live="polite">
+        <div class="restore-message">
+            <svg class="restore-icon" viewBox="0 0 24 24" aria-hidden="true">
+                <path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9z" fill="currentColor"/>
+                <path d="M12 8v5l4.28 2.54.72-1.21-3.5-2.08V8H12z" fill="currentColor"/>
+            </svg>
+            <span id="restore-message-text">Your previous session was interrupted. Would you like to restore your tabs?</span>
+        </div>
+        <div class="restore-actions">
+            <button class="restore-btn primary" id="restore-session-btn">Restore</button>
+            <button class="restore-btn secondary" id="dismiss-session-btn">Start Fresh</button>
+            <button class="dismiss-btn" id="close-restore-bar" aria-label="Close">
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor">
+                    <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+                </svg>
+            </button>
+        </div>
+    </div>
+
     <div id="menu-dropdown" class="menu-dropdown hidden" role="menu" aria-hidden="true">
         <div class="menu-item" data-action="new-tab">New tab [Ctrl+T]</div>
         <div class="menu-item" data-action="new-window">New window [Ctrl+N]</div>
@@ -138,6 +157,56 @@
                 chromeTabs.removeTab(tab);
         }
 
+        // Session Restore Bar Functions
+        function showSessionRestoreBar(tabCount, wasCrash) {
+            const bar = document.getElementById('session-restore-bar');
+            const msgText = document.getElementById('restore-message-text');
+            if (!bar || !msgText) return;
+            
+            if (wasCrash) {
+                msgText.textContent = `Your previous session was interrupted. Restore ${tabCount} tab${tabCount !== 1 ? 's' : ''}?`;
+            } else {
+                msgText.textContent = `Would you like to restore ${tabCount} tab${tabCount !== 1 ? 's' : ''} from your last session?`;
+            }
+            
+            bar.classList.add('visible');
+            
+            // Set up event handlers
+            const restoreBtn = document.getElementById('restore-session-btn');
+            const dismissBtn = document.getElementById('dismiss-session-btn');
+            const closeBtn = document.getElementById('close-restore-bar');
+            
+            const hideBar = () => {
+                bar.classList.remove('visible');
+            };
+            
+            if (restoreBtn) {
+                restoreBtn.onclick = () => {
+                    hideBar();
+                    if (window.OnRestoreSession) OnRestoreSession();
+                };
+            }
+            
+            if (dismissBtn) {
+                dismissBtn.onclick = () => {
+                    hideBar();
+                    if (window.OnDismissSession) OnDismissSession();
+                };
+            }
+            
+            if (closeBtn) {
+                closeBtn.onclick = () => {
+                    hideBar();
+                    if (window.OnDismissSession) OnDismissSession();
+                };
+            }
+        }
+        
+        function hideSessionRestoreBar() {
+            const bar = document.getElementById('session-restore-bar');
+            if (bar) bar.classList.remove('visible');
+        }
+
         function bindCallbacks() {
             el.addEventListener('requestNewTab', ({ detail }) => OnRequestNewTab());
             el.addEventListener('requestTabClose', ({ detail }) => OnRequestTabClose(detail.tabEl.getAttribute('data-tab-id')));
diff --git a/docs/General-Codebase-Refactor.md b/docs/General-Codebase-Refactor.md
new file mode 100644
index 0000000..6be6fe3
--- /dev/null
+++ b/docs/General-Codebase-Refactor.md
@@ -0,0 +1,285 @@
+# General Codebase Refactor
+
+**Branch:** `refactor/features-settings-codebase`  
+**Date:** December 2025
+
+This document summarizes all changes and updates made during the comprehensive codebase refactoring session.
+
+---
+
+## Table of Contents
+
+1. [Security & Code Quality Fixes](#security--code-quality-fixes)
+2. [Privacy Features Implementation](#privacy-features-implementation)
+3. [UI & Visual Improvements](#ui--visual-improvements)
+4. [Page Caching System](#page-caching-system)
+5. [Favicon System](#favicon-system)
+6. [Build System Improvements](#build-system-improvements)
+7. [Settings System](#settings-system)
+
+---
+
+## Security & Code Quality Fixes
+
+### Buffer Overflow Prevention
+- Added bounds checking for string operations throughout the codebase
+- Replaced unsafe C-style string functions with safer alternatives
+- Added null pointer checks before dereferencing
+
+### Memory Management
+- Fixed potential memory leaks in tab management
+- Ensured proper cleanup in destructors
+- Added RAII patterns for resource management
+
+### Input Validation
+- Added URL validation before navigation
+- Sanitized user inputs in JavaScript callbacks
+- Added proper error handling for file operations
+
+### Thread Safety
+- Added mutex protection for shared data structures
+- Fixed race conditions in download manager
+- Ensured thread-safe access to settings
+
+---
+
+## Privacy Features Implementation
+
+### Do Not Track (DNT)
+- **Location:** `Tab::OnWindowObjectReady()` in `Tab.cpp`
+- **Implementation:** JavaScript injection that sets `navigator.doNotTrack = '1'`
+- **Behavior:** When enabled in settings, all pages receive the DNT signal
+- **Compatibility:** Also sets `navigator.msDoNotTrack` for legacy browser compatibility
+
+### Third-Party Cookie Blocking
+- **Location:** `Tab::OnWindowObjectReady()` in `Tab.cpp`
+- **Implementation:** JavaScript injection that intercepts `document.cookie` setter
+- **Behavior:** Blocks cookie setting from cross-origin iframes
+- **Logging:** Blocked attempts are logged to the browser console
+
+### Web Security
+- **Status:** Partial implementation
+- **Current Support:** XHR/Fetch credential handling via polyfills
+- **Note:** Full CORS enforcement would require Ultralight SDK API changes
+
+### New Public Accessors in `UI.h`
+```cpp
+bool do_not_track_enabled() const;
+bool block_third_party_cookies_enabled() const;
+bool web_security_enabled() const;
+```
+
+---
+
+## UI & Visual Improvements
+
+### Dark Theme
+- Added dark theme support with user preference detection
+- Implemented exclusion list for sites where dark theme should not apply
+- Added CSS injection for dark mode styling
+
+### Browser Internal Pages Styling
+- Consistent styling across all internal pages:
+  - `about.html`
+  - `settings.html`
+  - `history.html`
+  - `downloads.html`
+  - `extensions.html`
+  - `new_tab_page.html`
+
+### Keyboard Shortcuts
+- Comprehensive keyboard shortcut system
+- Shortcuts stored in `assets/shortcuts.json`
+- Support for common browser actions (navigation, tabs, zoom, etc.)
+
+---
+
+## Page Caching System
+
+### Implementation
+- Added caching for browser internal pages
+- Pages are pre-loaded and cached for instant display
+- Reduces perceived load time for settings, history, etc.
+
+### Cached Pages
+- Settings page
+- History page
+- Downloads page
+- Extensions page
+- New tab page
+
+---
+
+## Favicon System
+
+### Base64-Encoded SVG Favicons
+All browser internal pages now have embedded favicons using base64-encoded SVGs:
+
+| Page | Icon | Color |
+|------|------|-------|
+| Settings | ⚙️ Gear | `#c2bce8` |
+| History | 🕐 Clock | `#c2bce8` |
+| Downloads | ⬇️ Arrow | `#c2bce8` |
+| Extensions | 🧩 Puzzle | `#c2bce8` |
+| New Tab | 🏠 Home | `#c2bce8` |
+| About | ℹ️ Info | `#c2bce8` |
+| Release Notes | 📋 Document | `#c2bce8` |
+
+### External Page Favicons
+- **Implementation:** JavaScript injection to fetch favicons from external websites
+- **Location:** `Tab::OnDOMReady()` 
+- **Fallback:** Uses Google's favicon service as fallback
+- **Callback:** `Tab::OnFaviconFetched()` handles favicon updates
+- **UI Integration:** `UI::UpdateTabFavicon()` applies favicons to tabs
+
+---
+
+## Build System Improvements
+
+### Targeted Build Command
+**Previous command:**
+```bash
+cmake --build build --config Release
+```
+This built ALL targets including test executables.
+
+**New command:**
+```bash
+cmake --build build --config Release --target Ultralight-WebBrowser
+```
+This builds ONLY the main browser executable.
+
+### Updated `.vscode/tasks.json`
+```json
+{
+  "tasks": [
+    {
+      "label": "Build Ultralight-WebBrowser (CMake)",
+      "command": "cmake --build build --config Release --target Ultralight-WebBrowser",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "Build All (including tests)",
+      "command": "cmake --build build --config Release",
+      "group": "build"
+    }
+  ]
+}
+```
+
+### Benefits
+- Faster build times (skips test compilation)
+- Cleaner output (only shows browser build progress)
+- Easier to identify the output executable
+
+---
+
+## Settings System
+
+### Settings Catalog
+- Created `assets/settings_catalog.json` for structured settings definitions
+- Each setting includes:
+  - Unique key
+  - Display name
+  - Description
+  - Category
+  - Type (boolean, string, number)
+  - Default value
+
+### Settings Categories
+1. **Appearance** - Theme, visual options
+2. **Privacy & Security** - Blocking, tracking, cookies
+3. **Address Bar & Suggestions** - Autocomplete, favicons
+4. **Downloads** - Save location, notifications
+5. **Performance** - JavaScript, acceleration, scrolling
+6. **Accessibility** - Motion, contrast, caret browsing
+7. **Developer** - Inspector, overlays
+8. **Networking** - User agent customization
+
+### BrowserSettings Struct
+Located in `UI.h`, contains all runtime settings with defaults:
+```cpp
+struct BrowserSettings {
+  // Appearance
+  bool launch_dark_theme = false;
+  std::string dark_theme_excluded_sites;
+  
+  // Privacy & Security
+  bool enable_adblock = true;
+  bool enable_web_security = true;
+  bool block_third_party_cookies = false;
+  bool do_not_track = true;
+  
+  // Performance
+  bool enable_javascript = true;
+  bool hardware_acceleration = true;
+  bool smooth_scrolling = true;
+  
+  // ... and more
+};
+```
+
+---
+
+## Files Modified
+
+### Core Source Files
+- `src/Tab.cpp` - Privacy JS injection, favicon handling
+- `src/Tab.h` - TabViewSettings struct
+- `src/UI.cpp` - Settings application, favicon updates
+- `src/UI.h` - Privacy accessors, BrowserSettings
+
+### Asset Files
+- `assets/about.html` - Favicon, styling
+- `assets/settings.html` - Favicon, styling
+- `assets/history.html` - Favicon, styling
+- `assets/downloads.html` - Favicon, styling
+- `assets/extensions.html` - Favicon, styling
+- `assets/new_tab_page.html` - Favicon, styling
+- `assets/release_notes.html` - Favicon, styling
+- `assets/settings_catalog.json` - Settings definitions
+- `assets/shortcuts.json` - Keyboard shortcuts
+
+### Configuration Files
+- `.vscode/tasks.json` - Build task improvements
+
+---
+
+## Testing Recommendations
+
+1. **Privacy Features**
+   - Enable DNT in settings, visit [https://www.deviceinfo.me/](https://www.deviceinfo.me/) to verify
+   - Enable third-party cookie blocking, test with embedded iframes
+
+2. **Favicons**
+   - Open internal pages, verify favicons appear in tabs
+   - Navigate to external sites, verify favicon fetching
+
+3. **Build System**
+   - Run default build task, verify only browser is built
+   - Run "Build All" task, verify tests are included
+
+4. **Settings**
+   - Toggle each setting, verify changes apply correctly
+   - Restart browser, verify settings persist
+
+---
+
+## Known Limitations
+
+1. **Web Security (`enable_web_security`)**: Full CORS enforcement requires Ultralight SDK API changes not available in ViewConfig
+2. **Third-Party Cookies**: JavaScript-level blocking may not catch all cases; true network-level blocking requires SDK support
+3. **DNT Header**: Only sets the JavaScript property; actual HTTP header requires network-level modification
+
+---
+
+## Future Improvements
+
+- [ ] Implement network-level DNT header injection
+- [ ] Add content security policy (CSP) support
+- [ ] Implement full third-party cookie blocking at network level
+- [ ] Add per-site settings overrides
+- [ ] Implement sync settings across devices
diff --git a/docs/Session-Restore.md b/docs/Session-Restore.md
new file mode 100644
index 0000000..871dcde
--- /dev/null
+++ b/docs/Session-Restore.md
@@ -0,0 +1,274 @@
+# Session Restore Feature
+
+**Branch:** `feature/restore-session`  
+**Date:** December 2025
+
+This document describes the Chrome-like session restore feature that preserves open tabs and allows restoration after unexpected closures.
+
+---
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [Features](#features)
+3. [Session Restore Bar](#session-restore-bar)
+4. [Settings](#settings)
+5. [Implementation Details](#implementation-details)
+6. [Session File Format](#session-file-format)
+7. [Internal Page Filtering](#internal-page-filtering)
+8. [Files Modified](#files-modified)
+
+---
+
+## Overview
+
+The session restore feature automatically saves the browser's tab state and allows users to restore their previous session after:
+- Unexpected closures (ALT+F4)
+- Crashes
+- Power loss
+- Normal browser restarts
+
+Unlike traditional session restore that silently restores tabs, this implementation shows a **user-facing restore bar** that asks the user whether they want to restore their previous session, similar to Chrome's behavior.
+
+---
+
+## Features
+
+### Continuous Session Saving
+Session state is automatically saved when:
+- A new tab is created
+- A tab is closed  
+- Navigation completes (page finishes loading)
+
+Session file location: `data/session.json`
+
+### Crash Detection
+- On clean exit (normal close), session is marked as `"clean_exit": true`
+- On unexpected exit (ALT+F4, crash), the flag remains `false`
+- At startup, the browser checks this flag to detect crashes
+
+### Smart Restore Filtering
+The restore bar only appears when there are **meaningful tabs** to restore:
+- Internal browser pages (settings, history, downloads, etc.) are excluded
+- Empty/blank pages are excluded
+- Only external websites trigger the restore prompt
+
+---
+
+## Session Restore Bar
+
+### Visual Design
+A blue gradient notification bar appears at the top of the browser window with:
+- **Icon:** Clock/history icon
+- **Message:** Dynamic text showing number of tabs to restore
+- **Primary Button:** "Restore" - restores all saved tabs
+- **Secondary Button:** "Start Fresh" - dismisses and starts with new tab
+- **Close Button:** X icon to dismiss
+
+### Messages
+- **After crash:** "Your previous session was interrupted. Restore X tabs?"
+- **Normal restart:** "Would you like to restore X tabs from your last session?"
+
+### Behavior
+1. When restore bar is visible, session saving is **paused** to prevent overwriting
+2. Clicking "Restore":
+   - Navigates the existing start page tab to the first saved URL
+   - Creates new tabs for remaining saved URLs
+   - All tabs are restored with their original URLs
+3. Clicking "Start Fresh" or X:
+   - Dismisses the bar
+   - Clears restore pending state
+   - Starts saving new session
+
+### CSS Styling
+```css
+#session-restore-bar {
+  background: linear-gradient(180deg, #2d4a6f 0%, #1e3a5f 100%);
+  border-bottom: 1px solid #3d6a9f;
+  padding: 8px 16px;
+  z-index: 9999;
+  animation: slideDown 0.3s ease-out;
+}
+```
+
+---
+
+## Settings
+
+| Setting | Default | Description |
+|---------|---------|-------------|
+| `restore_session_on_startup` | `true` | Show restore bar when previous session exists |
+| `save_session_continuously` | `true` | Enable crash recovery by saving session state continuously |
+
+Both settings are available in the Settings page under the "General" category.
+
+---
+
+## Implementation Details
+
+### New Methods in `UI` class
+
+```cpp
+// Core session management
+void SaveSessionToDisk();           // Save current session state
+void SaveSessionToDiskWithCleanExit(); // Save with clean_exit=true
+void LoadSessionFromDisk();         // Load session data at startup
+bool HasSavedSession() const;       // Check if valid session exists
+void ClearSavedSession();           // Clear restore pending flag
+void RestoreSavedSession();         // Restore tabs from saved session
+
+// Restore bar UI
+void ShowSessionRestoreBar();       // Show the restore prompt bar
+void OnRestoreSession(const JSObject &obj, const JSArgs &args);  // User clicked Restore
+void OnDismissSession(const JSObject &obj, const JSArgs &args);  // User clicked Dismiss
+
+// Tab counting
+int GetSavedSessionTabCount() const;       // Total saved tabs
+int GetMeaningfulSavedTabCount() const;    // Non-internal tabs only
+bool IsInternalBrowserPage(const std::string &url) const; // Check if URL is internal
+```
+
+### State Variables
+
+```cpp
+bool session_restore_pending_ = false;      // Should prompt to restore
+bool session_was_clean_exit_ = false;       // Was last exit clean
+bool session_restore_bar_visible_ = false;  // Is bar currently showing
+std::string session_file_path_;             // Path to session.json
+```
+
+### JavaScript Functions (ui.html)
+
+```javascript
+// Show restore bar with tab count and crash status
+function showSessionRestoreBar(tabCount, wasCrash) { ... }
+
+// Hide the restore bar
+function hideSessionRestoreBar() { ... }
+```
+
+### JavaScript Callbacks
+
+```javascript
+// Bound to C++ methods
+window.OnRestoreSession  // Called when user clicks Restore
+window.OnDismissSession  // Called when user clicks Start Fresh or X
+```
+
+---
+
+## Session File Format
+
+```json
+{
+  "version": 1,
+  "timestamp": 1733410800000,
+  "clean_exit": false,
+  "active_tab_id": 2,
+  "tabs": [
+    {"id": 0, "url": "https://www.google.com/", "title": "Google"},
+    {"id": 1, "url": "https://github.com/", "title": "GitHub"}
+  ],
+  "drm_tabs": [
+    {"id": 3, "url": "https://netflix.com/"}
+  ]
+}
+```
+
+### Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `version` | number | Schema version (currently 1) |
+| `timestamp` | number | Unix timestamp in milliseconds |
+| `clean_exit` | boolean | `true` if browser closed normally |
+| `active_tab_id` | number | ID of the last active tab |
+| `tabs` | array | Regular browser tabs |
+| `drm_tabs` | array | DRM-enabled tabs (for DRM sites) |
+
+---
+
+## Internal Page Filtering
+
+The following internal browser pages are **excluded** from session restore:
+
+| URL Pattern | Description |
+|-------------|-------------|
+| `file:///static-sties/google-static.html` | Default home page |
+| `file:///new_tab_page.html` | New tab page |
+| `file:///settings.html` | Settings page |
+| `file:///history.html` | History page |
+| `file:///downloads.html` | Downloads page |
+| `file:///passwords.html` | Passwords page |
+| `file:///extensions.html` | Extensions page |
+| `file:///about.html` | About page |
+| `file:///release_notes.html` | Release notes |
+| `file:///ui.html` | Main chrome UI |
+| `file:///menu.html` | Menu overlay |
+| `file:///contextmenu.html` | Context menu |
+| `file:///suggestions.html` | Suggestions overlay |
+| `file:///downloads-panel.html` | Downloads panel |
+| `about:blank` | Empty pages |
+
+If a session contains **only** internal pages, the restore bar will not appear.
+
+---
+
+## Files Modified
+
+### Source Files
+- `src/UI.cpp` - Session management logic, restore bar functions
+- `src/UI.h` - Method declarations, state variables
+
+### Asset Files
+- `assets/ui.html` - Session restore bar HTML and JavaScript
+- `assets/ui.css` - Session restore bar styling
+- `assets/settings_catalog.json` - Session restore settings entries
+
+---
+
+## Testing Checklist
+
+1. **Basic Restore Flow**
+   - [ ] Open browser, navigate to external site (google.com)
+   - [ ] Close with ALT+F4
+   - [ ] Reopen - restore bar should appear
+   - [ ] Click Restore - tab should load saved URL
+
+2. **Multiple Tabs**
+   - [ ] Open 2+ tabs with same URL
+   - [ ] Force close
+   - [ ] Restore - all tabs should be restored (including duplicates)
+
+3. **Internal Page Filtering**
+   - [ ] Open only settings/history pages
+   - [ ] Close and reopen
+   - [ ] Restore bar should NOT appear
+
+4. **Start Fresh**
+   - [ ] With restore bar showing, click "Start Fresh"
+   - [ ] Bar should dismiss, new session should start
+   - [ ] Close and reopen - restore bar should show new tab only
+
+5. **Session Protection**
+   - [ ] With restore bar visible, verify session file not overwritten
+   - [ ] Session should preserve original URLs until user decides
+
+---
+
+## Known Limitations
+
+1. **Tab Scroll Position:** Scroll position within pages is not preserved
+2. **Form Data:** Unsaved form data is not preserved
+3. **Tab History:** Back/forward history within tabs is not preserved
+4. **Pinned Tabs:** No support for pinned tab state yet
+
+---
+
+## Future Improvements
+
+- [ ] Preserve scroll position per tab
+- [ ] Add "Always restore" option to skip prompt
+- [ ] Preserve tab groups (if implemented)
+- [ ] Add session history (restore from older sessions)
+- [ ] Sync sessions across devices
diff --git a/src/Tab.cpp b/src/Tab.cpp
index af2e989..5463dbb 100644
--- a/src/Tab.cpp
+++ b/src/Tab.cpp
@@ -460,6 +460,81 @@ void Tab::OnWindowObjectReady(View *caller, uint64_t frame_id, bool is_main_fram
 })();
 )JS";
     caller->EvaluateScript(String(cryptoPolyfill), nullptr);
+    
+    // Inject Do Not Track (DNT) header simulation if enabled in settings
+    // This overrides navigator.doNotTrack to report the user's preference
+    if (ui_->do_not_track_enabled())
+    {
+      const char* dntScript = R"JS(
+(function() {
+  'use strict';
+  // Set Do Not Track property to '1' (enabled)
+  // This tells websites the user prefers not to be tracked
+  try {
+    Object.defineProperty(Navigator.prototype, 'doNotTrack', {
+      value: '1',
+      writable: false,
+      configurable: false,
+      enumerable: true
+    });
+    // Also set the older msDoNotTrack property for IE compatibility
+    if (typeof navigator.msDoNotTrack === 'undefined') {
+      Object.defineProperty(Navigator.prototype, 'msDoNotTrack', {
+        value: '1',
+        writable: false,
+        configurable: false,
+        enumerable: true
+      });
+    }
+    console.log('[Ultralight] Do Not Track enabled');
+  } catch(e) {
+    console.warn('[Ultralight] Failed to set DNT:', e);
+  }
+})();
+)JS";
+      caller->EvaluateScript(String(dntScript), nullptr);
+    }
+    
+    // Block third-party cookie access if enabled in settings
+    // This is a best-effort approach since true cookie blocking requires network-level control
+    if (ui_->block_third_party_cookies_enabled())
+    {
+      const char* cookieBlockScript = R"JS(
+(function() {
+  'use strict';
+  // Monitor and log third-party cookie attempts
+  var originalDescriptor = Object.getOwnPropertyDescriptor(Document.prototype, 'cookie');
+  var topOrigin = window.top.location.origin;
+  
+  Object.defineProperty(document, 'cookie', {
+    get: function() {
+      return originalDescriptor.get.call(this);
+    },
+    set: function(value) {
+      try {
+        // Check if this is a cross-origin iframe attempting to set cookies
+        if (window !== window.top) {
+          var currentOrigin = window.location.origin;
+          if (currentOrigin !== topOrigin) {
+            console.warn('[Ultralight] Blocked third-party cookie set from:', currentOrigin);
+            return; // Block the cookie
+          }
+        }
+      } catch(e) {
+        // Cross-origin frame access might throw, in which case this is third-party
+        console.warn('[Ultralight] Blocked third-party cookie set (cross-origin iframe)');
+        return;
+      }
+      return originalDescriptor.set.call(this, value);
+    },
+    configurable: true,
+    enumerable: true
+  });
+  console.log('[Ultralight] Third-party cookie blocking enabled');
+})();
+)JS";
+      caller->EvaluateScript(String(cookieBlockScript), nullptr);
+    }
   }
 }
 
diff --git a/src/UI.cpp b/src/UI.cpp
index eb97460..06bdadf 100644
--- a/src/UI.cpp
+++ b/src/UI.cpp
@@ -58,7 +58,7 @@ namespace
     bool default_value;
   };
 
-  constexpr std::array<SettingDescriptor, 28> kFallbackSettingsCatalog = {
+  constexpr std::array<SettingDescriptor, 30> kFallbackSettingsCatalog = {
       // Appearance
       SettingDescriptor{"launch_dark_theme", "Launch in dark theme",
                         "Start Ultralight with dark chrome, toolbars, and tabs by default.",
@@ -153,6 +153,14 @@ namespace
                         "Automatically save changes to settings as soon as you toggle options.",
                         "general", nullptr, false, &UI::BrowserSettings::auto_save_settings, true},
 
+      // Session restore
+      SettingDescriptor{"restore_session_on_startup", "Restore previous session",
+                        "Reopen tabs from your last browsing session when starting the browser.",
+                        "general", nullptr, false, &UI::BrowserSettings::restore_session_on_startup, true},
+      SettingDescriptor{"save_session_continuously", "Enable crash recovery",
+                        "Continuously save session state so tabs can be restored after crashes or unexpected closures.",
+                        "general", nullptr, false, &UI::BrowserSettings::save_session_continuously, true},
+
       // DRM subsystem
       SettingDescriptor{"enable_drm_webview", "Enable DRM WebView",
                         "Automatically switch Widevine-protected sites to a native DRM-capable WebView.",
@@ -501,6 +509,9 @@ UI::UI(RefPtr<Window> window)
 
   // Load history from disk
   LoadHistoryFromDisk();
+  
+  // Load session data for crash recovery
+  LoadSessionFromDisk();
 }
 
 // Compatibility overload: accepts optional ad/tracker blockers (ignored if not used)
@@ -553,6 +564,9 @@ UI::UI(RefPtr<Window> window, AdBlocker *adblock, AdBlocker *tracker)
   // Load history from disk
   LoadHistoryFromDisk();
 
+  // Load session data for crash recovery
+  LoadSessionFromDisk();
+
   // Initialize extension system
   InitializeExtensions();
 
@@ -851,6 +865,10 @@ void UI::HandleDrmNavigationState(uint64_t tab_id, bool can_back, bool can_forwa
 
 UI::~UI()
 {
+  // Save session one final time with clean_exit flag
+  // This preserves tabs for restoration while indicating it was a normal shutdown
+  SaveSessionToDiskWithCleanExit();
+  
   // Persist or clear history on shutdown based on settings
   if (clear_history_on_exit_)
   {
@@ -1403,6 +1421,9 @@ void UI::OnDOMReady(View *caller, uint64_t frame_id, bool is_main_frame, const S
   global["OnPasswordSaveBarResponse"] = BindJSCallback(&UI::OnPasswordSaveBarResponse);
   // DRM prompt bar callback
   global["OnDrmPromptResponse"] = BindJSCallback(&UI::OnDrmPromptResponse);
+  // Session restore bar callbacks
+  global["OnRestoreSession"] = BindJSCallback(&UI::OnRestoreSession);
+  global["OnDismissSession"] = BindJSCallback(&UI::OnDismissSession);
   // Allow UI documents (including settings) to request a chrome overlay reload.
   global["OnReloadChromeUI"] = BindJSCallback(&UI::OnReloadChromeUI);
   // Allow UI documents to request reloading the active non-settings tab.
@@ -1528,7 +1549,26 @@ void UI::OnDOMReady(View *caller, uint64_t frame_id, bool is_main_frame, const S
     RefPtr<JSContext> lock(view()->LockJSContext());
     if (tabs_.empty())
     {
-      CreateNewTab();
+      // Check if we should restore a previous session
+      // Only show restore bar if there are meaningful (non-internal) tabs to restore
+      if (settings_.restore_session_on_startup && session_restore_pending_ && HasSavedSession() && GetMeaningfulSavedTabCount() > 0)
+      {
+        // IMPORTANT: Set this flag BEFORE creating the tab to prevent session saving
+        // from overwriting the saved session while the restore bar is visible
+        session_restore_bar_visible_ = true;
+        
+        // Create a blank tab first, then show restore bar
+        CreateNewTab();
+        // Show the session restore bar to ask user
+        ShowSessionRestoreBar();
+      }
+      else
+      {
+        // No meaningful session to restore, create a new tab
+        CreateNewTab();
+        // Clear restore pending since there's nothing meaningful to restore
+        session_restore_pending_ = false;
+      }
     }
     else
     {
@@ -1681,6 +1721,9 @@ void UI::OnRequestTabClose(const JSObject &obj, const JSArgs &args)
 
     RefPtr<JSContext> lock(view()->LockJSContext());
     closeTab({id});
+    
+    // Save session after tab close for crash recovery
+    SaveSessionToDisk();
   }
 }
 
@@ -2202,6 +2245,9 @@ void UI::CreateNewTab()
     addTab({id, "New Tab", GetFaviconURL(kStartPageURL), tabs_[id]->view()->is_loading()});
   }
   UpdateDrmBadge(id, false);
+  
+  // Save session after new tab for crash recovery
+  SaveSessionToDisk();
 }
 
 RefPtr<View> UI::CreateNewTabForChildView(const String &url)
@@ -2304,6 +2350,12 @@ void UI::UpdateTabNavigation(uint64_t id, bool is_loading, bool can_go_back, boo
     SetCanGoBack(can_go_back);
     SetCanGoForward(can_go_forward);
   }
+  
+  // Save session when navigation completes (not during loading to reduce disk I/O)
+  if (!is_loading)
+  {
+    SaveSessionToDisk();
+  }
 }
 
 void UI::UpdateTabFavicon(uint64_t id, const String &favicon_data_url)
@@ -3323,9 +3375,14 @@ void UI::ApplySettings(bool initial, bool snapshot_is_baseline)
   adblock_enabled_cached_ = settings_.enable_adblock;
   clear_history_on_exit_ = settings_.clear_history_on_exit;
 
-  // Note: enable_javascript and hardware_acceleration are applied to NEW tabs via TabViewSettings
+  // Note: enable_javascript and hardware_acceleration are applied to NEW tabs via TabViewSettings.
   // Existing tabs keep their original settings since ViewConfig is immutable after creation.
-  // enable_web_security, block_third_party_cookies, do_not_track are not yet implemented.
+  // 
+  // Privacy settings implementation:
+  // - do_not_track: Implemented via JavaScript injection (sets navigator.doNotTrack = '1')
+  // - block_third_party_cookies: Implemented via JavaScript injection (blocks cross-origin cookie access)
+  // - enable_web_security: Not directly supported by Ultralight ViewConfig. XHR/Fetch credentials
+  //   are handled via the existing polyfills. Full CORS enforcement would require Ultralight API changes.
 
   // Address Bar & Suggestions
   suggestions_enabled_ = settings_.enable_suggestions;
@@ -4400,6 +4457,535 @@ void UI::SaveHistoryToDisk()
   out.close();
 }
 
+// ================================================================================
+// Session Management (Crash Recovery / Restore Tabs)
+// ================================================================================
+
+void UI::SaveSessionToDisk()
+{
+  // Save current session state to disk for crash recovery
+  // This is called whenever tabs change (new tab, close tab, navigation)
+  
+  if (!settings_.save_session_continuously)
+    return;
+  
+  // Don't overwrite saved session while restore bar is visible
+  // User hasn't made a choice yet, so preserve their previous session
+  if (session_restore_bar_visible_)
+    return;
+    
+  EnsureDataDirectoryExists();
+  std::ofstream out("data/session.json", std::ios::out | std::ios::binary | std::ios::trunc);
+  if (!out.is_open())
+    return;
+
+  // Get current timestamp
+  auto now = std::chrono::system_clock::now();
+  auto timestamp = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       now.time_since_epoch())
+                       .count();
+
+  out << "{\n";
+  out << "  \"version\": 1,\n";
+  out << "  \"timestamp\": " << timestamp << ",\n";
+  out << "  \"clean_exit\": false,\n";
+  out << "  \"active_tab_id\": " << active_tab_id_ << ",\n";
+  out << "  \"tabs\": [\n";
+  
+  bool first = true;
+  for (const auto &entry : tabs_)
+  {
+    if (!entry.second)
+      continue;
+      
+    auto view = entry.second->view();
+    if (!view)
+      continue;
+      
+    auto url_ul = view->url();
+    auto title_ul = view->title();
+    std::string url = url_ul.utf8().data() ? url_ul.utf8().data() : "";
+    std::string title = title_ul.utf8().data() ? title_ul.utf8().data() : "";
+    
+    // Skip internal pages that shouldn't be restored
+    if (url.find("file:///ui.html") != std::string::npos ||
+        url.find("file:///menu.html") != std::string::npos ||
+        url.find("file:///contextmenu.html") != std::string::npos ||
+        url.find("file:///suggestions.html") != std::string::npos ||
+        url.find("file:///downloads-panel.html") != std::string::npos)
+      continue;
+    
+    // Skip empty URLs
+    if (url.empty() || url == "about:blank")
+      continue;
+    
+    if (!first)
+      out << ",\n";
+    first = false;
+    
+    out << "    {\"id\": " << entry.first 
+        << ", \"url\": \"" << jsonEscape(url) 
+        << "\", \"title\": \"" << jsonEscape(title) << "\"}";
+  }
+  
+  out << "\n  ],\n";
+  
+  // Also save DRM tabs
+  out << "  \"drm_tabs\": [\n";
+  first = true;
+  for (const auto &entry : drm_tab_urls_)
+  {
+    auto title_it = drm_tab_titles_.find(entry.first);
+    std::string title = (title_it != drm_tab_titles_.end()) ? title_it->second : "";
+    
+    if (entry.second.empty())
+      continue;
+    
+    if (!first)
+      out << ",\n";
+    first = false;
+    
+    out << "    {\"id\": " << entry.first 
+        << ", \"url\": \"" << jsonEscape(entry.second) 
+        << "\", \"title\": \"" << jsonEscape(title) << "\"}";
+  }
+  out << "\n  ]\n";
+  out << "}\n";
+  out.close();
+}
+
+void UI::LoadSessionFromDisk()
+{
+  // Load session data from disk (does not restore tabs, just loads the data)
+  std::ifstream in("data/session.json");
+  if (!in.is_open())
+  {
+    session_restore_pending_ = false;
+    session_was_clean_exit_ = true;
+    return;
+  }
+
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+  in.close();
+  
+  std::string content = buffer.str();
+  
+  // Parse clean_exit flag to determine if last session crashed
+  size_t clean_exit_pos = content.find("\"clean_exit\"");
+  if (clean_exit_pos != std::string::npos)
+  {
+    size_t colon_pos = content.find(":", clean_exit_pos);
+    if (colon_pos != std::string::npos)
+    {
+      std::string value = content.substr(colon_pos + 1, 10);
+      session_was_clean_exit_ = (value.find("true") != std::string::npos);
+    }
+  }
+  
+  // Mark for restore if we have session data (regardless of how last session ended)
+  // Chrome-like behavior: always restore previous session if enabled
+  if (content.find("\"tabs\"") != std::string::npos)
+  {
+    // Check if tabs array has content
+    size_t tabs_pos = content.find("\"tabs\"");
+    if (tabs_pos != std::string::npos)
+    {
+      size_t bracket_start = content.find("[", tabs_pos);
+      size_t bracket_end = content.find("]", bracket_start);
+      if (bracket_start != std::string::npos && bracket_end != std::string::npos)
+      {
+        std::string tabs_str = content.substr(bracket_start + 1, bracket_end - bracket_start - 1);
+        // Remove whitespace to check if empty
+        tabs_str.erase(std::remove_if(tabs_str.begin(), tabs_str.end(), ::isspace), tabs_str.end());
+        if (!tabs_str.empty())
+        {
+          session_restore_pending_ = true;
+        }
+      }
+    }
+  }
+}
+
+bool UI::HasSavedSession() const
+{
+  std::ifstream in("data/session.json");
+  if (!in.is_open())
+    return false;
+  
+  // Quick check if file has any tab data
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+  std::string content = buffer.str();
+  
+  // Check if there are any tabs saved
+  size_t tabs_pos = content.find("\"tabs\"");
+  if (tabs_pos == std::string::npos)
+    return false;
+    
+  // Check if tabs array is non-empty
+  size_t bracket_start = content.find("[", tabs_pos);
+  size_t bracket_end = content.find("]", bracket_start);
+  if (bracket_start == std::string::npos || bracket_end == std::string::npos)
+    return false;
+    
+  std::string tabs_content = content.substr(bracket_start + 1, bracket_end - bracket_start - 1);
+  // Remove whitespace
+  tabs_content.erase(std::remove_if(tabs_content.begin(), tabs_content.end(), ::isspace), tabs_content.end());
+  
+  return !tabs_content.empty();
+}
+
+void UI::ClearSavedSession()
+{
+  // Clear the restore pending flag (used after session is restored)
+  session_restore_pending_ = false;
+}
+
+void UI::SaveSessionToDiskWithCleanExit()
+{
+  // Save current session state with clean_exit=true
+  // Called during normal shutdown to preserve tabs for next startup
+  
+  EnsureDataDirectoryExists();
+  std::ofstream out("data/session.json", std::ios::out | std::ios::binary | std::ios::trunc);
+  if (!out.is_open())
+    return;
+
+  auto now = std::chrono::system_clock::now();
+  auto timestamp = std::chrono::duration_cast<std::chrono::milliseconds>(
+                       now.time_since_epoch())
+                       .count();
+
+  out << "{\n";
+  out << "  \"version\": 1,\n";
+  out << "  \"timestamp\": " << timestamp << ",\n";
+  out << "  \"clean_exit\": true,\n";  // Mark as clean exit
+  out << "  \"active_tab_id\": " << active_tab_id_ << ",\n";
+  out << "  \"tabs\": [\n";
+  
+  bool first = true;
+  for (const auto &entry : tabs_)
+  {
+    if (!entry.second)
+      continue;
+      
+    auto view = entry.second->view();
+    if (!view)
+      continue;
+      
+    auto url_ul = view->url();
+    auto title_ul = view->title();
+    std::string url = url_ul.utf8().data() ? url_ul.utf8().data() : "";
+    std::string title = title_ul.utf8().data() ? title_ul.utf8().data() : "";
+    
+    // Skip internal UI pages
+    if (url.find("file:///ui.html") != std::string::npos ||
+        url.find("file:///menu.html") != std::string::npos ||
+        url.find("file:///contextmenu.html") != std::string::npos ||
+        url.find("file:///suggestions.html") != std::string::npos ||
+        url.find("file:///downloads-panel.html") != std::string::npos)
+      continue;
+    
+    if (url.empty() || url == "about:blank")
+      continue;
+    
+    if (!first)
+      out << ",\n";
+    first = false;
+    
+    out << "    {\"id\": " << entry.first 
+        << ", \"url\": \"" << jsonEscape(url) 
+        << "\", \"title\": \"" << jsonEscape(title) << "\"}";
+  }
+  
+  out << "\n  ],\n";
+  out << "  \"drm_tabs\": [\n";
+  first = true;
+  for (const auto &entry : drm_tab_urls_)
+  {
+    auto title_it = drm_tab_titles_.find(entry.first);
+    std::string title = (title_it != drm_tab_titles_.end()) ? title_it->second : "";
+    
+    if (entry.second.empty())
+      continue;
+    
+    if (!first)
+      out << ",\n";
+    first = false;
+    
+    out << "    {\"id\": " << entry.first 
+        << ", \"url\": \"" << jsonEscape(entry.second) 
+        << "\", \"title\": \"" << jsonEscape(title) << "\"}";
+  }
+  out << "\n  ]\n";
+  out << "}\n";
+  out.close();
+}
+
+void UI::RestoreSavedSession()
+{
+  // Restore tabs from saved session
+  std::ifstream in("data/session.json");
+  if (!in.is_open())
+    return;
+
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+  in.close();
+  
+  std::string content = buffer.str();
+  
+  // Parse tabs array - simple JSON parsing
+  size_t tabs_pos = content.find("\"tabs\"");
+  if (tabs_pos == std::string::npos)
+    return;
+    
+  size_t bracket_start = content.find("[", tabs_pos);
+  size_t bracket_end = content.find("]", bracket_start);
+  if (bracket_start == std::string::npos || bracket_end == std::string::npos)
+    return;
+  
+  std::string tabs_content = content.substr(bracket_start + 1, bracket_end - bracket_start - 1);
+  
+  // Parse each tab entry - collect ALL tabs including duplicates
+  size_t pos = 0;
+  std::vector<std::string> urls_to_restore;
+  
+  while ((pos = tabs_content.find("{", pos)) != std::string::npos)
+  {
+    size_t end_obj = tabs_content.find("}", pos);
+    if (end_obj == std::string::npos)
+      break;
+      
+    std::string obj = tabs_content.substr(pos, end_obj - pos + 1);
+    
+    // Extract URL
+    size_t url_pos = obj.find("\"url\"");
+    std::string url;
+    if (url_pos != std::string::npos)
+    {
+      size_t url_start = obj.find("\"", url_pos + 5);
+      size_t url_end = obj.find("\"", url_start + 1);
+      if (url_start != std::string::npos && url_end != std::string::npos)
+      {
+        url = obj.substr(url_start + 1, url_end - url_start - 1);
+      }
+    }
+    
+    // Add ALL non-empty URLs (including duplicates)
+    if (!url.empty())
+    {
+      urls_to_restore.push_back(url);
+    }
+    
+    pos = end_obj + 1;
+  }
+  
+  // If no tabs to restore, do nothing
+  if (urls_to_restore.empty())
+  {
+    session_restore_pending_ = false;
+    return;
+  }
+  
+  // Strategy: Navigate the existing first tab to the first URL,
+  // then create new tabs for the remaining URLs.
+  // This avoids the complexity of closing tabs.
+  
+  bool first_url = true;
+  for (const auto &url : urls_to_restore)
+  {
+    if (first_url && !tabs_.empty())
+    {
+      // Navigate the existing (start page) tab to the first restored URL
+      auto first_tab_it = tabs_.begin();
+      if (first_tab_it->second && first_tab_it->second->view())
+      {
+        first_tab_it->second->view()->LoadURL(String(url.c_str()));
+      }
+      first_url = false;
+    }
+    else
+    {
+      // Create new tabs for remaining URLs
+      CreateNewTabForChildView(String(url.c_str()));
+    }
+  }
+  
+  // Clear the pending restore flag
+  session_restore_pending_ = false;
+  
+  // Mark current session as active (not clean exit) since we're running
+  SaveSessionToDisk();
+}
+
+int UI::GetSavedSessionTabCount() const
+{
+  std::ifstream in("data/session.json");
+  if (!in.is_open())
+    return 0;
+  
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+  in.close();
+  
+  std::string content = buffer.str();
+  
+  // Count tabs in the array
+  size_t tabs_pos = content.find("\"tabs\"");
+  if (tabs_pos == std::string::npos)
+    return 0;
+    
+  size_t bracket_start = content.find("[", tabs_pos);
+  size_t bracket_end = content.find("]", bracket_start);
+  if (bracket_start == std::string::npos || bracket_end == std::string::npos)
+    return 0;
+  
+  std::string tabs_content = content.substr(bracket_start + 1, bracket_end - bracket_start - 1);
+  
+  // Count '{' characters to count objects
+  int count = 0;
+  for (char c : tabs_content)
+  {
+    if (c == '{')
+      count++;
+  }
+  
+  return count;
+}
+
+bool UI::IsInternalBrowserPage(const std::string &url) const
+{
+  // List of internal/default browser pages that don't need to be restored
+  static const std::vector<std::string> internal_pages = {
+    "file:///static-sties/google-static.html",
+    "file:///new_tab_page.html",
+    "file:///settings.html",
+    "file:///history.html",
+    "file:///downloads.html",
+    "file:///passwords.html",
+    "file:///extensions.html",
+    "file:///about.html",
+    "file:///release_notes.html",
+    "file:///ui.html",
+    "file:///menu.html",
+    "file:///contextmenu.html",
+    "file:///suggestions.html",
+    "file:///downloads-panel.html",
+    "about:blank"
+  };
+  
+  for (const auto &page : internal_pages)
+  {
+    if (url.find(page) != std::string::npos || url == page)
+      return true;
+  }
+  
+  // Also check for any file:/// URL that's an internal asset
+  if (url.find("file:///") == 0)
+  {
+    // Check if it's a local static site or internal page
+    if (url.find("static-sties") != std::string::npos)
+      return true;
+  }
+  
+  return false;
+}
+
+int UI::GetMeaningfulSavedTabCount() const
+{
+  // Count tabs that are NOT internal browser pages
+  std::ifstream in("data/session.json");
+  if (!in.is_open())
+    return 0;
+  
+  std::stringstream buffer;
+  buffer << in.rdbuf();
+  in.close();
+  
+  std::string content = buffer.str();
+  
+  size_t tabs_pos = content.find("\"tabs\"");
+  if (tabs_pos == std::string::npos)
+    return 0;
+    
+  size_t bracket_start = content.find("[", tabs_pos);
+  size_t bracket_end = content.find("]", bracket_start);
+  if (bracket_start == std::string::npos || bracket_end == std::string::npos)
+    return 0;
+  
+  std::string tabs_content = content.substr(bracket_start + 1, bracket_end - bracket_start - 1);
+  
+  int meaningful_count = 0;
+  size_t pos = 0;
+  
+  while ((pos = tabs_content.find("{", pos)) != std::string::npos)
+  {
+    size_t end_obj = tabs_content.find("}", pos);
+    if (end_obj == std::string::npos)
+      break;
+      
+    std::string obj = tabs_content.substr(pos, end_obj - pos + 1);
+    
+    // Extract URL
+    size_t url_pos = obj.find("\"url\"");
+    if (url_pos != std::string::npos)
+    {
+      size_t url_start = obj.find("\"", url_pos + 5);
+      size_t url_end = obj.find("\"", url_start + 1);
+      if (url_start != std::string::npos && url_end != std::string::npos)
+      {
+        std::string url = obj.substr(url_start + 1, url_end - url_start - 1);
+        if (!IsInternalBrowserPage(url))
+        {
+          meaningful_count++;
+        }
+      }
+    }
+    
+    pos = end_obj + 1;
+  }
+  
+  return meaningful_count;
+}
+
+void UI::ShowSessionRestoreBar()
+{
+  // Mark that restore bar is visible to prevent session saving
+  session_restore_bar_visible_ = true;
+  
+  int tabCount = GetMeaningfulSavedTabCount();
+  bool wasCrash = !session_was_clean_exit_;
+  
+  std::ostringstream js;
+  js << "(function(){ if(typeof showSessionRestoreBar === 'function') showSessionRestoreBar("
+     << tabCount << ", " << (wasCrash ? "true" : "false") << "); })();";
+  
+  view()->EvaluateScript(String(js.str().c_str()), nullptr);
+}
+
+void UI::OnRestoreSession(const JSObject &obj, const JSArgs &args)
+{
+  // User clicked "Restore" - restore all saved tabs
+  // Clear the bar visibility flag first so we can save the restored session
+  session_restore_bar_visible_ = false;
+  RestoreSavedSession();
+}
+
+void UI::OnDismissSession(const JSObject &obj, const JSArgs &args)
+{
+  // User clicked "Start Fresh" or closed the bar
+  // Clear the bar visibility flag so we can save the new session
+  session_restore_bar_visible_ = false;
+  
+  // Clear the pending flag so we don't show the bar again
+  session_restore_pending_ = false;
+  
+  // Start a new session with the current tab
+  SaveSessionToDisk();
+}
+
 std::vector<std::string> UI::GetSuggestions(const std::string &input, int maxResults)
 {
   std::vector<std::string> suggestions;
@@ -5199,7 +5785,9 @@ bool UI::BrowserSettings::operator==(const BrowserSettings &other) const
          use_custom_user_agent == other.use_custom_user_agent &&
          custom_user_agent == other.custom_user_agent &&
          auto_save_settings == other.auto_save_settings &&
-         enable_drm_webview == other.enable_drm_webview;
+         enable_drm_webview == other.enable_drm_webview &&
+         restore_session_on_startup == other.restore_session_on_startup &&
+         save_session_continuously == other.save_session_continuously;
 }
 
 std::filesystem::path UI::SettingsDirectory()
diff --git a/src/UI.h b/src/UI.h
index 81776c5..38e918d 100644
--- a/src/UI.h
+++ b/src/UI.h
@@ -102,6 +102,10 @@ class UI : public WindowListener,
     // DRM WebView subsystem toggle (disabled by default, user must opt-in)
     bool enable_drm_webview = false;
 
+    // Session restore settings
+    bool restore_session_on_startup = true;  // Restore previous session tabs on startup
+    bool save_session_continuously = true;   // Save session state continuously (crash recovery)
+
     bool operator==(const BrowserSettings &other) const;
     bool operator!=(const BrowserSettings &other) const { return !(*this == other); }
   };
@@ -214,6 +218,11 @@ class UI : public WindowListener,
   DownloadManager *download_manager() { return download_manager_.get(); }
   password::PasswordManager *password_manager() { return password_manager_.get(); }
   AdBlocker *network_blocker() { return adblock_; }
+  
+  // Privacy settings accessors for Tab's JavaScript injection
+  bool do_not_track_enabled() const { return settings_.do_not_track; }
+  bool block_third_party_cookies_enabled() const { return settings_.block_third_party_cookies; }
+  bool web_security_enabled() const { return settings_.enable_web_security; }
 
 protected:
   static std::filesystem::path SettingsDirectory();
@@ -249,6 +258,20 @@ class UI : public WindowListener,
   String GetHistoryJSON();
   void ClearHistory();
 
+  // Session management (crash recovery / restore tabs)
+  void SaveSessionToDisk();
+  void SaveSessionToDiskWithCleanExit();
+  void LoadSessionFromDisk();
+  bool HasSavedSession() const;
+  void ClearSavedSession();
+  void RestoreSavedSession();
+  void ShowSessionRestoreBar();  // Show restore prompt in UI
+  void OnRestoreSession(const JSObject &obj, const JSArgs &args);  // User clicked restore
+  void OnDismissSession(const JSObject &obj, const JSArgs &args);  // User clicked dismiss
+  int GetSavedSessionTabCount() const;  // Get number of saved tabs
+  int GetMeaningfulSavedTabCount() const;  // Get count of non-internal tabs
+  bool IsInternalBrowserPage(const std::string &url) const;  // Check if URL is internal
+
   // Downloads management helpers
   String GetDownloadsJSON();
   void ClearCompletedDownloads();
@@ -367,6 +390,12 @@ class UI : public WindowListener,
   bool high_contrast_ui_enabled_ = false;
   bool vibrant_window_theme_enabled_ = false;
   bool smooth_scrolling_enabled_ = true;
+  
+  // Session restore state
+  bool session_restore_pending_ = false;  // True if we should prompt to restore session
+  bool session_was_clean_exit_ = false;   // True if last exit was clean (not crash/ALT+F4)
+  bool session_restore_bar_visible_ = false;  // True while restore bar is shown (prevents session saving)
+  std::string session_file_path_;         // Path to session.json
 
   JSFunction updateBack;
   JSFunction updateForward;