diff --git a/extensions/sql-assessment/resources/dark/book_inverse.svg b/extensions/sql-assessment/resources/dark/book_inverse.svg
new file mode 100644
index 0000000000..464b3d228b
--- /dev/null
+++ b/extensions/sql-assessment/resources/dark/book_inverse.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M4 6H11V3H4V6ZM5 4H10V5H5V4Z" fill="white"/>
+<path d="M2.99998 0C2.74326 0.000315985 2.48981 0.0577002 2.25798 0.168C1.77794 0.392083 1.39207 0.777956 1.16798 1.258C1.05778 1.48986 1.0004 1.74328 0.999984 2V14C0.998165 14.267 1.05127 14.5314 1.15598 14.777C1.36029 15.2573 1.74272 15.6397 2.22298 15.844C2.46855 15.9487 2.73303 16.0018 2.99998 16H14V0H2.99998ZM2.99998 15C2.86566 15.0013 2.73253 14.9747 2.60898 14.922C2.37107 14.8187 2.18127 14.6289 2.07798 14.391C2.02649 14.2671 1.99998 14.1342 1.99998 14C1.99998 13.8658 2.02649 13.7329 2.07798 13.609C2.12918 13.4911 2.20212 13.3839 2.29298 13.293C2.38371 13.2019 2.49095 13.1289 2.60898 13.078C2.73253 13.0253 2.86566 12.9987 2.99998 13H13V15H2.99998ZM13 12H2.99998C2.823 11.9993 2.64684 12.0243 2.47698 12.074C2.31034 12.1238 2.15022 12.1933 1.99998 12.281V2C2.00151 1.87494 2.03233 1.75199 2.08998 1.641C2.14876 1.52225 2.22643 1.41383 2.31998 1.32C2.41408 1.22676 2.52244 1.14912 2.64098 1.09C2.75186 1.03207 2.87489 1.00123 2.99998 1H13V12Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/extensions/sql-assessment/resources/light/book.svg b/extensions/sql-assessment/resources/light/book.svg
new file mode 100644
index 0000000000..bae52cfcc8
--- /dev/null
+++ b/extensions/sql-assessment/resources/light/book.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <title>Artboard 10</title>
+  <g>
+    <path d="M4,6h7V3H4ZM5,4h5V5H5Z"/>
+    <path d="M3,0a1.732,1.732,0,0,0-.742.168,2.256,2.256,0,0,0-1.09,1.09A1.735,1.735,0,0,0,1,2V14a1.947,1.947,0,0,0,.156.777,2.018,2.018,0,0,0,1.067,1.067A1.947,1.947,0,0,0,3,16H14V0ZM3,15a.972.972,0,0,1-.391-.078,1.023,1.023,0,0,1-.531-.531,1.019,1.019,0,0,1,0-.782,1.024,1.024,0,0,1,.215-.316,1.012,1.012,0,0,1,.316-.215A.972.972,0,0,1,3,13H13v2Zm10-3H3a1.836,1.836,0,0,0-.523.074A2.194,2.194,0,0,0,2,12.281V2a.8.8,0,0,1,.09-.359,1.223,1.223,0,0,1,.23-.321,1.246,1.246,0,0,1,.321-.23A.792.792,0,0,1,3,1H13Z"/>
+  </g>
+</svg>
diff --git a/extensions/sql-assessment/src/assessmentResultGrid.ts b/extensions/sql-assessment/src/assessmentResultGrid.ts
index 7448b15411..f3e713f36f 100644
--- a/extensions/sql-assessment/src/assessmentResultGrid.ts
+++ b/extensions/sql-assessment/src/assessmentResultGrid.ts
@@ -33,6 +33,7 @@ export class AssessmentResultGrid implements vscode.Disposable {
 
 	private readonly checkIdColOrder = 5;
 	private readonly targetColOrder = 1;
+	private readonly messageColOrder = 3;
 
 	public get component(): azdata.Component {
 		return this.rootContainer;
@@ -155,7 +156,10 @@ export class AssessmentResultGrid implements vscode.Disposable {
 		const selectedRowValues = this.table.data[rowNumber];
 		const asmtResultItem = this.dataItems.find(item =>
 			item.targetName === selectedRowValues[this.targetColOrder]
-			&& item.checkId === selectedRowValues[this.checkIdColOrder]);
+			&& item.checkId === selectedRowValues[this.checkIdColOrder]
+			&& item.message === selectedRowValues[this.messageColOrder]
+		);
+
 		if (!asmtResultItem) {
 			return;
 		}
diff --git a/extensions/sql-assessment/src/tabs/assessmentMainTab.ts b/extensions/sql-assessment/src/tabs/assessmentMainTab.ts
index 9f1eab31c0..f3af36d64e 100644
--- a/extensions/sql-assessment/src/tabs/assessmentMainTab.ts
+++ b/extensions/sql-assessment/src/tabs/assessmentMainTab.ts
@@ -236,8 +236,8 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
 			.withProperties<azdata.ButtonProperties>({
 				label: localize('btnGeneratehtmlreport', "Create HTML Report"),
 				iconPath: {
-					dark: this.extensionContext.asAbsolutePath('resources/dark/newquery_inverse.svg'),
-					light: this.extensionContext.asAbsolutePath('resources/light/newquery.svg')
+					dark: this.extensionContext.asAbsolutePath('resources/dark/book_inverse.svg'),
+					light: this.extensionContext.asAbsolutePath('resources/light/book.svg')
 				},
 				enabled: false
 			}).component();