diff --git a/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/DebugLogContentView+iOS.swift b/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/DebugLogContentView+iOS.swift
deleted file mode 100644
index 564aebf5..00000000
--- a/Packages/App/Sources/AppUIMain/Views/Diagnostics/iOS/DebugLogContentView+iOS.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  DebugLogContentView+iOS.swift
-//  Passepartout
-//
-//  Created by Davide De Rosa on 8/31/24.
-//  Copyright (c) 2025 Davide De Rosa. All rights reserved.
-//
-//  https://github.com/passepartoutvpn
-//
-//  This file is part of Passepartout.
-//
-//  Passepartout is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  Passepartout is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#if os(iOS)
-
-import SwiftUI
-
-struct DebugLogContentView: View {
-    let lines: [String]
-
-    var body: some View {
-        TextEditor(text: .constant(lines.joined(separator: "\n")))
-            .font(.caption)
-    }
-}
-
-#endif
diff --git a/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/DebugLogContentView+macOS.swift b/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/DebugLogContentView+macOS.swift
deleted file mode 100644
index 026d1dea..00000000
--- a/Packages/App/Sources/AppUIMain/Views/Diagnostics/macOS/DebugLogContentView+macOS.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  DebugLogContentView+macOS.swift
-//  Passepartout
-//
-//  Created by Davide De Rosa on 8/31/24.
-//  Copyright (c) 2025 Davide De Rosa. All rights reserved.
-//
-//  https://github.com/passepartoutvpn
-//
-//  This file is part of Passepartout.
-//
-//  Passepartout is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  Passepartout is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#if os(macOS)
-
-import SwiftUI
-
-struct DebugLogContentView: View {
-    let lines: [String]
-
-    var body: some View {
-        List {
-            ForEach(Array(lines.enumerated()), id: \.offset) {
-                Text($0.element)
-            }
-        }
-    }
-}
-
-#endif
diff --git a/Packages/App/Sources/AppUITV/Views/Settings/DebugLogContentView.swift b/Packages/App/Sources/AppUITV/Views/Settings/DebugLogContentView.swift
deleted file mode 100644
index 97775cee..00000000
--- a/Packages/App/Sources/AppUITV/Views/Settings/DebugLogContentView.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  DebugLogContentView.swift
-//  Passepartout
-//
-//  Created by Davide De Rosa on 11/23/24.
-//  Copyright (c) 2025 Davide De Rosa. All rights reserved.
-//
-//  https://github.com/passepartoutvpn
-//
-//  This file is part of Passepartout.
-//
-//  Passepartout is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  Passepartout is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-import SwiftUI
-
-struct DebugLogContentView: View {
-    let lines: [String]
-
-    var body: some View {
-        ScrollView {
-            LazyVStack {
-                ForEach(Array(lines.enumerated()), id: \.offset) {
-                    Button($0.element) {
-                        //
-                    }
-                    .buttonStyle(.plain)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                    .font(.caption)
-                }
-            }
-        }
-    }
-}
diff --git a/Packages/App/Sources/CommonLibrary/Business/ExtendedTunnel.swift b/Packages/App/Sources/CommonLibrary/Business/ExtendedTunnel.swift
index ce4f2796..711d3ac9 100644
--- a/Packages/App/Sources/CommonLibrary/Business/ExtendedTunnel.swift
+++ b/Packages/App/Sources/CommonLibrary/Business/ExtendedTunnel.swift
@@ -122,7 +122,7 @@ extension ExtendedTunnel {
     public func currentLog(parameters: Constants.Log) async -> [String] {
         let output = try? await tunnel.sendMessage(.localLog(
             sinceLast: parameters.sinceLast,
-            maxLevel: parameters.maxLevel
+            maxLevel: parameters.options.maxLevel
         ))
         switch output {
         case .debugLog(let log):
diff --git a/Packages/App/Sources/CommonLibrary/Domain/Constants.swift b/Packages/App/Sources/CommonLibrary/Domain/Constants.swift
index bacb881c..d048581f 100644
--- a/Packages/App/Sources/CommonLibrary/Domain/Constants.swift
+++ b/Packages/App/Sources/CommonLibrary/Domain/Constants.swift
@@ -145,9 +145,7 @@ public struct Constants: Decodable, Sendable {
 
         public let sinceLast: TimeInterval
 
-        public let maxLevel: DebugLog.Level
-
-        public let maxNumberOfLines: Int
+        public let options: LocalLogger.Options
 
         public let maxAge: TimeInterval?
     }
diff --git a/Packages/App/Sources/CommonLibrary/Extensions/PassepartoutConfiguration+Logging.swift b/Packages/App/Sources/CommonLibrary/Extensions/PassepartoutConfiguration+Logging.swift
index 7304d93d..46c6eec9 100644
--- a/Packages/App/Sources/CommonLibrary/Extensions/PassepartoutConfiguration+Logging.swift
+++ b/Packages/App/Sources/CommonLibrary/Extensions/PassepartoutConfiguration+Logging.swift
@@ -30,67 +30,27 @@ extension PassepartoutConfiguration {
     public func configureLogging(to url: URL, parameters: Constants.Log, logsPrivateData: Bool) {
         pp_log(.app, .debug, "Log to: \(url)")
 
-        setLocalLogger(options: .init(
+        setLocalLogger(
             url: url,
-            maxNumberOfLines: parameters.maxNumberOfLines,
-            maxLevel: parameters.maxLevel,
+            options: parameters.options,
             mapper: parameters.formatter.formattedLine
-        ))
+        )
 
         if logsPrivateData {
             logsAddresses = true
             logsModules = true
         }
 
-        if let maxAge = parameters.maxAge {
-            purgeLogs(at: url, beyond: maxAge)
-        }
+        appendLog(parameters.options.maxLevel, message: "")
+        appendLog(parameters.options.maxLevel, message: "--- BEGIN ---")
+        appendLog(parameters.options.maxLevel, message: "")
     }
 
     public func currentLog(parameters: Constants.Log) -> [String] {
         currentLogLines(
             sinceLast: parameters.sinceLast,
-            maxLevel: parameters.maxLevel
+            maxLevel: parameters.options.maxLevel
         )
         .map(parameters.formatter.formattedLine)
     }
-
-    public func availableLogs(at url: URL) -> [Date: URL] {
-        let parent = url.deletingLastPathComponent()
-        let prefix = url.lastPathComponent
-        do {
-            let contents = try FileManager.default.contentsOfDirectory(at: parent, includingPropertiesForKeys: nil)
-            return contents.reduce(into: [:]) { found, item in
-                let filename = item.lastPathComponent
-                guard filename.hasPrefix(prefix) else {
-                    return
-                }
-                guard let timestampString = filename.split(separator: ".").last,
-                      let timestamp = TimeInterval(timestampString) else {
-                    return
-                }
-                let date = Date(timeIntervalSince1970: timestamp)
-                found[date] = item
-            }
-        } catch {
-            return [:]
-        }
-    }
-
-    public func flushLog() {
-        try? saveLog()
-    }
-}
-
-private extension PassepartoutConfiguration {
-    func purgeLogs(at url: URL, beyond maxAge: TimeInterval) {
-        let logs = availableLogs(at: url)
-        let minDate = Date().addingTimeInterval(-maxAge)
-        logs.forEach { date, url in
-            guard date >= minDate else {
-                try? FileManager.default.removeItem(at: url)
-                return
-            }
-        }
-    }
 }
diff --git a/Packages/App/Sources/CommonLibrary/Resources/Constants.json b/Packages/App/Sources/CommonLibrary/Resources/Constants.json
index bf2ed0fa..7d115fca 100644
--- a/Packages/App/Sources/CommonLibrary/Resources/Constants.json
+++ b/Packages/App/Sources/CommonLibrary/Resources/Constants.json
@@ -37,9 +37,12 @@
         "appPath": "app.log",
         "tunnelPath": "tunnel.log",
         "sinceLast": 86400,
-        "maxLevel": 3,
-        "maxNumberOfLines": 10000,
-        "maxAge": 604800,
+        "options": {
+            "maxLevel": 3,
+            "maxSize": 500000,
+            "maxBufferedLines": 5000,
+            "maxAge": 259200
+        },
         "formatter": {
             "timestamp": "HH:mm:ss",
             "message": "%@ - %@"
diff --git a/Packages/App/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift b/Packages/App/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift
index 312b2827..985bc677 100644
--- a/Packages/App/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift
+++ b/Packages/App/Sources/UILibrary/Theme/UI/Theme+Modifiers.swift
@@ -266,8 +266,23 @@ extension View {
         modifier(ThemeHoverListRowModifier())
     }
 
-    public func themeTip(_ text: String, edge: Edge) -> some View {
-        modifier(ThemeTipModifier(text: text, edge: edge))
+    public func themeTip<Label>(
+        _ text: String,
+        edge: Edge,
+        width: Double = 150.0,
+        alignment: Alignment = .center,
+        label: @escaping () -> Label = {
+            ThemeImage(.tip)
+                .imageScale(.large)
+        }
+    ) -> some View where Label: View {
+        modifier(ThemeTipModifier(
+            text: text,
+            edge: edge,
+            width: width,
+            alignment: alignment,
+            label: label
+        ))
     }
 #endif
 }
@@ -617,11 +632,17 @@ struct ThemeLockScreenModifier<LockedContent>: ViewModifier where LockedContent:
     }
 }
 
-struct ThemeTipModifier: ViewModifier {
+struct ThemeTipModifier<Label>: ViewModifier where Label: View {
     let text: String
 
     let edge: Edge
 
+    let width: Double
+
+    let alignment: Alignment
+
+    let label: () -> Label
+
     @State
     private var isPresenting = false
 
@@ -631,9 +652,8 @@ struct ThemeTipModifier: ViewModifier {
             Button {
                 isPresenting = true
             } label: {
-                ThemeImage(.tip)
+                label()
             }
-            .imageScale(.large)
             .buttonStyle(.borderless)
             .popover(isPresented: $isPresenting, arrowEdge: edge) {
                 VStack {
@@ -642,7 +662,7 @@ struct ThemeTipModifier: ViewModifier {
                         .foregroundStyle(.primary)
                         .lineLimit(nil)
                         .multilineTextAlignment(.leading)
-                        .frame(width: 150.0)
+                        .frame(width: width, alignment: alignment)
                 }
                 .padding(12)
             }
diff --git a/Packages/App/Sources/UILibrary/Views/Diagnostics/DebugLogContentView.swift b/Packages/App/Sources/UILibrary/Views/Diagnostics/DebugLogContentView.swift
new file mode 100644
index 00000000..21ca03b4
--- /dev/null
+++ b/Packages/App/Sources/UILibrary/Views/Diagnostics/DebugLogContentView.swift
@@ -0,0 +1,110 @@
+//
+//  DebugLogContentView.swift
+//  Passepartout
+//
+//  Created by Davide De Rosa on 11/23/24.
+//  Copyright (c) 2025 Davide De Rosa. All rights reserved.
+//
+//  https://github.com/passepartoutvpn
+//
+//  This file is part of Passepartout.
+//
+//  Passepartout is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Passepartout is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import SwiftUI
+
+public struct DebugLogContentView: View {
+
+    @EnvironmentObject
+    private var theme: Theme
+
+    public let lines: [String]
+
+    public init(lines: [String]) {
+        self.lines = lines
+    }
+
+    public var body: some View {
+        ScrollViewReader { proxy in
+            scrollView
+                .onLoad {
+                    withAnimation {
+                        proxy.scrollTo(lines.count - 1, anchor: .bottom)
+                    }
+                }
+        }
+    }
+}
+
+#if os(macOS)
+
+private extension DebugLogContentView {
+    struct Entry: Identifiable {
+        let id: Int
+
+        let line: String
+    }
+
+    var scrollView: some View {
+        let entries = lines
+            .enumerated()
+            .map {
+                Entry.init(id: $0.offset, line: $0.element)
+            }
+
+        return Table(entries) {
+            TableColumn("") { entry in
+                HStack {
+                    EmptyView()
+                        .themeTip(entry.line, edge: .bottom, width: 400.0, alignment: .leading) {
+                            ThemeImage(.search)
+                        }
+                        .environmentObject(theme) // TODO: #873, Table loses environment
+
+                    Text(entry.line)
+                        .font(.caption)
+                }
+            }
+        }
+        .withoutColumnHeaders()
+    }
+}
+
+#else
+
+private extension DebugLogContentView {
+    var scrollView: some View {
+        List(lines.indices, id: \.self, rowContent: entryView)
+            .listStyle(.plain)
+    }
+
+    func entryView(for index: Int) -> some View {
+        Text(lines[index])
+            .themeMultiLine(true)
+            .scrollableOnTV()
+            .buttonStyle(.plain)
+            .font(.caption)
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .id(index)
+    }
+}
+
+#endif
+
+#Preview {
+    DebugLogContentView(
+        lines: Array(repeating: "foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar ", count: 200)
+    )
+}
diff --git a/Packages/PassepartoutKit-Source b/Packages/PassepartoutKit-Source
index f6d85fdf..b140470e 160000
--- a/Packages/PassepartoutKit-Source
+++ b/Packages/PassepartoutKit-Source
@@ -1 +1 @@
-Subproject commit f6d85fdf1e186fa13c820166f3a414962bcc52c1
+Subproject commit b140470e9c2567fcb5e7053b030c1df509d7cd24
diff --git a/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout.xcscheme b/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout.xcscheme
index dd7d5885..94222063 100644
--- a/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout.xcscheme
+++ b/Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout.xcscheme
@@ -124,6 +124,11 @@
             value = "1"
             isEnabled = "NO">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "SWIFTUI_ATTRIBUTEDGRAPH_DEBUG"
+            value = "1"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <StoreKitConfigurationFileReference
          identifier = "../../Passepartout/Passepartout.storekit">