diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index d0c80dad3c..5624f9f89d 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -6345,8 +6345,6 @@
 			children = (
 				AA3D531A27A2F57E00074EC1 /* Feedback.swift */,
 				AA3D531C27A2F58F00074EC1 /* FeedbackSender.swift */,
-				AAD8078627B3F45600CF7703 /* WebsiteBreakage.swift */,
-				AAD8078427B3F3BE00CF7703 /* WebsiteBreakageSender.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -7863,9 +7861,9 @@
 		B6FA893A269C414900588ECD /* PrivacyDashboard */ = {
 			isa = PBXGroup;
 			children = (
+				F1D6DA032B21E90500EE9745 /* Breakage */,
 				B6FA893B269C41ED00588ECD /* View */,
 				1E7E2E8F29029A2A00C01B54 /* ContentBlockingRulesUpdateObserver.swift */,
-				1E7E2E9129029F9B00C01B54 /* WebsiteBreakageReporter.swift */,
 				1E7E2E932902AC0E00C01B54 /* PrivacyDashboardPermissionHandler.swift */,
 			);
 			path = PrivacyDashboard;
@@ -7942,6 +7940,16 @@
 			path = JSAlert;
 			sourceTree = "<group>";
 		};
+		F1D6DA032B21E90500EE9745 /* Breakage */ = {
+			isa = PBXGroup;
+			children = (
+				1E7E2E9129029F9B00C01B54 /* WebsiteBreakageReporter.swift */,
+				AAD8078627B3F45600CF7703 /* WebsiteBreakage.swift */,
+				AAD8078427B3F3BE00CF7703 /* WebsiteBreakageSender.swift */,
+			);
+			path = Breakage;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -12929,8 +12937,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 95.0.0;
+				branch = fcappelli/breakage_improvement_mac;
+				kind = branch;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 301109ce38..3905f02c98 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "ae9e9180f74d92c83fc3cc1d2fc23f4855fb361c",
-        "version" : "95.0.0"
+        "branch" : "fcappelli/breakage_improvement_mac",
+        "revision" : "12e535fcd2a8c3020c0718caccda3df629d1e02e"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/privacy-dashboard",
       "state" : {
-        "revision" : "38336a574e13090764ba09a6b877d15ee514e371",
-        "version" : "3.1.1"
+        "branch" : "12-14-feat_macos_allow_direct_navigation_to_breakage_form",
+        "revision" : "24b6260043a888827998124bc12104f4779e010f"
       }
     },
     {
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
index 8d21c98b97..8b887b742e 100644
--- a/DuckDuckGo/Application/AppDelegate.swift
+++ b/DuckDuckGo/Application/AppDelegate.swift
@@ -73,6 +73,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
     private var emailCancellables = Set<AnyCancellable>()
     let bookmarksManager = LocalBookmarkManager.shared
 
+    var privacyDashboardWindow: NSWindow?
+
     private var didFinishLaunching = false
 
 #if SPARKLE
diff --git a/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Contents.json
new file mode 100644
index 0000000000..ea625b9491
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Exclamation-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Exclamation-16.pdf b/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Exclamation-16.pdf
new file mode 100644
index 0000000000..4fd30568aa
Binary files /dev/null and b/DuckDuckGo/Assets.xcassets/Colors/Exclamation.imageset/Exclamation-16.pdf differ
diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index d4084d6d47..5b68a8c193 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -432,6 +432,9 @@ struct UserText {
     static let bookmarksManageBookmarks = NSLocalizedString("bookmarks.manage-bookmarks", value: "Manage Bookmarks", comment: "Menu item for opening the bookmarks management interface")
     static let bookmarkImportedFromFolder = NSLocalizedString("bookmarks.imported.from.folder", value: "Imported from", comment: "Name of the folder the imported bookmarks are saved into")
 
+    static let reportBrokenSite = NSLocalizedString("report.broken.site", value: "Report Broken Site", comment: "Menu with feedback commands")
+    static let browserFeedback = NSLocalizedString("send.browser.feedback", value: "Send Browser Feedback", comment: "Menu with feedback commands")
+    
     static let zoom = NSLocalizedString("zoom", value: "Zoom", comment: "Menu with Zooming commands")
 
     static let emailOptionsMenuItem = NSLocalizedString("email.optionsMenu", value: "Email Protection", comment: "Menu item email feature")
@@ -555,7 +558,6 @@ struct UserText {
 
     static let sendFeedback = NSLocalizedString("preferences.about.send-feedback", value: "Send Feedback", comment: "Feedback button in the about preferences page")
 
-    static let feedbackBreakageDisclaimer = NSLocalizedString("feedback.breakage.disclaimer", value: "Reports sent to DuckDuckGo are 100% anonymous and only include your selection above, your optional message, the URL, a list of trackers we found on the site, the DuckDuckGo app version, and your macOS version.", comment: "Disclaimer in breakage form")
     static let feedbackDisclaimer = NSLocalizedString("feedback.disclaimer", value: "Reports sent to DuckDuckGo are 100% anonymous and only include your message, the DuckDuckGo app version, and your macOS version.", comment: "Disclaimer in breakage form")
 
     static let feedbackBugDescription = NSLocalizedString("feedback.bug.description", value: "Please describe the problem in as much detail as possible:", comment: "Label in the feedback form")
diff --git a/DuckDuckGo/DataImport/ChromePreferences.swift b/DuckDuckGo/DataImport/ChromePreferences.swift
index e24be4699a..82975cc92c 100644
--- a/DuckDuckGo/DataImport/ChromePreferences.swift
+++ b/DuckDuckGo/DataImport/ChromePreferences.swift
@@ -33,7 +33,7 @@ struct ChromePreferences: Decodable {
     let profile: Profile
 
     init(from data: Data) throws {
-        var decoder = JSONDecoder()
+        let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
 
         self = try decoder.decode(Self.self, from: data)
diff --git a/DuckDuckGo/Feedback/View/Feedback.storyboard b/DuckDuckGo/Feedback/View/Feedback.storyboard
index 510649b5af..117a33ec84 100644
--- a/DuckDuckGo/Feedback/View/Feedback.storyboard
+++ b/DuckDuckGo/Feedback/View/Feedback.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -42,12 +42,9 @@
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="B4Q-yT-nKT" customClass="ColorView" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="700" width="360" height="69"/>
                                 <subviews>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7KM-rJ-r28">
-                                        <rect key="frame" x="43" y="25" width="274" height="19"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="270" id="WpG-jC-P2k"/>
-                                        </constraints>
-                                        <textFieldCell key="cell" alignment="center" title="Help Improve the DuckDuckGo App" id="M7g-24-ECG">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7KM-rJ-r28">
+                                        <rect key="frame" x="18" y="25" width="324" height="19"/>
+                                        <textFieldCell key="cell" alignment="center" title="Help Improve the DuckDuckGo Browser" id="M7g-24-ECG">
                                             <font key="font" metaFont="systemSemibold" size="15"/>
                                             <color key="textColor" name="GreyTextColor"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -55,22 +52,24 @@
                                     </textField>
                                     <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gmY-Cl-KRc">
                                         <rect key="frame" x="8" y="41" width="20" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="20" id="5Cl-wW-X8R"/>
-                                            <constraint firstAttribute="width" constant="20" id="NJC-UV-HPf"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Close" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="aRg-eO-aAC">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="5Cl-wW-X8R"/>
+                                            <constraint firstAttribute="width" constant="20" id="NJC-UV-HPf"/>
+                                        </constraints>
                                     </button>
                                 </subviews>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="69" id="0od-R2-dBY"/>
                                     <constraint firstItem="7KM-rJ-r28" firstAttribute="centerX" secondItem="B4Q-yT-nKT" secondAttribute="centerX" id="B3c-lB-0Ee"/>
+                                    <constraint firstItem="7KM-rJ-r28" firstAttribute="leading" secondItem="B4Q-yT-nKT" secondAttribute="leading" constant="20" symbolic="YES" id="Ena-5P-iwD"/>
                                     <constraint firstItem="7KM-rJ-r28" firstAttribute="centerY" secondItem="B4Q-yT-nKT" secondAttribute="centerY" id="EyM-8M-vKg"/>
                                     <constraint firstItem="gmY-Cl-KRc" firstAttribute="leading" secondItem="B4Q-yT-nKT" secondAttribute="leading" constant="8" id="JCT-9z-jBi"/>
                                     <constraint firstItem="gmY-Cl-KRc" firstAttribute="top" secondItem="B4Q-yT-nKT" secondAttribute="top" constant="8" id="aj3-d1-Icj"/>
+                                    <constraint firstAttribute="trailing" secondItem="7KM-rJ-r28" secondAttribute="trailing" constant="20" symbolic="YES" id="h7Q-W2-knl"/>
                                 </constraints>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="color" keyPath="backgroundColor">
@@ -86,9 +85,6 @@
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3nf-Bg-7k2">
                                         <rect key="frame" x="14" y="14" width="332" height="40"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="28" id="1gW-Wq-I7c"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="H3H-xG-326">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -96,6 +92,9 @@
 DQ
 </string>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="28" id="1gW-Wq-I7c"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="okButtonAction:" target="TOa-sP-KHa" id="C2a-ct-tif"/>
                                         </connections>
@@ -108,7 +107,7 @@ DQ
                                         </constraints>
                                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ThankYou" id="Ykf-at-KNR"/>
                                     </imageView>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pad-Pc-j6d">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pad-Pc-j6d">
                                         <rect key="frame" x="137" y="557" width="87" height="19"/>
                                         <textFieldCell key="cell" alignment="center" title="Thank you!" id="NFA-fu-2EM">
                                             <font key="font" metaFont="systemSemibold" size="15"/>
@@ -116,7 +115,7 @@ DQ
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="syf-sE-uUM">
+                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="syf-sE-uUM">
                                         <rect key="frame" x="18" y="521" width="324" height="28"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="28" id="NhF-KV-8Fz"/>
@@ -147,9 +146,6 @@ DQ
                                 <subviews>
                                     <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="7Z6-Ji-PH7">
                                         <rect key="frame" x="17" y="658" width="326" height="37"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="Fw3-Y4-XV0"/>
-                                        </constraints>
                                         <popUpButtonCell key="cell" type="bevel" title="Select a category" bezelStyle="regularSquare" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="-1" inset="2" autoenablesItems="NO" selectedItem="z2T-3Y-jPK" id="gWx-cK-gfz">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="menu"/>
@@ -157,74 +153,23 @@ DQ
                                                 <items>
                                                     <menuItem title="Select a category" state="on" tag="-1" id="z2T-3Y-jPK"/>
                                                     <menuItem isSeparatorItem="YES" id="K5Z-td-X6u"/>
-                                                    <menuItem title="Report a site not working as expected" id="uoX-qE-3kz"/>
-                                                    <menuItem title="Report problem with the DuckDuckGo App" tag="1" id="Yti-fm-YMV"/>
+                                                    <menuItem title="Report a problem" tag="1" id="Yti-fm-YMV"/>
                                                     <menuItem title="Request a feature" tag="2" id="I6J-ps-0Vy"/>
                                                     <menuItem title="General feedback" tag="3" id="GSM-nJ-01d"/>
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="Fw3-Y4-XV0"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="optionPopUpButtonAction:" target="TOa-sP-KHa" id="UAa-qp-Arp"/>
                                         </connections>
                                     </popUpButton>
-                                    <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8B9-wf-zcP" userLabel="Website Breakage View">
-                                        <rect key="frame" x="0.0" y="547" width="360" height="100"/>
-                                        <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="2gs-6z-agW">
-                                                <rect key="frame" x="20" y="61" width="320" height="27"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="27" id="l1h-jz-vPJ"/>
-                                                    <constraint firstAttribute="width" constant="320" id="nBh-RP-srf"/>
-                                                </constraints>
-                                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="AsP-i9-AYb">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="hUd-Rb-6Ls">
-                                                <rect key="frame" x="17" y="7" width="326" height="37"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="30" id="3Tm-Sk-Wei"/>
-                                                    <constraint firstAttribute="width" constant="320" id="AUB-ZP-wJl"/>
-                                                </constraints>
-                                                <popUpButtonCell key="cell" type="bevel" title="Select a category (optional)" bezelStyle="regularSquare" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="-1" inset="2" autoenablesItems="NO" selectedItem="50u-Do-Pk7" id="d1R-Kk-zzo">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="menu"/>
-                                                    <menu key="menu" autoenablesItems="NO" id="5HU-z4-NLx">
-                                                        <items>
-                                                            <menuItem title="Select a category (optional)" state="on" tag="-1" id="50u-Do-Pk7"/>
-                                                            <menuItem isSeparatorItem="YES" id="VgP-Y6-9FR"/>
-                                                            <menuItem title="Can't sign in" id="Lcy-nr-Bvy"/>
-                                                            <menuItem title="Content is missing" tag="1" id="Jbl-XF-mkd"/>
-                                                            <menuItem title="Links or buttons don't work" tag="2" id="AMn-JN-Npb"/>
-                                                            <menuItem title="The site does not support this browser" tag="3" id="naz-Hr-IpO"/>
-                                                            <menuItem title="The site asked me to disable" tag="4" id="0YV-Mw-KfP"/>
-                                                            <menuItem title="Video or images didn't load" tag="5" id="ks1-6b-EFw"/>
-                                                            <menuItem title="Something else" tag="6" id="Fhy-jA-gGf"/>
-                                                        </items>
-                                                    </menu>
-                                                </popUpButtonCell>
-                                                <connections>
-                                                    <action selector="websiteBreakageCategoryPopUpButtonAction:" target="TOa-sP-KHa" id="k1b-m9-V8B"/>
-                                                </connections>
-                                            </popUpButton>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="100" id="3Lp-Et-qRB"/>
-                                            <constraint firstItem="2gs-6z-agW" firstAttribute="top" secondItem="8B9-wf-zcP" secondAttribute="top" constant="12" id="Boe-IN-w2P"/>
-                                            <constraint firstItem="hUd-Rb-6Ls" firstAttribute="leading" secondItem="8B9-wf-zcP" secondAttribute="leading" constant="20" id="Jed-xd-3mg"/>
-                                            <constraint firstItem="2gs-6z-agW" firstAttribute="leading" secondItem="8B9-wf-zcP" secondAttribute="leading" constant="20" id="ZiI-DM-AFY"/>
-                                            <constraint firstItem="hUd-Rb-6Ls" firstAttribute="top" secondItem="2gs-6z-agW" secondAttribute="bottom" constant="20" id="gUO-WO-8Hr"/>
-                                            <constraint firstAttribute="trailing" secondItem="hUd-Rb-6Ls" secondAttribute="trailing" constant="20" id="kGb-Nb-7TU"/>
-                                            <constraint firstAttribute="trailing" secondItem="2gs-6z-agW" secondAttribute="trailing" constant="20" id="qTG-tx-tnf"/>
-                                        </constraints>
-                                    </customView>
                                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Xi-CY-jyt" userLabel="Browser Feedback View">
                                         <rect key="frame" x="0.0" y="357" width="360" height="290"/>
                                         <subviews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Obm-Wr-qrD">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Obm-Wr-qrD">
                                                 <rect key="frame" x="18" y="263" width="324" height="15"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="320" id="Y8O-Rh-baf"/>
@@ -265,7 +210,7 @@ DQ
                                                     <autoresizingMask key="autoresizingMask"/>
                                                 </scroller>
                                             </scrollView>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nm3-pj-w2B">
+                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nm3-pj-w2B">
                                                 <rect key="frame" x="18" y="63" width="324" height="75"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="320" id="46H-7M-bu2"/>
@@ -316,22 +261,19 @@ DQ
                                     </customView>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Gy6-KF-A15">
                                         <rect key="frame" x="180" y="14" width="166" height="40"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="28" id="vLC-1q-2RZ"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="Submit" bezelStyle="rounded" alignment="center" controlSize="large" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ng8-Xz-jPD">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="28" id="vLC-1q-2RZ"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="submitButtonAction:" target="TOa-sP-KHa" id="5ag-9f-dye"/>
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G99-8X-64H">
                                         <rect key="frame" x="14" y="14" width="166" height="40"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="28" id="ixj-c9-sMF"/>
-                                        </constraints>
                                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="large" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="B8C-ef-DG6">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -339,6 +281,9 @@ DQ
 Gw
 </string>
                                         </buttonCell>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="28" id="ixj-c9-sMF"/>
+                                        </constraints>
                                         <connections>
                                             <action selector="cancelButtonAction:" target="TOa-sP-KHa" id="kan-lY-RNY"/>
                                         </connections>
@@ -347,7 +292,6 @@ Gw
                                 <constraints>
                                     <constraint firstAttribute="height" constant="700" id="0W2-HI-Vs8"/>
                                     <constraint firstItem="Gy6-KF-A15" firstAttribute="leading" secondItem="G99-8X-64H" secondAttribute="trailing" constant="12" symbolic="YES" id="0eZ-Ps-KCz"/>
-                                    <constraint firstItem="8B9-wf-zcP" firstAttribute="top" secondItem="wYB-07-s0m" secondAttribute="top" constant="53" id="8Dh-xw-FXE"/>
                                     <constraint firstItem="8xr-ho-IDj" firstAttribute="top" secondItem="wYB-07-s0m" secondAttribute="top" constant="53" id="AKl-Ll-Pv6"/>
                                     <constraint firstItem="8xr-ho-IDj" firstAttribute="leading" secondItem="wYB-07-s0m" secondAttribute="leading" id="BQd-LB-MKt"/>
                                     <constraint firstItem="RYb-WZ-bIo" firstAttribute="leading" secondItem="wYB-07-s0m" secondAttribute="leading" id="Igx-KW-WiD"/>
@@ -361,8 +305,6 @@ Gw
                                     <constraint firstItem="Gy6-KF-A15" firstAttribute="width" secondItem="G99-8X-64H" secondAttribute="width" id="XTc-rW-crW"/>
                                     <constraint firstItem="7Z6-Ji-PH7" firstAttribute="top" secondItem="wYB-07-s0m" secondAttribute="top" constant="8" id="ZL6-G9-svI"/>
                                     <constraint firstAttribute="trailing" secondItem="8Xi-CY-jyt" secondAttribute="trailing" id="b9w-wm-81Z"/>
-                                    <constraint firstAttribute="trailing" secondItem="8B9-wf-zcP" secondAttribute="trailing" id="nRt-k0-4pb"/>
-                                    <constraint firstItem="8B9-wf-zcP" firstAttribute="leading" secondItem="wYB-07-s0m" secondAttribute="leading" id="opY-Un-GIS"/>
                                     <constraint firstItem="8Xi-CY-jyt" firstAttribute="leading" secondItem="wYB-07-s0m" secondAttribute="leading" id="qvK-Km-IZH"/>
                                     <constraint firstItem="8Xi-CY-jyt" firstAttribute="top" secondItem="wYB-07-s0m" secondAttribute="top" constant="53" id="rcx-DQ-kn9"/>
                                     <constraint firstItem="7Z6-Ji-PH7" firstAttribute="leading" secondItem="wYB-07-s0m" secondAttribute="leading" constant="20" symbolic="YES" id="sQp-ga-TtJ"/>
@@ -405,11 +347,6 @@ Gw
                         <outlet property="submitButton" destination="Gy6-KF-A15" id="aBn-VX-sGY"/>
                         <outlet property="thankYouView" destination="C8j-UX-ywh" id="EQo-2a-mhp"/>
                         <outlet property="unsupportedOsView" destination="8xr-ho-IDj" id="3HW-mc-78M"/>
-                        <outlet property="urlTextField" destination="2gs-6z-agW" id="7CM-5N-ugt"/>
-                        <outlet property="websiteBreakageCategoryPopUpButton" destination="hUd-Rb-6Ls" id="DqR-hE-Sm5"/>
-                        <outlet property="websiteBreakageView" destination="8B9-wf-zcP" id="enA-tH-Z1l"/>
-                        <outlet property="websiteBreakageViewTopConstraint" destination="8Dh-xw-FXE" id="oNh-Yk-sHD"/>
-                        <outlet property="websiteIsBrokenMenuItem" destination="uoX-qE-3kz" id="xnb-jy-aeZ"/>
                     </connections>
                 </viewController>
                 <customObject id="FaH-Lu-sfn" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
diff --git a/DuckDuckGo/Feedback/View/FeedbackViewController.swift b/DuckDuckGo/Feedback/View/FeedbackViewController.swift
index 4043a88c7b..24d083a54a 100644
--- a/DuckDuckGo/Feedback/View/FeedbackViewController.swift
+++ b/DuckDuckGo/Feedback/View/FeedbackViewController.swift
@@ -26,21 +26,16 @@ final class FeedbackViewController: NSViewController {
     enum Constants {
         static let defaultContentHeight: CGFloat = 160
         static let feedbackContentHeight: CGFloat = 338
-        static let websiteBreakageContentHeight: CGFloat = 472
         static let thankYouContentHeight: CGFloat = 262
         static let browserFeedbackViewTopConstraint: CGFloat = 53
-        static let browserFeedbackViewWebsiteBreakageTopConstraint: CGFloat = 153
         static let unsupportedOSWarningHeight: CGFloat = 200
-        static let websiteBreakageTopConstraint: CGFloat = 53
     }
 
     enum FormOption {
-        case websiteBreakage
         case feedback(feedbackCategory: Feedback.Category)
 
         init?(tag: Int) {
             switch tag {
-            case 0: self = FormOption.websiteBreakage
             case 1: self = FormOption.feedback(feedbackCategory: .bug)
             case 2: self = FormOption.feedback(feedbackCategory: .featureRequest)
             case 3: self = FormOption.feedback(feedbackCategory: .other)
@@ -51,7 +46,6 @@ final class FeedbackViewController: NSViewController {
 
     @IBOutlet weak var optionPopUpButton: NSPopUpButton!
     @IBOutlet weak var pickOptionMenuItem: NSMenuItem!
-    @IBOutlet weak var websiteIsBrokenMenuItem: NSMenuItem!
 
     @IBOutlet weak var contentView: ColorView!
     @IBOutlet weak var contentViewHeightContraint: NSLayoutConstraint!
@@ -64,11 +58,6 @@ final class FeedbackViewController: NSViewController {
     @IBOutlet weak var browserFeedbackDisclaimerTextView: NSTextField!
     @IBOutlet weak var unsupportedOsView: NSView!
 
-    @IBOutlet weak var websiteBreakageView: NSView!
-    @IBOutlet weak var websiteBreakageViewTopConstraint: NSLayoutConstraint!
-    @IBOutlet weak var urlTextField: NSTextField!
-    @IBOutlet weak var websiteBreakageCategoryPopUpButton: NSPopUpButton!
-
     @IBOutlet weak var submitButton: NSButton!
 
     @IBOutlet weak var thankYouView: NSView!
@@ -100,7 +89,6 @@ final class FeedbackViewController: NSViewController {
                                                selector: #selector(popUpButtonOpened(_:)),
                                                name: NSPopUpButton.willPopUpNotification,
                                                object: nil)
-        updateBrokenWebsiteMenuItem()
     }
 
     override func viewDidDisappear() {
@@ -133,7 +121,6 @@ final class FeedbackViewController: NSViewController {
     @IBAction func submitButtonAction(_ sender: Any) {
         switch selectedFormOption {
         case .none: assertionFailure("Submit shouldn't be enabled"); return
-        case .websiteBreakage: sendWebsiteBreakage()
         case .feedback: sendFeedback()
         }
 
@@ -161,7 +148,6 @@ final class FeedbackViewController: NSViewController {
     }
 
     private func setupTextViews() {
-        urlTextField.delegate = self
         browserFeedbackTextView.delegate = self
         browserFeedbackTextView.font = NSFont.systemFont(ofSize: 12)
     }
@@ -174,14 +160,6 @@ final class FeedbackViewController: NSViewController {
         return FormOption(tag: item.tag)
     }
 
-    private var selectedWebsiteBreakageCategory: WebsiteBreakage.Category? {
-        guard let subcategoryItem = websiteBreakageCategoryPopUpButton.selectedItem,
-              let subcategory = WebsiteBreakage.Category(tag: subcategoryItem.tag) else {
-                  return nil
-              }
-        return subcategory
-    }
-
     private func updateViews() {
         defer {
             updateSubmitButton()
@@ -189,7 +167,6 @@ final class FeedbackViewController: NSViewController {
 
         guard let selectedFormOption = selectedFormOption else {
             browserFeedbackView.isHidden = true
-            websiteBreakageView.isHidden = true
             setContentViewHeight(Constants.defaultContentHeight, animated: false)
             pickOptionMenuItem.isEnabled = true
             return
@@ -206,14 +183,6 @@ final class FeedbackViewController: NSViewController {
             contentHeight = Constants.feedbackContentHeight + unsupportedOSWarningHeight
             updateBrowserFeedbackDescriptionLabel(for: feedbackCategory)
             browserFeedbackViewTopConstraint.constant = Constants.browserFeedbackViewTopConstraint + unsupportedOSWarningHeight
-            websiteBreakageView.isHidden = true
-        case .websiteBreakage:
-            contentHeight = Constants.websiteBreakageContentHeight + unsupportedOSWarningHeight
-            websiteBreakageViewTopConstraint.constant = Constants.websiteBreakageTopConstraint + unsupportedOSWarningHeight
-            urlTextField.stringValue = currentTabUrl?.absoluteString ?? ""
-            updateBrowserFeedbackDescriptionLabel(for: .bug)
-            browserFeedbackViewTopConstraint.constant = Constants.browserFeedbackViewWebsiteBreakageTopConstraint + unsupportedOSWarningHeight
-            websiteBreakageView.isHidden = false
         }
         updateBrowserFeedbackDisclaimerLabel(for: selectedFormOption)
         browserFeedbackTextView.makeMeFirstResponder()
@@ -245,8 +214,6 @@ final class FeedbackViewController: NSViewController {
             } else {
                 submitButton.isEnabled = false
             }
-        case .websiteBreakage:
-            submitButton.isEnabled = !urlTextField.stringValue.isEmpty
         }
 
         submitButton.bezelColor = submitButton.isEnabled ? NSColor.controlAccentColor: nil
@@ -265,17 +232,11 @@ final class FeedbackViewController: NSViewController {
 
     private func updateBrowserFeedbackDisclaimerLabel(for formOption: FormOption) {
         switch formOption {
-        case .websiteBreakage:
-            browserFeedbackDisclaimerTextView.stringValue = UserText.feedbackBreakageDisclaimer
         case .feedback:
             browserFeedbackDisclaimerTextView.stringValue = UserText.feedbackDisclaimer
         }
     }
 
-    private func updateBrokenWebsiteMenuItem() {
-        websiteIsBrokenMenuItem.isEnabled = currentTab?.content.isUrl ?? false
-    }
-
     private func sendFeedback() {
         guard let selectedFormOption = selectedFormOption else {
             assertionFailure("Can't send feedback")
@@ -283,7 +244,6 @@ final class FeedbackViewController: NSViewController {
         }
 
         switch selectedFormOption {
-        case .websiteBreakage: assertionFailure("Wrong method executed")
         case .feedback(feedbackCategory: let feedbackCategory):
             let feedback = Feedback(category: feedbackCategory,
                                     comment: browserFeedbackTextView.string,
@@ -293,39 +253,6 @@ final class FeedbackViewController: NSViewController {
         }
     }
 
-    private func sendWebsiteBreakage() {
-        guard let selectedFormOption = selectedFormOption else {
-            assertionFailure("Can't send breakage")
-            return
-        }
-
-        switch selectedFormOption {
-        case .feedback: assertionFailure("Wrong method executed")
-        case .websiteBreakage:
-            let blockedTrackerDomains = currentTab?.privacyInfo?.trackerInfo.trackersBlocked.compactMap { $0.domain } ?? []
-            let installedSurrogates = currentTab?.privacyInfo?.trackerInfo.installedSurrogates.map {$0} ?? []
-            let ampURL = currentTab?.linkProtection.lastAMPURLString ?? ""
-            let urlParametersRemoved = currentTab?.linkProtection.urlParametersRemoved ?? false
-            let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
-            let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: currentTabUrl?.host)
-
-            let websiteBreakage = WebsiteBreakage(category: selectedWebsiteBreakageCategory,
-                                                  description: browserFeedbackTextView.string,
-                                                  siteUrlString: urlTextField.stringValue,
-                                                  osVersion: "\(ProcessInfo.processInfo.operatingSystemVersion)",
-                                                  upgradedHttps: currentTab?.privacyInfo?.connectionUpgradedTo != nil,
-                                                  tdsETag: ContentBlocking.shared.contentBlockingManager.currentRules.first?.etag,
-                                                  blockedTrackerDomains: blockedTrackerDomains,
-                                                  installedSurrogates: installedSurrogates,
-                                                  isGPCEnabled: PrivacySecurityPreferences.shared.gpcEnabled,
-                                                  ampURL: ampURL,
-                                                  urlParametersRemoved: urlParametersRemoved,
-                                                  protectionsState: protectionsState,
-                                                  reportFlow: .native)
-            websiteBreakageSender.sendWebsiteBreakage(websiteBreakage)
-        }
-    }
-
     private func showThankYou() {
         setContentViewHeight(Constants.thankYouContentHeight, animated: true)
         contentView.isHidden = true
@@ -348,29 +275,10 @@ final class FeedbackViewController: NSViewController {
 
 }
 
-fileprivate extension WebsiteBreakage.Category {
-
-    init?(tag: Int) {
-        switch tag {
-        case 0: self = .cantSignIn
-        case 1: self = .contentIsMissing
-        case 2: self = .linksDontWork
-        case 3: self = .browserIsIncompatible
-        case 4: self = .theSiteAskedToDisable
-        case 5: self = .videoOrImagesDidntLoad
-        case 6: self = .somethingElse
-
-        default:
-            return nil
-        }
-    }
-
-}
-
 extension FeedbackViewController: NSTextFieldDelegate {
 
     func control(_ control: NSControl, textShouldBeginEditing fieldEditor: NSText) -> Bool {
-        return control != urlTextField
+        return true
     }
 
     func controlTextDidChange(_ notification: Notification) {
diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
index 8a30695b31..6bcd77d46f 100644
--- a/DuckDuckGo/Menus/MainMenuActions.swift
+++ b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -118,6 +118,27 @@ extension AppDelegate {
         FeedbackPresenter.presentFeedbackForm()
     }
 
+    @objc func openReportBrokenSite(_ sender: Any?) {
+        let storyboard = NSStoryboard(name: "PrivacyDashboard", bundle: nil)
+        let privacyDashboardViewController = storyboard.instantiateController(identifier: "PrivacyDashboardViewController") { coder in
+            PrivacyDashboardViewController(coder: coder, initMode: .reportBrokenSite)
+        }
+
+        privacyDashboardViewController.sizeDelegate = self
+
+        let window = NSWindow(contentViewController: privacyDashboardViewController)
+        window.setFrame(NSRect(x: 0, y: 0, width: privacyDashboardViewController.width, height: 587.0), display: true)
+        privacyDashboardWindow = window
+
+        guard let parentWindowController = WindowControllersManager.shared.lastKeyMainWindowController,
+              let tabModel = parentWindowController.mainViewController.tabCollectionViewModel.selectedTabViewModel else {
+            assertionFailure("AppDelegate: Failed to present PrivacyDashboard")
+            return
+        }
+        privacyDashboardViewController.updateTabViewModel(tabModel)
+        parentWindowController.window?.beginSheet(window) { _ in }
+    }
+
     #endif
 
     @objc func navigateToBookmark(_ sender: Any?) {
@@ -980,3 +1001,10 @@ extension MainViewController: FindInPageDelegate {
     }
 
 }
+
+extension AppDelegate: PrivacyDashboardViewControllerSizeDelegate {
+
+    func privacyDashboardViewControllerDidChange(size: NSSize) {
+        privacyDashboardWindow?.setFrame(NSRect(origin: .zero, size: size), display: true, animate: true)
+    }
+}
diff --git a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
index 233995c7a4..d51fa8b731 100644
--- a/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/AddressBarButtonsViewController.swift
@@ -69,15 +69,22 @@ final class AddressBarButtonsViewController: NSViewController {
         }()
     }
 
-    private var privacyDashboardPopover: PrivacyDashboardPopover?
-    private func privacyDashboardPopoverCreatingIfNeeded() -> PrivacyDashboardPopover {
-        return privacyDashboardPopover ?? {
-            let popover = PrivacyDashboardPopover()
-            popover.delegate = self
-            self.privacyDashboardPopover = popover
-            self.subscribePrivacyDashboardPendingUpdates(privacyDashboardPopover: popover)
-            return popover
-        }()
+    private var _privacyDashboardPopover: PrivacyDashboardPopover?
+    private var privacyDashboardPopover: PrivacyDashboardPopover {
+        get {
+            if let result = _privacyDashboardPopover {
+                return result
+            } else {
+                let popover = PrivacyDashboardPopover()
+                popover.delegate = self
+                self.privacyDashboardPopover = popover
+                self.subscribePrivacyDashboardPendingUpdates(privacyDashboardPopover: popover)
+                return popover
+            }
+        }
+        set {
+            _privacyDashboardPopover = newValue
+        }
     }
 
     @IBOutlet weak var privacyDashboardPositioningView: NSView!
@@ -340,16 +347,19 @@ final class AddressBarButtonsViewController: NSViewController {
 
     func openPrivacyDashboard() {
         guard let selectedTabViewModel = tabCollectionViewModel.selectedTabViewModel else { return }
-        let privacyDashboardPopover = privacyDashboardPopoverCreatingIfNeeded()
         // Prevent popover from being closed with Privacy Entry Point Button, while pending updates
-        if privacyDashboardPopover.viewController.isPendingUpdates() { return }
+        guard let privacyDashboardViewController = privacyDashboardPopover.viewController else {
+            return
+        }
+        if privacyDashboardViewController.isPendingUpdates() { return }
 
         guard !privacyDashboardPopover.isShown else {
             privacyDashboardPopover.close()
+            _privacyDashboardPopover = nil
             return
         }
 
-        privacyDashboardPopover.viewController.updateTabViewModel(selectedTabViewModel)
+        privacyDashboardViewController.updateTabViewModel(selectedTabViewModel)
 
         let positioningViewInWindow = privacyDashboardPositioningView.convert(privacyDashboardPositioningView.bounds, to: view.window?.contentView)
         privacyDashboardPopover.setPreferredMaxHeight(positioningViewInWindow.origin.y)
@@ -363,7 +373,7 @@ final class AddressBarButtonsViewController: NSViewController {
             .receive(on: DispatchQueue.main)
             .sink { [weak privacyDashboardPopover, weak selectedTabViewModel] _ in
                 guard privacyDashboardPopover?.isShown == true, let tabViewModel = selectedTabViewModel else { return }
-                privacyDashboardPopover?.viewController.updateTabViewModel(tabViewModel)
+                privacyDashboardViewController.updateTabViewModel(tabViewModel)
             }
     }
 
@@ -579,7 +589,7 @@ final class AddressBarButtonsViewController: NSViewController {
             self?.subscribeToPermissions()
             self?.subscribeToPrivacyEntryPointIconUpdateTrigger()
             self?.subscribeToTrackerAnimationTrigger()
-            self?.closePopover()
+            self?._privacyDashboardPopover?.close()
             self?.updatePrivacyEntryPointIcon()
         }
     }
@@ -643,9 +653,13 @@ final class AddressBarButtonsViewController: NSViewController {
         privacyDashboadPendingUpdatesCancellable?.cancel()
         guard NSApp.runType.requiresEnvironment else { return }
 
-        privacyDashboadPendingUpdatesCancellable = privacyDashboardPopover.viewController.rulesUpdateObserver
+        guard let privacyDashboardViewController = privacyDashboardPopover.viewController else {
+            return
+        }
+
+        privacyDashboadPendingUpdatesCancellable = privacyDashboardViewController.rulesUpdateObserver
             .$pendingUpdates.dropFirst().receive(on: DispatchQueue.main).sink { [weak privacyDashboardPopover] _ in
-            let isPendingUpdate = privacyDashboardPopover?.viewController.isPendingUpdates() ?? false
+                let isPendingUpdate = privacyDashboardViewController.isPendingUpdates()
 
             // Prevent popover from being closed when clicking away, while pending updates
             if isPendingUpdate {
@@ -848,10 +862,6 @@ final class AddressBarButtonsViewController: NSViewController {
         updatePermissionButtons()
     }
 
-    private func closePopover() {
-        privacyDashboardPopover?.close()
-    }
-
     private func stopAnimations(trackerAnimations: Bool = true,
                                 shieldAnimations: Bool = true,
                                 badgeAnimations: Bool = true) {
@@ -977,7 +987,7 @@ extension AddressBarButtonsViewController: NSPopoverDelegate {
 
     func popoverWillClose(_ notification: Notification) {
         switch notification.object as? NSPopover {
-        case bookmarkPopover:
+        case is BookmarkPopover:
             bookmarkPopover?.popoverWillClose()
 
         default:
@@ -987,14 +997,15 @@ extension AddressBarButtonsViewController: NSPopoverDelegate {
 
     func popoverDidClose(_ notification: Notification) {
         switch notification.object as? NSPopover {
-        case bookmarkPopover:
+        case is BookmarkPopover:
             if bookmarkPopover?.isNew == true {
                 NotificationCenter.default.post(name: .bookmarkPromptShouldShow, object: nil)
             }
             updateBookmarkButtonVisibility()
 
-        case privacyDashboardPopover:
+        case is PrivacyDashboardPopover:
             privacyEntryPointButton.state = .off
+            _privacyDashboardPopover = nil
 
         default:
             break
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index f4d0faec88..569648d8ff 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -113,11 +113,12 @@ final class MoreOptionsMenu: NSMenu {
     private func setupMenuItems() {
 
 #if FEEDBACK
-
-        addItem(withTitle: "Send Feedback", action: #selector(AppDelegate.openFeedback(_:)), keyEquivalent: "")
+        let feedbackMenuItem = NSMenuItem(title: UserText.sendFeedback, action: nil, keyEquivalent: "")
 #if !APPSTORE
             .withImage(NSImage(named: "BetaLabel"))
 #endif // !APPSTORE
+        feedbackMenuItem.submenu = FeedbackSubMenu(targetting: self, tabCollectionViewModel: tabCollectionViewModel)
+        addItem(feedbackMenuItem)
 
         addItem(NSMenuItem.separator())
 
@@ -127,6 +128,7 @@ final class MoreOptionsMenu: NSMenu {
 
         zoomMenuItem.submenu = ZoomSubMenu(targetting: self, tabCollectionViewModel: tabCollectionViewModel)
         addItem(zoomMenuItem)
+
         addItem(NSMenuItem.separator())
 
         addUtilityItems()
@@ -538,6 +540,32 @@ final class EmailOptionsButtonSubMenu: NSMenu {
     }
 }
 
+@MainActor
+final class FeedbackSubMenu: NSMenu {
+
+    init(targetting target: AnyObject, tabCollectionViewModel: TabCollectionViewModel) {
+        super.init(title: UserText.sendFeedback)
+
+        updateMenuItems(with: tabCollectionViewModel, targetting: target)
+    }
+
+    required init(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func updateMenuItems(with tabCollectionViewModel: TabCollectionViewModel, targetting target: AnyObject) {
+        removeAllItems()
+
+        let reportBrokenSiteItem = NSMenuItem(title: UserText.reportBrokenSite, action: #selector(AppDelegate.openReportBrokenSite(_:)), keyEquivalent: "")
+            .withImage(NSImage(named: "Exclamation"))
+        addItem(reportBrokenSiteItem)
+
+        let browserFeedbackItem = NSMenuItem(title: UserText.browserFeedback, action: #selector(AppDelegate.openFeedback(_:)), keyEquivalent: "")
+            .withImage(NSImage(named: "Feedback"))
+        addItem(browserFeedbackItem)
+    }
+}
+
 @MainActor
 final class ZoomSubMenu: NSMenu {
 
diff --git a/DuckDuckGo/Feedback/Model/WebsiteBreakage.swift b/DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakage.swift
similarity index 80%
rename from DuckDuckGo/Feedback/Model/WebsiteBreakage.swift
rename to DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakage.swift
index 7a61d2741a..e6de9eeeb9 100644
--- a/DuckDuckGo/Feedback/Model/WebsiteBreakage.swift
+++ b/DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakage.swift
@@ -20,24 +20,12 @@ import Foundation
 
 struct WebsiteBreakage {
 
-    enum Category: String, CaseIterable {
-        case cantSignIn = "login"
-        case contentIsMissing = "content"
-        case linksDontWork = "links"
-        case browserIsIncompatible = "unsupported"
-        case theSiteAskedToDisable = "paywall"
-        case videoOrImagesDidntLoad = "images"
-        case videoDidntPlay = "video"
-        case commentsDidntLoad = "comments"
-        case somethingElse = "other"
+    public enum Source: String {
+        case appMenu = "menu"
+        case dashboard
     }
 
-    enum ReportFlow: String {
-        case native
-        case privacyDashboard = "dashboard"
-    }
-
-    let category: Category?
+    let category: String
     let description: String?
     let siteUrlString: String
     let osVersion: String
@@ -49,11 +37,11 @@ struct WebsiteBreakage {
     let ampURL: String
     let urlParametersRemoved: Bool
     let manufacturer: String
-    let reportFlow: ReportFlow
+    let reportFlow: Source
     let protectionsState: Bool
 
     init(
-        category: Category?,
+        category: String,
         description: String?,
         siteUrlString: String,
         osVersion: String,
@@ -66,7 +54,7 @@ struct WebsiteBreakage {
         urlParametersRemoved: Bool,
         protectionsState: Bool,
         manufacturer: String = "Apple",
-        reportFlow: ReportFlow = .native
+        reportFlow: Source
     ) {
         self.category = category
         self.description = description
@@ -86,7 +74,7 @@ struct WebsiteBreakage {
 
     var requestParameters: [String: String] {
         [
-            "category": category?.rawValue ?? "",
+            "category": category,
             "description": description ?? "",
             "siteUrl": siteUrlString,
             "upgradedHttps": upgradedHttps ? "true" : "false",
diff --git a/DuckDuckGo/PrivacyDashboard/WebsiteBreakageReporter.swift b/DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakageReporter.swift
similarity index 92%
rename from DuckDuckGo/PrivacyDashboard/WebsiteBreakageReporter.swift
rename to DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakageReporter.swift
index de8d030f3d..366fd4e69a 100644
--- a/DuckDuckGo/PrivacyDashboard/WebsiteBreakageReporter.swift
+++ b/DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakageReporter.swift
@@ -26,13 +26,13 @@ final class WebsiteBreakageReporter {
         self.tabViewModel = tabViewModel
     }
 
-    public func reportBreakage(category: String, description: String, reportFlow: WebsiteBreakage.ReportFlow) {
+    public func reportBreakage(category: String, description: String, reportFlow: WebsiteBreakage.Source) {
         let websiteBreakage = makeWebsiteBreakage(category: category, description: description, currentTab: tabViewModel?.tab, reportFlow: reportFlow)
         let websiteBreakageSender = WebsiteBreakageSender()
         websiteBreakageSender.sendWebsiteBreakage(websiteBreakage)
     }
 
-    private func makeWebsiteBreakage(category: String, description: String, currentTab: Tab?, reportFlow: WebsiteBreakage.ReportFlow) -> WebsiteBreakage {
+    private func makeWebsiteBreakage(category: String, description: String, currentTab: Tab?, reportFlow: WebsiteBreakage.Source) -> WebsiteBreakage {
         // ⚠️ To limit privacy risk, site URL is trimmed to not include query and fragment
         let currentURL = currentTab?.content.url?.trimmingQueryItemsAndFragment()?.absoluteString ?? ""
 
@@ -45,7 +45,7 @@ final class WebsiteBreakageReporter {
         let configuration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig
         let protectionsState = configuration.isFeature(.contentBlocking, enabledForDomain: currentTab?.content.url?.host)
 
-        let websiteBreakage = WebsiteBreakage(category: WebsiteBreakage.Category(rawValue: category.lowercased()),
+        let websiteBreakage = WebsiteBreakage(category: category.lowercased(),
                                               description: description,
                                               siteUrlString: currentURL,
                                               osVersion: "\(ProcessInfo.processInfo.operatingSystemVersion)",
diff --git a/DuckDuckGo/Feedback/Model/WebsiteBreakageSender.swift b/DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakageSender.swift
similarity index 100%
rename from DuckDuckGo/Feedback/Model/WebsiteBreakageSender.swift
rename to DuckDuckGo/PrivacyDashboard/Breakage/WebsiteBreakageSender.swift
diff --git a/DuckDuckGo/PrivacyDashboard/ContentBlockingRulesUpdateObserver.swift b/DuckDuckGo/PrivacyDashboard/ContentBlockingRulesUpdateObserver.swift
index 2f6905409f..b8b8f81df0 100644
--- a/DuckDuckGo/PrivacyDashboard/ContentBlockingRulesUpdateObserver.swift
+++ b/DuckDuckGo/PrivacyDashboard/ContentBlockingRulesUpdateObserver.swift
@@ -38,14 +38,13 @@ final class ContentBlockingRulesUpdateObserver {
         bindContentBlockingRulesRecompilation(publisher: (ContentBlocking.shared as? AppContentBlocking)!.userContentUpdating.userContentBlockingAssets)
     }
 
-    public func didStartCompilation(for domain: String, token: ContentBlockerRulesManager.CompletionToken ) {
+    public func startCompilation(for domain: String, token: ContentBlockerRulesManager.CompletionToken ) {
         pendingUpdates[token] = domain
         onPendingUpdates?()
     }
 
-    private func bindContentBlockingRulesRecompilation<Pub: Publisher>(publisher: Pub)
-    where Pub.Output == UserContentUpdating.NewContent, Pub.Failure == Never {
-
+    private func bindContentBlockingRulesRecompilation<Pub: Publisher>(publisher: Pub) where Pub.Output == UserContentUpdating.NewContent,
+                                                                                                Pub.Failure == Never {
         rulesRecompilationCancellable = publisher
             .compactMap(\.nonEmptyCompletionTokens)
             .receive(on: RunLoop.main)
diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboard.storyboard b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboard.storyboard
index a51848a0fe..5d3788cb9e 100644
--- a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboard.storyboard
+++ b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboard.storyboard
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift
index d4b1dd4496..5566778ae2 100644
--- a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift
+++ b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardPopover.swift
@@ -27,22 +27,21 @@ final class PrivacyDashboardPopover: NSPopover {
         guard let addressBar,
               let window = addressBar.window else { return .infinite }
         var frame = window.convertToScreen(addressBar.convert(addressBar.bounds, to: nil))
-
         frame = frame.insetBy(dx: -36, dy: -window.frame.size.height)
-
         return frame
     }
 
+    var viewController: PrivacyDashboardViewController? {
+        contentViewController as? PrivacyDashboardViewController
+    }
+
     override init() {
         super.init()
-
-        self.animates = false
 #if DEBUG
         self.behavior = .semitransient
 #else
         self.behavior = .transient
 #endif
-
         setupContentController()
     }
 
@@ -50,26 +49,29 @@ final class PrivacyDashboardPopover: NSPopover {
         fatalError("PrivacyDashboardPopover: Bad initializer")
     }
 
-    // swiftlint:disable force_cast
-    var viewController: PrivacyDashboardViewController { contentViewController as! PrivacyDashboardViewController }
-    // swiftlint:enable force_cast
-
-    // swiftlint:disable force_cast
     private func setupContentController() {
         let storyboard = NSStoryboard(name: "PrivacyDashboard", bundle: nil)
-        let controller = storyboard
-            .instantiateController(withIdentifier: "PrivacyDashboardViewController") as! PrivacyDashboardViewController
+        guard let controller = storyboard.instantiateController(withIdentifier: "PrivacyDashboardViewController") as? PrivacyDashboardViewController else {
+            assertionFailure("PrivacyDashboard is missing PrivacyDashboardViewController")
+            return
+        }
+        controller.sizeDelegate = self
         contentViewController = controller
     }
-    // swiftlint:enable force_cast
 
     func setPreferredMaxHeight(_ height: CGFloat) {
-        viewController.setPreferredMaxHeight(height - 40) // Account for popover arrow height
+        viewController?.setPreferredMaxHeight(height - 40) // Account for popover arrow height
     }
 
     override func show(relativeTo positioningRect: NSRect, of positioningView: NSView, preferredEdge: NSRectEdge) {
         self.addressBar = positioningView.superview
         super.show(relativeTo: positioningRect, of: positioningView, preferredEdge: preferredEdge)
     }
+}
 
+extension PrivacyDashboardPopover: PrivacyDashboardViewControllerSizeDelegate {
+
+    func privacyDashboardViewControllerDidChange(size: NSSize) {
+        self.contentSize = size
+    }
 }
diff --git a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
index 5458b7aa5f..c69290cbb3 100644
--- a/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
+++ b/DuckDuckGo/PrivacyDashboard/View/PrivacyDashboardViewController.swift
@@ -22,28 +22,35 @@ import Combine
 import BrowserServicesKit
 import PrivacyDashboard
 
+protocol PrivacyDashboardViewControllerSizeDelegate: AnyObject {
+
+    func privacyDashboardViewControllerDidChange(size: NSSize)
+}
+
 final class PrivacyDashboardViewController: NSViewController {
 
     struct Constants {
-        static let initialContentHeight: CGFloat = 499
+        static let initialContentHeight: CGFloat = 489
+    }
+
+    /// Type of web page displayed
+    enum Mode {
+        case privacyDashboard
+        case reportBrokenSite
     }
 
     private var webView: WKWebView!
-    private var contentHeightConstraint: NSLayoutConstraint!
+    let width: CGFloat = 360.0
+    private let initMode: Mode
+
+    var source: WebsiteBreakage.Source {
+        initMode == .reportBrokenSite ? .appMenu : .dashboard
+    }
 
     private let privacyDashboardController =  PrivacyDashboardController(privacyInfo: nil)
     public let rulesUpdateObserver = ContentBlockingRulesUpdateObserver()
     private let websiteBreakageReporter = WebsiteBreakageReporter()
     private let permissionHandler = PrivacyDashboardPermissionHandler()
-
-    /// Running the resize animation block during the popover animation causes frame hitching.
-    /// The animation only needs to run when transitioning between views in the popover, so this is used to track when to run the animation.
-    /// This should be set to true any time the popover is displayed (i.e., reset to true when dismissing the popover), and false after the initial resize pass is complete.
-    @Published private var shouldAnimateHeightChange: Bool = false
-
-    @Published private var currentContentHeight: Int = Int(Constants.initialContentHeight)
-    private var currentContentHeightCancellable: AnyCancellable?
-
     private var preferredMaxHeight: CGFloat = Constants.initialContentHeight
     func setPreferredMaxHeight(_ height: CGFloat) {
         guard height > Constants.initialContentHeight else { return }
@@ -51,16 +58,25 @@ final class PrivacyDashboardViewController: NSViewController {
         preferredMaxHeight = height
     }
 
+    var sizeDelegate: PrivacyDashboardViewControllerSizeDelegate?
+
+    required init?(coder: NSCoder, initMode: Mode) {
+        self.initMode = initMode
+        super.init(coder: coder)
+    }
+
+    required init?(coder: NSCoder) {
+        self.initMode = .privacyDashboard
+        super.init(coder: coder)
+    }
+
     public func updateTabViewModel(_ tabViewModel: TabViewModel) {
 
         privacyDashboardController.updatePrivacyInfo(tabViewModel.tab.privacyInfo)
-
         rulesUpdateObserver.updateTabViewModel(tabViewModel, onPendingUpdates: { [weak self] in
             self?.sendPendingUpdates()
         })
-
         websiteBreakageReporter.updateTabViewModel(tabViewModel)
-
         permissionHandler.updateTabViewModel(tabViewModel) { [weak self] allowedPermissions in
             self?.privacyDashboardController.allowedPermissions = allowedPermissions
         }
@@ -70,43 +86,11 @@ final class PrivacyDashboardViewController: NSViewController {
         super.viewDidLoad()
 
         initWebView()
-        privacyDashboardController.setup(for: webView, reportBrokenSiteOnly: false)
-
-        setupHeightChangeHandler()
-    }
-
-    override func viewWillAppear() {
-        super.viewWillAppear()
-
+        privacyDashboardController.setup(for: webView, reportBrokenSiteOnly: initMode == .reportBrokenSite ? true : false)
         privacyDashboardController.privacyDashboardNavigationDelegate = self
         privacyDashboardController.privacyDashboardDelegate = self
         privacyDashboardController.privacyDashboardReportBrokenSiteDelegate = self
         privacyDashboardController.preferredLocale = "en" // fixed until app is localised
-
-        webView.reload()
-    }
-
-    override func viewDidAppear() {
-        super.viewDidAppear()
-
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) {
-            self.shouldAnimateHeightChange = true
-        }
-    }
-
-    override func viewWillDisappear() {
-        super.viewWillDisappear()
-
-        privacyDashboardController.privacyDashboardNavigationDelegate = nil
-        privacyDashboardController.privacyDashboardDelegate = nil
-        privacyDashboardController.privacyDashboardReportBrokenSiteDelegate = nil
-        shouldAnimateHeightChange = false
-    }
-
-    override func viewDidDisappear() {
-        super.viewDidDisappear()
-
-        currentContentHeight = Int(Constants.initialContentHeight)
     }
 
     private func initWebView() {
@@ -120,21 +104,18 @@ final class PrivacyDashboardViewController: NSViewController {
         self.webView = webView
         view.addAndLayout(webView)
 
-        view.topAnchor.constraint(equalTo: webView.topAnchor).isActive = true
-
-        contentHeightConstraint = view.heightAnchor.constraint(equalToConstant: Constants.initialContentHeight)
-        contentHeightConstraint.isActive = true
-    }
+        webView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+        webView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 0).isActive = true
+        webView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: 0).isActive = true
+        webView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
 
-    private func setupHeightChangeHandler() {
-        currentContentHeightCancellable = $currentContentHeight
-            .combineLatest($shouldAnimateHeightChange)
-            .removeDuplicates { prev, current in
-                prev.0 == current.0
-            }
-            .sink(receiveValue: { [weak self] (height, shouldAnimate) in
-                self?.onHeightChange(height, shouldAnimate: shouldAnimate)
-            })
+#if DEBUG
+        if #available(macOS 13.3, *) {
+            webView.isInspectable = true
+        } else {
+            // Fallback on earlier versions
+        }
+#endif
     }
 
     public func isPendingUpdates() -> Bool {
@@ -155,24 +136,10 @@ final class PrivacyDashboardViewController: NSViewController {
         return rulesUpdateObserver.pendingUpdates.values.contains(domain)
     }
 
-    private func onHeightChange(_ height: Int, shouldAnimate: Bool) {
-        var height = CGFloat(height)
-        if height > self.preferredMaxHeight {
-            height = self.preferredMaxHeight
-        }
+    private func privacyDashboardProtectionSwitchChangeHandler(state: ProtectionState) {
 
-        if shouldAnimate {
-            NSAnimationContext.runAnimationGroup { [weak self] context in
-                context.duration = 1/3
-                context.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
-                self?.contentHeightConstraint.animator().constant = height
-            }
-        } else {
-            self.contentHeightConstraint.constant = height
-        }
-    }
+        dismiss()
 
-    private func privacyDashboardProtectionSwitchChangeHandler(state: ProtectionState) {
         guard let domain = privacyDashboardController.privacyInfo?.url.host else {
             return
         }
@@ -187,10 +154,12 @@ final class PrivacyDashboardViewController: NSViewController {
         }
 
         let completionToken = ContentBlocking.shared.contentBlockingManager.scheduleCompilation()
-        rulesUpdateObserver.didStartCompilation(for: domain, token: completionToken)
+        rulesUpdateObserver.startCompilation(for: domain, token: completionToken)
     }
 }
 
+// MARK: - PrivacyDashboardControllerDelegate
+
 extension PrivacyDashboardViewController: PrivacyDashboardControllerDelegate {
 
     func privacyDashboardControllerDidRequestShowReportBrokenSite(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController) {
@@ -237,17 +206,25 @@ extension PrivacyDashboardViewController: PrivacyDashboardControllerDelegate {
     }
 }
 
+// MARK: - PrivacyDashboardNavigationDelegate
+
 extension PrivacyDashboardViewController: PrivacyDashboardNavigationDelegate {
 
     func privacyDashboardController(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController, didSetHeight height: Int) {
-        currentContentHeight = height
+        sizeDelegate?.privacyDashboardViewControllerDidChange(size: NSSize(width: width, height: CGFloat(height)))
+    }
+
+    func privacyDashboardControllerDidTapClose(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController) {
+        dismiss()
     }
 }
 
+// MARK: - PrivacyDashboardReportBrokenSiteDelegate
+
 extension PrivacyDashboardViewController: PrivacyDashboardReportBrokenSiteDelegate {
 
     func privacyDashboardController(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController, didRequestSubmitBrokenSiteReportWithCategory category: String, description: String) {
-        websiteBreakageReporter.reportBreakage(category: category, description: description, reportFlow: .privacyDashboard)
+        websiteBreakageReporter.reportBreakage(category: category, description: description, reportFlow: .dashboard)
     }
 
     func privacyDashboardController(_ privacyDashboardController: PrivacyDashboard.PrivacyDashboardController, reportBrokenSiteDidChangeProtectionSwitch protectionState: PrivacyDashboard.ProtectionState) {
diff --git a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
index 78939672a9..0a9a9dfc93 100644
--- a/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
+++ b/UnitTests/PrivacyReferenceTests/BrokenSiteReportingReferenceTests.swift
@@ -52,9 +52,7 @@ final class BrokenSiteReportingReferenceTests: XCTestCase {
 
             os_log("Testing [%s]", type: .info, test.name)
 
-            let category = WebsiteBreakage.Category(rawValue: test.category)
-
-            let breakage = WebsiteBreakage(category: category,
+            let breakage = WebsiteBreakage(category: "test",
                                            description: nil,
                                            siteUrlString: test.siteURL,
                                            osVersion: test.os ?? "",
@@ -66,7 +64,8 @@ final class BrokenSiteReportingReferenceTests: XCTestCase {
                                            ampURL: "",
                                            urlParametersRemoved: false,
                                            protectionsState: test.protectionsEnabled,
-                                           manufacturer: test.manufacturer ?? "")
+                                           manufacturer: test.manufacturer ?? "",
+                                           reportFlow: .appMenu)
 
             let request = makeURLRequest(with: breakage.requestParameters)
 
diff --git a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
index dbba082bc3..8d62e66e48 100644
--- a/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
+++ b/UnitTests/WebsiteBreakageReport/WebsiteBreakageReportTests.swift
@@ -24,7 +24,7 @@ class WebsiteBreakageReportTests: XCTestCase {
 
     func testCommonSetOfFields() throws {
         let breakage = WebsiteBreakage(
-            category: .contentIsMissing,
+            category: "contentIsMissing",
             description: nil,
             siteUrlString: "https://example.test/",
             osVersion: "12.3.0",
@@ -40,7 +40,8 @@ class WebsiteBreakageReportTests: XCTestCase {
             isGPCEnabled: true,
             ampURL: "https://example.test",
             urlParametersRemoved: false,
-            protectionsState: true
+            protectionsState: true,
+            reportFlow: .appMenu
         )
 
         let urlRequest = makeURLRequest(with: breakage.requestParameters)
@@ -52,7 +53,7 @@ class WebsiteBreakageReportTests: XCTestCase {
         XCTAssertEqual(url.host, "improving.duckduckgo.com")
         XCTAssertEqual(url.path, "/t/epbf_macos_desktop")
 
-        XCTAssertEqual(queryItems[valueFor: "category"], "content")
+        XCTAssertEqual(queryItems[valueFor: "category"], "contentIsMissing")
         XCTAssertEqual(queryItems[valueFor: "siteUrl"], "https%3A%2F%2Fexample.test%2F")
         XCTAssertEqual(queryItems[valueFor: "upgradedHttps"], "true")
         XCTAssertEqual(queryItems[valueFor: "tds"], "abc123")
@@ -63,7 +64,7 @@ class WebsiteBreakageReportTests: XCTestCase {
 
     func testThatNativeAppSpecificFieldsAreReported() throws {
         let breakage = WebsiteBreakage(
-            category: .videoOrImagesDidntLoad,
+            category: "videoOrImagesDidntLoad",
             description: nil,
             siteUrlString: "http://unsafe.example.test/path/to/thing.html",
             osVersion: "12",
@@ -80,7 +81,8 @@ class WebsiteBreakageReportTests: XCTestCase {
             ampURL: "https://example.test",
             urlParametersRemoved: false,
             protectionsState: true,
-            manufacturer: "IBM"
+            manufacturer: "IBM",
+            reportFlow: .appMenu
         )
 
         let urlRequest = makeURLRequest(with: breakage.requestParameters)
@@ -92,7 +94,7 @@ class WebsiteBreakageReportTests: XCTestCase {
         XCTAssertEqual(url.host, "improving.duckduckgo.com")
         XCTAssertEqual(url.path, "/t/epbf_macos_desktop")
 
-        XCTAssertEqual(queryItems[valueFor: "category"], "images")
+        XCTAssertEqual(queryItems[valueFor: "category"], "videoOrImagesDidntLoad")
         XCTAssertEqual(queryItems[valueFor: "siteUrl"], "http%3A%2F%2Funsafe.example.test%2Fpath%2Fto%2Fthing.html")
         XCTAssertEqual(queryItems[valueFor: "upgradedHttps"], "false")
         XCTAssertEqual(queryItems[valueFor: "tds"], "abc123")