diff --git a/extensions/mssql/l10n/bundle.l10n.json b/extensions/mssql/l10n/bundle.l10n.json
index 71d9c3f369..47ff1cb6fd 100644
--- a/extensions/mssql/l10n/bundle.l10n.json
+++ b/extensions/mssql/l10n/bundle.l10n.json
@@ -244,6 +244,8 @@
         "message": "{0} of {1} rules",
         "comment": ["{0} is the filtered count, {1} is the total count"]
     },
+    "Rule enabled": "Rule enabled",
+    "Rule disabled": "Rule disabled",
     "Create new firewall rule for {0}/{0} is the server name that the firewall rule will be created for": {
         "message": "Create new firewall rule for {0}",
         "comment": ["{0} is the server name that the firewall rule will be created for"]
diff --git a/extensions/mssql/src/codeAnalysis/codeAnalysisWebViewController.ts b/extensions/mssql/src/codeAnalysis/codeAnalysisWebViewController.ts
index 722bd1f2c0..3a1f9e54bc 100644
--- a/extensions/mssql/src/codeAnalysis/codeAnalysisWebViewController.ts
+++ b/extensions/mssql/src/codeAnalysis/codeAnalysisWebViewController.ts
@@ -169,7 +169,6 @@ export class CodeAnalysisWebViewController extends ReactWebviewPanelController<
                 }
                 if (payload.closeAfterSave) {
                     this.vscodeWrapper.logToOutputChannel(Loc.rulesSaved);
-                    this.vscodeWrapper.outputChannel.show();
                     this.panel.dispose();
                 }
                 // Update the baseline rules so the component's useEffect resets isDirty
diff --git a/extensions/mssql/src/reactviews/common/locConstants.ts b/extensions/mssql/src/reactviews/common/locConstants.ts
index de5ae7d776..dcb2864d46 100644
--- a/extensions/mssql/src/reactviews/common/locConstants.ts
+++ b/extensions/mssql/src/reactviews/common/locConstants.ts
@@ -265,6 +265,8 @@ export class LocConstants {
                     args: [filtered, total],
                     comment: ["{0} is the filtered count, {1} is the total count"],
                 }),
+            ruleEnabled: l10n.t("Rule enabled"),
+            ruleDisabled: l10n.t("Rule disabled"),
         };
     }
 
diff --git a/extensions/mssql/src/reactviews/pages/CodeAnalysis/codeAnalysis.tsx b/extensions/mssql/src/reactviews/pages/CodeAnalysis/codeAnalysis.tsx
index 65aad30b6a..d4b64c427c 100644
--- a/extensions/mssql/src/reactviews/pages/CodeAnalysis/codeAnalysis.tsx
+++ b/extensions/mssql/src/reactviews/pages/CodeAnalysis/codeAnalysis.tsx
@@ -32,6 +32,7 @@ import {
     ChevronDown20Regular,
     ChevronRight20Regular,
     Search20Regular,
+    Checkmark20Regular,
 } from "@fluentui/react-icons";
 import { DialogHeader } from "../../common/dialogHeader.component";
 import { DialogMessage } from "../../common/dialogMessage";
@@ -115,6 +116,14 @@ const useStyles = makeStyles({
         gap: "8px",
         paddingLeft: "56px",
     },
+    checkmarkContainer: {
+        width: "20px",
+        height: "20px",
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        flexShrink: 0,
+    },
 
     // --- States ---
     spinnerContainer: {
@@ -487,13 +496,20 @@ export const CodeAnalysisDialog = () => {
                                                 <TableRow key={rule.ruleId}>
                                                     <TableCell className={styles.tableCell}>
                                                         <div className={styles.childRuleContent}>
-                                                            <Checkbox
-                                                                aria-hidden={true}
-                                                                checked={rule.enabled}
-                                                                disabled={!rule.enabled}
-                                                                style={{ pointerEvents: "none" }}
-                                                                tabIndex={-1}
-                                                            />
+                                                            <div
+                                                                className={
+                                                                    styles.checkmarkContainer
+                                                                }
+                                                                role="img"
+                                                                aria-label={
+                                                                    rule.enabled
+                                                                        ? loc.ruleEnabled
+                                                                        : loc.ruleDisabled
+                                                                }>
+                                                                {rule.enabled && (
+                                                                    <Checkmark20Regular aria-hidden="true" />
+                                                                )}
+                                                            </div>
                                                             <Text>
                                                                 {rule.shortRuleId}:{" "}
                                                                 {rule.displayName}
diff --git a/extensions/sql-database-projects/package.nls.json b/extensions/sql-database-projects/package.nls.json
index 67b236c8f9..f563a4f7fc 100644
--- a/extensions/sql-database-projects/package.nls.json
+++ b/extensions/sql-database-projects/package.nls.json
@@ -11,7 +11,7 @@
     "sqlDatabaseProjects.publish": "Publish",
     "sqlDatabaseProjects.createProjectFromDatabase": "Create Project From Database",
     "sqlDatabaseProjects.updateProjectFromDatabase": "Update Project From Database",
-    "sqlDatabaseProjects.configureCodeAnalysisSettings": "Code Analysis Settings (Preview)",
+    "sqlDatabaseProjects.configureCodeAnalysisSettings": "Code Analysis Settings",
     "sqlDatabaseProjects.properties": "Properties",
     "sqlDatabaseProjects.schemaCompare": "Schema Compare",
     "sqlDatabaseProjects.delete": "Delete",
diff --git a/localization/xliff/sql-database-projects.xlf b/localization/xliff/sql-database-projects.xlf
index eb030fa540..d46093b8de 100644
--- a/localization/xliff/sql-database-projects.xlf
+++ b/localization/xliff/sql-database-projects.xlf
@@ -994,7 +994,7 @@
       <source xml:lang="en">Close Database Project</source>
     </trans-unit>
     <trans-unit id="sqlDatabaseProjects.configureCodeAnalysisSettings">
-      <source xml:lang="en">Code Analysis Settings (Preview)</source>
+      <source xml:lang="en">Code Analysis Settings</source>
     </trans-unit>
     <trans-unit id="sqlDatabaseProjects.convertToSdkStyleProject">
       <source xml:lang="en">Convert to SDK-style project</source>
diff --git a/localization/xliff/vscode-mssql.xlf b/localization/xliff/vscode-mssql.xlf
index 922321b90c..1282ee897e 100644
--- a/localization/xliff/vscode-mssql.xlf
+++ b/localization/xliff/vscode-mssql.xlf
@@ -4961,6 +4961,12 @@
     <trans-unit id="++CODE++141b69f95916694982e525599db8205af7ecd6ced92d36c8aec6c5a9daa1e90e">
       <source xml:lang="en">Rows per page</source>
     </trans-unit>
+    <trans-unit id="++CODE++24601cef1cab3c7af34a853118337c5ac35833d0713571295bdfc7b9b37b994c">
+      <source xml:lang="en">Rule disabled</source>
+    </trans-unit>
+    <trans-unit id="++CODE++57993e10706c49eb54a633479451efd91636bee3f329ca3345632046c4b8060c">
+      <source xml:lang="en">Rule enabled</source>
+    </trans-unit>
     <trans-unit id="++CODE++7c9de4e8e989511f39c9c515352856dbfe290c6de0e123d12cc60972e8fa8bf3">
       <source xml:lang="en">Rule name</source>
     </trans-unit>