diff --git a/checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/AuthenticatorIntegrationTest.java b/checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/AuthenticatorIntegrationTest.java
index 4e7d263c..24dce08b 100644
--- a/checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/AuthenticatorIntegrationTest.java
+++ b/checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/integration/AuthenticatorIntegrationTest.java
@@ -18,7 +18,7 @@ public class AuthenticatorIntegrationTest extends BaseIntegrationTest {
 
     @Test
     public void testSuccessfulAuthentication() {
-    	 authenticator = new Authenticator(); 
+    	 authenticator =  Authenticator.INSTANCE; 
         System.out.println("\n=== Starting Authentication Test ===");
         System.out.println("Current directory: " + new File(".").getAbsolutePath());
         System.out.println("API Key available: " + (VALID_API_KEY != null));
@@ -31,7 +31,7 @@ public void testSuccessfulAuthentication() {
 
     @Test
 	public void testInvalidApiKeyAuthentication() {
-    	 authenticator = new Authenticator(); 
+    	 authenticator =  Authenticator.INSTANCE; 
 		System.out.println("\n=== Starting Invalid API Key Test ===");
 		String invalidApiKey = "invalid-api-key";
 		String result = authenticator.doAuthentication(invalidApiKey, "");
diff --git a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
index 3bf247d3..af4d89a2 100644
--- a/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
+++ b/checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
@@ -91,11 +91,16 @@
 import com.checkmarx.ast.wrapper.CxException;
 import com.checkmarx.eclipse.common.events.SettingsTopics;
 import com.checkmarx.eclipse.common.preferences.Preferences;
+import com.checkmarx.eclipse.common.events.SettingsTopics;
+import com.checkmarx.eclipse.common.preferences.Preferences;
 import com.checkmarx.eclipse.Activator;
 import com.checkmarx.eclipse.enums.ActionName;
 import com.checkmarx.eclipse.common.enums.Severity;
 import com.checkmarx.eclipse.common.utils.CxLogger;
 import com.checkmarx.eclipse.common.utils.PluginConstants;
+import com.checkmarx.eclipse.common.enums.Severity;
+import com.checkmarx.eclipse.common.utils.CxLogger;
+import com.checkmarx.eclipse.common.utils.PluginConstants;
 import com.checkmarx.eclipse.utils.NotificationPopUpUI;
 import com.checkmarx.eclipse.utils.PluginUtils;
 import com.checkmarx.eclipse.views.actions.ToolBarActions;
@@ -437,8 +442,8 @@ protected IStatus run(IProgressMonitor arg0) {
 				});
 
 				if (!currentBranch.isEmpty()) {
-					updateStartScanButton(true);
 					sync.asyncExec(() -> {
+						updateStartScanButton(true);
 						PluginUtils.setTextForComboViewer(branchComboViewer, currentBranch);
 					});
 					List<Scan> scanList = DataProvider.getInstance().getScansForProject(currentBranch);
@@ -2957,7 +2962,9 @@ private List<Project> getProjects() {
 		} catch (Exception e) {
 			String errorMessage = e.getCause() != null && e.getCause().getMessage() != null ? e.getCause().getMessage()
 					: e.getMessage();
-			PluginUtils.showMessage(rootModel, resultsTree, errorMessage);
+			org.eclipse.swt.widgets.Display.getDefault().asyncExec(() -> {
+				PluginUtils.showMessage(rootModel, resultsTree, errorMessage);
+			});
 		}
 
 		return projectList;
diff --git a/common-lib/src/com/checkmarx/eclipse/common/preferences/CheckmarxPreferencePage.java b/common-lib/src/com/checkmarx/eclipse/common/preferences/CheckmarxPreferencePage.java
index 15a69a32..7440bb3d 100644
--- a/common-lib/src/com/checkmarx/eclipse/common/preferences/CheckmarxPreferencePage.java
+++ b/common-lib/src/com/checkmarx/eclipse/common/preferences/CheckmarxPreferencePage.java
@@ -48,7 +48,6 @@ public class CheckmarxPreferencePage extends PreferencePage implements IWorkbenc
     private Label mcpStatusLabel;
     private boolean loggedIn;
 
-
     public CheckmarxPreferencePage() {
         super();
         setPreferenceStore(com.checkmarx.eclipse.common.preferences.Preferences.STORE);
diff --git a/common-lib/src/com/checkmarx/eclipse/common/runner/Authenticator.java b/common-lib/src/com/checkmarx/eclipse/common/runner/Authenticator.java
index c1dcb21d..d9a9f7b8 100644
--- a/common-lib/src/com/checkmarx/eclipse/common/runner/Authenticator.java
+++ b/common-lib/src/com/checkmarx/eclipse/common/runner/Authenticator.java
@@ -6,7 +6,7 @@
 
 public class Authenticator {
 
-	public Authenticator() {
+	private Authenticator() {
 		// Private constructor to prevent instantiation
 	}
 
diff --git a/devassist-lib/META-INF/MANIFEST.MF b/devassist-lib/META-INF/MANIFEST.MF
index 23ddc285..326e02f3 100644
--- a/devassist-lib/META-INF/MANIFEST.MF
+++ b/devassist-lib/META-INF/MANIFEST.MF
@@ -24,7 +24,13 @@ Require-Bundle: com.checkmarx.eclipse.common,
  org.eclipse.e4.core.services,
  org.eclipse.e4.ui.css.swt.theme,
  org.eclipse.jdt.ui
-Import-Package: org.eclipse.mylyn.commons.ui.dialogs,
+Import-Package: com.fasterxml.jackson.annotation,
+ com.fasterxml.jackson.core,
+ com.fasterxml.jackson.core.type,
+ com.fasterxml.jackson.databind,
+ org.eclipse.mylyn.commons.ui.dialogs,
  org.osgi.service.event;version="1.4.1"
 Export-Package: com.checkmarx.eclipse.devassist.backend,
- com.checkmarx.eclipse.devassist.backend.listener
+ com.checkmarx.eclipse.devassist.backend.listener,
+ com.checkmarx.eclipse.devassist.ignore,
+ com.checkmarx.eclipse.devassist.ui.findings.ignore
diff --git a/devassist-lib/icons/ignored_card/card-containers-critical.svg b/devassist-lib/icons/ignored_card/card-containers-critical.svg
new file mode 100644
index 00000000..a8e19cae
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-critical.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#DA0007" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-critical_dark.svg b/devassist-lib/icons/ignored_card/card-containers-critical_dark.svg
new file mode 100644
index 00000000..06d6848b
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-critical_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#E81C26" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-high.svg b/devassist-lib/icons/ignored_card/card-containers-high.svg
new file mode 100644
index 00000000..8aed7382
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-high.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF1D6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-high_dark.svg b/devassist-lib/icons/ignored_card/card-containers-high_dark.svg
new file mode 100644
index 00000000..b586724e
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-high_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF3B6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-low.svg b/devassist-lib/icons/ignored_card/card-containers-low.svg
new file mode 100644
index 00000000..9051c831
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-low.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFE646" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-low_dark.svg b/devassist-lib/icons/ignored_card/card-containers-low_dark.svg
new file mode 100644
index 00000000..96efafe1
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-low_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#D8C461" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-malicious.svg b/devassist-lib/icons/ignored_card/card-containers-malicious.svg
new file mode 100644
index 00000000..6dd33af0
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-malicious.svg
@@ -0,0 +1,12 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2393_19237)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#606572"/>
+<defs>
+<linearGradient id="paint0_linear_2393_19237" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-malicious_dark.svg b/devassist-lib/icons/ignored_card/card-containers-malicious_dark.svg
new file mode 100644
index 00000000..dd4a0b2a
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-malicious_dark.svg
@@ -0,0 +1,12 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2229_18882)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#C7CAD0"/>
+<defs>
+<linearGradient id="paint0_linear_2229_18882" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-medium.svg b/devassist-lib/icons/ignored_card/card-containers-medium.svg
new file mode 100644
index 00000000..e4e5c61b
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-medium.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFA100" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-containers-medium_dark.svg b/devassist-lib/icons/ignored_card/card-containers-medium_dark.svg
new file mode 100644
index 00000000..84a3ecfb
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-containers-medium_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF7B00" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3327 18.6665C14.4122 18.6665 13.666 19.4127 13.666 20.3332V26.9998C13.666 27.9203 14.4122 28.6665 15.3327 28.6665H28.666C29.5865 28.6665 30.3327 27.9203 30.3327 26.9998V20.3332C30.3327 19.4127 29.5865 18.6665 28.666 18.6665H27.3011L22.8327 14.9429V14.4998C22.8327 14.0396 22.4596 13.6665 21.9993 13.6665C21.5391 13.6665 21.166 14.0396 21.166 14.4998V14.9429L16.6976 18.6665H15.3327ZM19.3011 18.6665L21.9993 16.4179L24.6976 18.6665H19.3011ZM25.7493 21.1665C26.2096 21.1665 26.5827 21.5396 26.5827 21.9998V25.3332C26.5827 25.7934 26.2096 26.1665 25.7493 26.1665C25.2891 26.1665 24.916 25.7934 24.916 25.3332V21.9998C24.916 21.5396 25.2891 21.1665 25.7493 21.1665ZM22.8327 21.9998C22.8327 21.5396 22.4596 21.1665 21.9993 21.1665C21.5391 21.1665 21.166 21.5396 21.166 21.9998V25.3332C21.166 25.7934 21.5391 26.1665 21.9993 26.1665C22.4596 26.1665 22.8327 25.7934 22.8327 25.3332V21.9998ZM18.2493 21.1665C18.7096 21.1665 19.0827 21.5396 19.0827 21.9998V25.3332C19.0827 25.7934 18.7096 26.1665 18.2493 26.1665C17.7891 26.1665 17.416 25.7934 17.416 25.3332V21.9998C17.416 21.5396 17.7891 21.1665 18.2493 21.1665Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-critical.svg b/devassist-lib/icons/ignored_card/card-package-critical.svg
new file mode 100644
index 00000000..7b80b169
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-critical.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#DA0007" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-critical_dark.svg b/devassist-lib/icons/ignored_card/card-package-critical_dark.svg
new file mode 100644
index 00000000..4f622d39
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-critical_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#E81C26" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-high.svg b/devassist-lib/icons/ignored_card/card-package-high.svg
new file mode 100644
index 00000000..dcb0319d
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-high.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF1D6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-high_dark.svg b/devassist-lib/icons/ignored_card/card-package-high_dark.svg
new file mode 100644
index 00000000..c09f9ed5
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-high_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF3B6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-low.svg b/devassist-lib/icons/ignored_card/card-package-low.svg
new file mode 100644
index 00000000..8615dd0b
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-low.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFE646" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-low_dark.svg b/devassist-lib/icons/ignored_card/card-package-low_dark.svg
new file mode 100644
index 00000000..f6bc934c
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-low_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#D8C461" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-malicious.svg b/devassist-lib/icons/ignored_card/card-package-malicious.svg
new file mode 100644
index 00000000..38856995
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-malicious.svg
@@ -0,0 +1,12 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2393_19225)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#606572"/>
+<defs>
+<linearGradient id="paint0_linear_2393_19225" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-malicious_dark.svg b/devassist-lib/icons/ignored_card/card-package-malicious_dark.svg
new file mode 100644
index 00000000..4bdb763b
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-malicious_dark.svg
@@ -0,0 +1,12 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2229_18866)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#C7CAD0"/>
+<defs>
+<linearGradient id="paint0_linear_2229_18866" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-medium.svg b/devassist-lib/icons/ignored_card/card-package-medium.svg
new file mode 100644
index 00000000..4c2ee230
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-medium.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFA100" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#606572"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-package-medium_dark.svg b/devassist-lib/icons/ignored_card/card-package-medium_dark.svg
new file mode 100644
index 00000000..1ae43a36
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-package-medium_dark.svg
@@ -0,0 +1,5 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF7B00" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6663 14.2122C22.6349 13.6168 21.3643 13.6168 20.3329 14.2122L16.0885 16.6627C15.7224 16.8741 15.4061 17.1492 15.1505 17.4693L16.6815 18.2747L21.9996 21.1111L27.3178 18.2748L28.8487 17.4693C28.5931 17.1492 28.2768 16.8741 27.9107 16.6627L23.6663 14.2122ZM29.2838 18.1817L27.8031 18.9604L22.4163 21.8333L22.4165 28.5147L22.4163 30.2082C22.8499 30.1536 23.2753 30.0134 23.6663 29.7877L27.9107 27.3372C28.942 26.7418 29.5773 25.6413 29.5773 24.4505V19.5495C29.5773 19.0699 29.4743 18.6049 29.2838 18.1817ZM21.5829 30.2082L21.5831 28.5148L21.5829 21.8333L16.1961 18.9602L14.7154 18.1817C14.5249 18.6049 14.4219 19.0699 14.4219 19.5495V24.4505C14.4219 25.6413 15.0572 26.7418 16.0885 27.3372L20.3329 29.7877C20.7239 30.0134 21.1493 30.1536 21.5829 30.2082Z" fill="#C7CAD0"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-critical.svg b/devassist-lib/icons/ignored_card/card-secret-critical.svg
new file mode 100644
index 00000000..600777a2
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-critical.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#DA0007" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#606572"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-critical_dark.svg b/devassist-lib/icons/ignored_card/card-secret-critical_dark.svg
new file mode 100644
index 00000000..eceb3949
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-critical_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#E81C26" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#C7CAD0"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-high.svg b/devassist-lib/icons/ignored_card/card-secret-high.svg
new file mode 100644
index 00000000..d8b99816
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-high.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF1D6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#606572"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-high_dark.svg b/devassist-lib/icons/ignored_card/card-secret-high_dark.svg
new file mode 100644
index 00000000..2cd599a1
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-high_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF3B6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#C7CAD0"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-low.svg b/devassist-lib/icons/ignored_card/card-secret-low.svg
new file mode 100644
index 00000000..68753134
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-low.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFE646" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#606572"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-low_dark.svg b/devassist-lib/icons/ignored_card/card-secret-low_dark.svg
new file mode 100644
index 00000000..1ade2bba
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-low_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#D8C461" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#C7CAD0"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-malicious.svg b/devassist-lib/icons/ignored_card/card-secret-malicious.svg
new file mode 100644
index 00000000..a3e0ad6f
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-malicious.svg
@@ -0,0 +1,13 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2393_19233)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#606572"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_2393_19233" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-malicious_dark.svg b/devassist-lib/icons/ignored_card/card-secret-malicious_dark.svg
new file mode 100644
index 00000000..247688bf
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-malicious_dark.svg
@@ -0,0 +1,13 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2229_18878)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#C7CAD0"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="black"/>
+<defs>
+<linearGradient id="paint0_linear_2229_18878" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-medium.svg b/devassist-lib/icons/ignored_card/card-secret-medium.svg
new file mode 100644
index 00000000..295ef9a1
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-medium.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFA100" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#606572"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-secret-medium_dark.svg b/devassist-lib/icons/ignored_card/card-secret-medium_dark.svg
new file mode 100644
index 00000000..f1b7d6a1
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-secret-medium_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF7B00" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3434 30.2616C26.2989 28.6881 29.0686 27.5863 29.2057 16.8291C29.2116 16.3606 28.8306 15.9787 28.3633 15.944C26.3183 15.7922 24.3038 15.0905 22.5413 13.8388C22.2177 13.6091 21.781 13.6091 21.4574 13.8388C19.6949 15.0905 17.6804 15.7922 15.6354 15.944C15.1681 15.9787 14.7871 16.3606 14.793 16.8291C14.9301 27.5863 17.6998 28.6881 21.6553 30.2616L21.6835 30.2728C21.8859 30.3533 22.1128 30.3533 22.3152 30.2728L22.3434 30.2616Z" fill="#C7CAD0"/>
+<path d="M21.9994 18.6665C23.0349 18.6665 23.8744 19.506 23.8744 20.5415C23.8744 21.2772 23.4495 21.9117 22.8327 22.2188V24.4998C22.8327 24.9601 22.4596 25.3332 21.9994 25.3332C21.5391 25.3332 21.166 24.9601 21.166 24.4998V22.2188C20.5493 21.9117 20.1244 21.2772 20.1244 20.5415C20.1244 19.506 20.9638 18.6665 21.9994 18.6665Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-critical.svg b/devassist-lib/icons/ignored_card/card-vulnerability-critical.svg
new file mode 100644
index 00000000..c6d8da79
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-critical.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#DA0007" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#606572"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-critical_dark.svg b/devassist-lib/icons/ignored_card/card-vulnerability-critical_dark.svg
new file mode 100644
index 00000000..557ee013
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-critical_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#E81C26" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#C7CAD0"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-high.svg b/devassist-lib/icons/ignored_card/card-vulnerability-high.svg
new file mode 100644
index 00000000..02fe3b64
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-high.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF1D6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#606572"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-high_dark.svg b/devassist-lib/icons/ignored_card/card-vulnerability-high_dark.svg
new file mode 100644
index 00000000..8c82a8bc
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-high_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF3B6C" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#C7CAD0"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-low.svg b/devassist-lib/icons/ignored_card/card-vulnerability-low.svg
new file mode 100644
index 00000000..dbf34b5e
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-low.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFE646" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#606572"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-low_dark.svg b/devassist-lib/icons/ignored_card/card-vulnerability-low_dark.svg
new file mode 100644
index 00000000..08f2243a
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-low_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#D8C461" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#C7CAD0"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-malicious.svg b/devassist-lib/icons/ignored_card/card-vulnerability-malicious.svg
new file mode 100644
index 00000000..f22a83c1
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-malicious.svg
@@ -0,0 +1,13 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2393_19229)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#606572"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_2393_19229" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-malicious_dark.svg b/devassist-lib/icons/ignored_card/card-vulnerability-malicious_dark.svg
new file mode 100644
index 00000000..3f1c080d
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-malicious_dark.svg
@@ -0,0 +1,13 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="url(#paint0_linear_2229_18874)" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#C7CAD0"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="black"/>
+<defs>
+<linearGradient id="paint0_linear_2229_18874" x1="0" y1="0" x2="44" y2="44" gradientUnits="userSpaceOnUse">
+<stop offset="0.3125" stop-color="#E81C26"/>
+<stop offset="0.509615" stop-color="#FFC093"/>
+<stop offset="0.701923" stop-color="#E81C26"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-medium.svg b/devassist-lib/icons/ignored_card/card-vulnerability-medium.svg
new file mode 100644
index 00000000..e6c7461b
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-medium.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#EBECF0"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FFA100" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#606572"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="white"/>
+</svg>
diff --git a/devassist-lib/icons/ignored_card/card-vulnerability-medium_dark.svg b/devassist-lib/icons/ignored_card/card-vulnerability-medium_dark.svg
new file mode 100644
index 00000000..87822132
--- /dev/null
+++ b/devassist-lib/icons/ignored_card/card-vulnerability-medium_dark.svg
@@ -0,0 +1,6 @@
+<svg width="44" height="44" viewBox="0 0 44 44" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="42" height="42" rx="9" fill="#1C1D1F"/>
+<rect x="1" y="1" width="42" height="42" rx="9" stroke="#FF7B00" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.0781 17.0053C28.9435 27.571 26.2231 28.6532 22.3379 30.1987L22.3103 30.2097C22.1115 30.2888 21.8886 30.2888 21.6898 30.2097L21.6621 30.1987C17.777 28.6532 15.0566 27.571 14.9219 17.0053C14.9161 16.5451 15.2903 16.1699 15.7493 16.1359C17.7579 15.9868 19.7366 15.2976 21.4678 14.0682C21.7855 13.8425 22.2146 13.8425 22.5323 14.0682C24.2635 15.2976 26.2422 15.9868 28.2508 16.1359C28.7098 16.1699 29.084 16.5451 29.0781 17.0053ZM22.0001 23.0374L23.7774 24.8147C24.0638 25.1012 24.5283 25.1012 24.8147 24.8147C25.1012 24.5283 25.1012 24.0639 24.8147 23.7774L23.0374 22L24.8147 20.2227C25.1012 19.9363 25.1012 19.4718 24.8147 19.1854C24.5283 18.8989 24.0638 18.8989 23.7774 19.1854L22.0001 20.9627L20.2227 19.1854C19.9362 18.8989 19.4718 18.8989 19.1854 19.1854C18.8989 19.4718 18.8989 19.9363 19.1854 20.2227L20.9628 22L19.1854 23.7774C18.8989 24.0639 18.8989 24.5283 19.1854 24.8147C19.4718 25.1012 19.9362 25.1012 20.2227 24.8148L22.0001 23.0374Z" fill="#C7CAD0"/>
+<path d="M24.8147 24.8147C24.5283 25.1012 24.0638 25.1012 23.7774 24.8147L22.0001 23.0374L20.2227 24.8148C19.9362 25.1012 19.4718 25.1012 19.1854 24.8147C18.8989 24.5283 18.8989 24.0639 19.1854 23.7774L20.9628 22L19.1854 20.2227C18.8989 19.9363 18.8989 19.4718 19.1854 19.1854C19.4718 18.8989 19.9362 18.8989 20.2227 19.1854L22.0001 20.9627L23.7774 19.1854C24.0638 18.8989 24.5283 18.8989 24.8147 19.1854C25.1012 19.4718 25.1012 19.9363 24.8147 20.2227L23.0374 22L24.8147 23.7774C25.1012 24.0639 25.1012 24.5283 24.8147 24.8147Z" fill="black"/>
+</svg>
diff --git a/devassist-lib/plugin.xml b/devassist-lib/plugin.xml
index 08378142..c7c4111a 100644
--- a/devassist-lib/plugin.xml
+++ b/devassist-lib/plugin.xml
@@ -17,8 +17,16 @@
             class="com.checkmarx.eclipse.devassist.ui.findings.CxFindingsView"
             restorable="true">
       </view>
+       <view
+            id="com.checkmarx.eclipse.devassist.ui.findings.ignore.DevAssistIgnoredFindings"
+            name="Ignored Findings"
+            icon="icons/checkmarx-plugin-13_dark.png"
+            category="com.checkmarx.eclipse.devassist.category"
+            class="com.checkmarx.eclipse.devassist.ui.findings.ignore.DevAssistIgnoredFindings"
+            restorable="true">
+      </view>
    </extension>
-   
+
    <!-- Line Hover (Java editor): org.eclipse.ui.editors.textHovers does NOT
         exist as a real Eclipse Platform extension point - text hovers are
         wired programmatically per-editor via SourceViewerConfiguration and
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/ScannerMarkerPurger.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/ScannerMarkerPurger.java
index fa158b39..17950c74 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/ScannerMarkerPurger.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/ScannerMarkerPurger.java
@@ -87,7 +87,20 @@ private static void purgeCacheAndDecorations(String scannerName) {
 					if (file != null) {
 						List<com.checkmarx.eclipse.devassist.model.ScanIssue> remaining =
 							problemHolder.getScanIssuesByFile(filePath);
-						ProblemDecorator.decorateEditor(file, remaining);
+						// Filter to only exclude ignored issues - include OK/UNKNOWN gutter icons
+						com.checkmarx.eclipse.devassist.ignore.IgnoreManager ignoreManager =
+							com.checkmarx.eclipse.devassist.ignore.IgnoreManager.getInstance(project);
+						java.util.List<com.checkmarx.eclipse.devassist.model.ScanIssue> activeIssues =
+							new java.util.ArrayList<>();
+						for (com.checkmarx.eclipse.devassist.model.ScanIssue issue : remaining) {
+							if (issue == null) {
+								continue;
+							}
+							if (!ignoreManager.isIgnored(issue)) {
+								activeIssues.add(issue);
+							}
+						}
+						ProblemDecorator.decorateEditor(file, activeIssues);
 					}
 				}
 			} catch (Exception e) {
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/CheckmarxEditorListener.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/CheckmarxEditorListener.java
index 20260927..81a2ce87 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/CheckmarxEditorListener.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/CheckmarxEditorListener.java
@@ -47,8 +47,58 @@ public class CheckmarxEditorListener implements IPartListener2 {
 	 */
 	private final Map<Integer, RealTimeScanJob> activeScanJobs = new HashMap<>();
 
+	// Strong reference to the single instance registered by PluginStartup at
+	// earlyStartup(). Lets other devassist-lib code (e.g. CxFindingsView's
+	// "navigate to finding" flow, which opens/activates an editor directly
+	// without going through the workbench's IPartListener2 events) reuse this
+	// listener's per-document dedup bookkeeping instead of registering a second,
+	// independent CheckmarxDocumentListener/RealTimeScanJob pair on the same
+	// document - duplicate pairs each independently debounce and reschedule
+	// scans for the same file, colliding on the shared per-file in-flight lock
+	// in DevAssistScanStateHolder and causing scans to appear to trigger late
+	// (an edit's scan gets silently BLOCKED by an unrelated duplicate job that
+	// is still in-flight, with nothing rescheduling it afterwards).
+	private static volatile CheckmarxEditorListener instance;
+
 	public CheckmarxEditorListener() {
+		instance = this;
+	}
 
+	/**
+	 * @return the single CheckmarxEditorListener registered at plugin startup,
+	 *         or null if it has not been created yet.
+	 */
+	public static CheckmarxEditorListener getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Ensure real-time scanning is set up for the given editor, reusing an
+	 * existing document listener/scan job if one is already registered for its
+	 * document instead of creating a duplicate.
+	 *
+	 * This is the same dedup logic as {@link #partActivated}, exposed for
+	 * callers that open/activate an editor programmatically (bypassing
+	 * IPartListener2 events), such as CxFindingsView's navigate-to-finding flow.
+	 *
+	 * @param editor the editor part to ensure scanning is set up for
+	 */
+	public void ensureRealtimeScanningForEditor(IEditorPart editor) {
+		if (editor == null) {
+			return;
+		}
+		IDocument document = getDocumentFromEditor(editor);
+		if (document != null) {
+			int documentId = document.hashCode();
+			if (activeListeners.containsKey(documentId)) {
+				RealTimeScanJob scanJob = activeScanJobs.get(documentId);
+				if (scanJob != null) {
+					scanJob.reschedule(0);
+				}
+				return;
+			}
+		}
+		setupRealtimeScanning(editor);
 	}
 
 	/**
@@ -85,22 +135,7 @@ public void partActivated(IWorkbenchPartReference partRef) {
 		try {
 			Object part = partRef.getPart(false);
 			if (part instanceof IEditorPart) {
-				IEditorPart editor = (IEditorPart) part;
-				IDocument document = getDocumentFromEditor(editor);
-				if (document != null) {
-					int documentId = document.hashCode();
-					// If already set up, trigger a rescan when user switches to tab
-					if (activeListeners.containsKey(documentId)) {
-						RealTimeScanJob scanJob = activeScanJobs.get(documentId);
-						if (scanJob != null) {
-
-							scanJob.reschedule(0);
-						}
-						return;
-					}
-				}
-				// Not yet set up - do initial setup
-				setupRealtimeScanning(editor);
+				ensureRealtimeScanningForEditor((IEditorPart) part);
 			}
 		} catch (Exception e) {
 			System.err.println("[REALTIME] Error in partActivated: " + e.getMessage());
@@ -384,9 +419,22 @@ private void applyCachedDecorationsForFile(org.eclipse.core.resources.IFile file
 				return;
 			}
 
-			// Apply decorations for cached findings
+			// Filter to only exclude ignored issues - include OK/UNKNOWN gutter icons
+			com.checkmarx.eclipse.devassist.ignore.IgnoreManager ignoreManager =
+				com.checkmarx.eclipse.devassist.ignore.IgnoreManager.getInstance(project);
+			java.util.List<com.checkmarx.eclipse.devassist.model.ScanIssue> activeIssues =
+				new java.util.ArrayList<>();
+			for (com.checkmarx.eclipse.devassist.model.ScanIssue issue : cachedIssues) {
+				if (issue == null) {
+					continue;
+				}
+				if (!ignoreManager.isIgnored(issue)) {
+					activeIssues.add(issue);
+				}
+			}
 
-			ProblemDecorator.decorateEditor(file, cachedIssues);
+			// Apply decorations for non-ignored findings
+			ProblemDecorator.decorateEditor(file, activeIssues);
 
 		} catch (Exception e) {
 			System.err.println("[REALTIME] Error applying cached decorations: " + e.getMessage());
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/RealTimeScanJob.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/RealTimeScanJob.java
index 17f09d6a..e46915f3 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/RealTimeScanJob.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/backend/listener/RealTimeScanJob.java
@@ -120,6 +120,8 @@ protected IStatus run(IProgressMonitor monitor) {
 						"com.checkmarx.eclipse.plugin", "scanner-registry");
 				org.eclipse.core.runtime.QualifiedName stateHolderKey = new org.eclipse.core.runtime.QualifiedName(
 						"com.checkmarx.eclipse.plugin", "state-holder");
+				org.eclipse.core.runtime.QualifiedName problemHolderKey = new org.eclipse.core.runtime.QualifiedName(
+						"com.checkmarx.eclipse.plugin", "problem-holder");
 
 				// Get or lazily initialize backend services
 				com.checkmarx.eclipse.devassist.backend.ScannerRegistry registry = (com.checkmarx.eclipse.devassist.backend.ScannerRegistry) project
@@ -128,6 +130,9 @@ protected IStatus run(IProgressMonitor monitor) {
 				com.checkmarx.eclipse.devassist.backend.DevAssistScanStateHolder stateHolder = (com.checkmarx.eclipse.devassist.backend.DevAssistScanStateHolder) project
 						.getSessionProperty(stateHolderKey);
 
+				com.checkmarx.eclipse.devassist.problems.ProblemHolderService problemHolder = (com.checkmarx.eclipse.devassist.problems.ProblemHolderService) project
+						.getSessionProperty(problemHolderKey);
+
 				// Lazy initialization if not found
 				if (registry == null) {
 
@@ -143,6 +148,21 @@ protected IStatus run(IProgressMonitor monitor) {
 
 				}
 
+				if (problemHolder == null) {
+
+					problemHolder = new com.checkmarx.eclipse.devassist.problems.ProblemHolderService();
+					project.setSessionProperty(problemHolderKey, problemHolder);
+
+				}
+
+				// Force the ignore file/temp list to reconcile with disk before scanning,
+				// rather than relying solely on the workspace resource-change watcher
+				// having already fired for the latest .checkmarxIgnored edit. Without
+				// this, a manual/external edit to .checkmarxIgnored that the watcher
+				// missed (or hasn't processed yet) would leave the CLI-facing
+				// .checkmarxIgnoredTempList.json stale for this scan cycle.
+				com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager.getInstance(project).refreshFromDisk();
+
 				// Execute backend scanners
 				com.checkmarx.eclipse.devassist.common.ScanManager scanManager = new com.checkmarx.eclipse.devassist.common.ScanManager(
 						registry, stateHolder);
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/configuration/McpInstallService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/configuration/McpInstallService.java
index c0def2c4..a1537700 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/configuration/McpInstallService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/configuration/McpInstallService.java
@@ -42,17 +42,20 @@ private static void registerAuthenticationHandlers() {
 
 			// Register listener for workspace scan trigger on authentication state change
 			// (when user logs in, preferences may not change, but we still need to scan)
-			Preferences.STORE.addPropertyChangeListener(new com.checkmarx.eclipse.devassist.backend.AuthenticationStateListener());
-
+			Preferences.STORE.addPropertyChangeListener(
+					new com.checkmarx.eclipse.devassist.backend.AuthenticationStateListener());
+			
 			// Register handler for post-authentication UI (welcome dialog, workspace scan)
 			Preferences.setAuthenticationSuccessHandler(new AuthenticationSuccessHandler());
 
-			// Register handler so common-lib preference pages (e.g. CheckmarxPreferencePage)
+			// Register handler so common-lib preference pages (e.g.
+			// CheckmarxPreferencePage)
 			// can trigger MCP install without depending on this bundle directly.
 			Preferences.setMcpInstallHandler(McpInstallService::installFromUi);
 
 			// Register handler so common-lib preference pages (e.g. PreferencesPage)
-			// can trigger MCP uninstall on logout without depending on this bundle directly.
+			// can trigger MCP uninstall on logout without depending on this bundle
+			// directly.
 			Preferences.setMcpUninstallHandler(McpInstallService::uninstallFromUi);
 
 			authListenerRegistered = true;
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreEntry.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreEntry.java
new file mode 100644
index 00000000..a5605e91
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreEntry.java
@@ -0,0 +1,252 @@
+package com.checkmarx.eclipse.devassist.ignore;
+
+import com.checkmarx.eclipse.devassist.utils.ScanEngine;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public final class IgnoreEntry {
+    public List<FileReference> files = new ArrayList<>();
+    public ScanEngine type; // or enum
+    public String similarityId;
+    public String packageManager;
+    public String packageName;
+    public String packageVersion;
+    public Integer ruleId;
+    public String imageName;
+    public String imageTag;
+    public String severity;
+    public String description;
+    public String dateAdded;
+    public String title;
+    public String secretValue;
+
+    public IgnoreEntry() {
+    }
+
+    
+    
+    public List<FileReference> getFiles() {
+		return files;
+	}
+
+
+
+	public void setFiles(List<FileReference> files) {
+		this.files = files;
+	}
+
+
+
+	public ScanEngine getType() {
+		return type;
+	}
+
+
+
+	public void setType(ScanEngine type) {
+		this.type = type;
+	}
+
+
+
+	public String getSimilarityId() {
+		return similarityId;
+	}
+
+
+
+	public void setSimilarityId(String similarityId) {
+		this.similarityId = similarityId;
+	}
+
+
+
+	public String getPackageManager() {
+		return packageManager;
+	}
+
+
+
+	public void setPackageManager(String packageManager) {
+		this.packageManager = packageManager;
+	}
+
+
+
+	public String getPackageName() {
+		return packageName;
+	}
+
+
+
+	public void setPackageName(String packageName) {
+		this.packageName = packageName;
+	}
+
+
+
+	public String getPackageVersion() {
+		return packageVersion;
+	}
+
+
+
+	public void setPackageVersion(String packageVersion) {
+		this.packageVersion = packageVersion;
+	}
+
+
+
+	public Integer getRuleId() {
+		return ruleId;
+	}
+
+
+
+	public void setRuleId(Integer ruleId) {
+		this.ruleId = ruleId;
+	}
+
+
+
+	public String getImageName() {
+		return imageName;
+	}
+
+
+
+	public void setImageName(String imageName) {
+		this.imageName = imageName;
+	}
+
+
+
+	public String getImageTag() {
+		return imageTag;
+	}
+
+
+
+	public void setImageTag(String imageTag) {
+		this.imageTag = imageTag;
+	}
+
+
+
+	public String getSeverity() {
+		return severity;
+	}
+
+
+
+	public void setSeverity(String severity) {
+		this.severity = severity;
+	}
+
+
+
+	public String getDescription() {
+		return description;
+	}
+
+
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+
+
+	public String getDateAdded() {
+		return dateAdded;
+	}
+
+
+
+	public void setDateAdded(String dateAdded) {
+		this.dateAdded = dateAdded;
+	}
+
+
+
+	public String getTitle() {
+		return title;
+	}
+
+
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+
+
+	public String getSecretValue() {
+		return secretValue;
+	}
+
+
+
+	public void setSecretValue(String secretValue) {
+		this.secretValue = secretValue;
+	}
+
+
+
+	public static final class FileReference {
+        public String path;
+        public boolean active;
+        public Integer line;
+        public String problematicLine;
+
+        public FileReference() {
+        }
+
+        public FileReference(String relativePath, boolean b, int line, String problematicLine) {
+            this.path = relativePath;
+            this.active = b;
+            this.line = line;
+            if (problematicLine != null && !problematicLine.isEmpty()) {
+                this.problematicLine = problematicLine;
+            }
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public boolean isActive() {
+            return active;
+        }
+
+        public void setActive(boolean active) {
+            this.active = active;
+        }
+
+        public Integer getLine() {
+            return line;
+        }
+
+        public void setLine(Integer line) {
+            this.line = line;
+        }
+
+        public String getProblematicLine() {
+            return problematicLine;
+        }
+
+        public void setProblematicLine(String problematicLine) {
+            this.problematicLine = problematicLine;
+        }
+    }
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreFileManager.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreFileManager.java
new file mode 100644
index 00000000..2c7f1feb
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreFileManager.java
@@ -0,0 +1,655 @@
+package com.checkmarx.eclipse.devassist.ignore;
+
+import com.checkmarx.eclipse.common.utils.CxLogger;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.swt.widgets.Display;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Manages the ignore file (.checkmarxIgnored) within the project's workspace.
+ * Handles reading, writing, and updating ignore entries.
+ * Provides methods to ignore issues and update temporary ignore lists.
+ */
+public final class IgnoreFileManager {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static boolean skipFileWatcherForTests = false;
+    private static final Map<IProject, IgnoreFileManager> INSTANCES = new HashMap<>();
+
+    private final IProject project;
+    private String workspacePath = "";
+    private String workspaceRootPath = "";
+    private Map<String, IgnoreEntry> ignoreData = new HashMap<>();
+    private final Map<String, String> scannedFileMap = new HashMap<>();
+    private Map<String, IgnoreEntry> previousIgnoreData = new HashMap<>();
+    private final List<IgnoreListener> listeners = Collections.synchronizedList(new ArrayList<>());
+
+    public interface IgnoreListener {
+        void onIgnoreUpdated();
+    }
+
+    public static synchronized IgnoreFileManager getInstance(IProject project) {
+        if (!INSTANCES.containsKey(project)) {
+            INSTANCES.put(project, new IgnoreFileManager(project));
+        }
+        return INSTANCES.get(project);
+    }
+
+    public IgnoreFileManager(IProject project) {
+        this.project = project;
+        String basePath = project.getLocation().toOSString();
+        if (basePath != null && !basePath.isEmpty()) {
+            this.workspaceRootPath = basePath;
+            this.workspacePath = Paths.get(basePath, ".checkmarx").toString();
+            ensureIgnoreFileExists();
+            loadIgnoreData();
+            this.previousIgnoreData = copyIgnoreData(ignoreData);
+        }
+        if (!skipFileWatcherForTests) {
+            startFileWatcher();
+        }
+    }
+
+    private void startFileWatcher() {
+        org.eclipse.core.resources.IFile ignoreIFile = ResourcesPlugin.getWorkspace().getRoot()
+                .getFileForLocation(new org.eclipse.core.runtime.Path(getIgnoreFilePath().toString()));
+        if (ignoreIFile == null) {
+            return;
+        }
+        ResourcesPlugin.getWorkspace().addResourceChangeListener((IResourceChangeListener) event -> {
+            IResourceDelta delta = event.getDelta();
+            if (delta == null) {
+                return;
+            }
+            IResourceDelta ignoreDelta = delta.findMember(ignoreIFile.getFullPath());
+            if (ignoreDelta != null && (ignoreDelta.getFlags() & IResourceDelta.CONTENT) != 0) {
+                // Marshal onto the UI thread: ignoreData is a plain HashMap and every
+                // existing reader/writer (isIgnored, addIgnoredEntry, reviveEntry) already
+                // only ever runs on the SWT UI thread; this keeps that invariant intact
+                // instead of introducing a background-thread race on the map.
+                Display display = Display.getDefault();
+                if (display != null && !display.isDisposed()) {
+                    display.asyncExec(this::handleFileChange);
+                }
+            }
+        }, IResourceChangeEvent.POST_CHANGE);
+    }
+
+    public void updateIgnoreData(String vulnerabilityKey, IgnoreEntry newData) {
+        if (newData == null) return;
+        ignoreData.put(vulnerabilityKey, newData);
+        saveIgnoreFile();
+        updateIgnoreTempList();
+    }
+
+    /**
+     * Ensures the ignored file exists;
+     * Creates it if missing.
+     * Logs a warning if creation fails.
+     */
+
+    private void ensureIgnoreFileExists() {
+        try {
+            Path dir = Paths.get(workspacePath);
+            if (!Files.exists(dir)) {
+                Files.createDirectories(dir);
+            }
+            Path ignoreFile = getIgnoreFilePath();
+            if (!Files.exists(ignoreFile)) {
+                Files.write(ignoreFile, "{}\n".getBytes(StandardCharsets.UTF_8));
+            }
+        } catch (IOException e) {
+            CxLogger.error("Failed to ensure ignore file exists", e);
+        }
+    }
+
+    public void loadIgnoreData() {
+        loadIgnoreDataInternal();
+    }
+
+    /**
+     * Loads ignore data from disk into {@link #ignoreData}.
+     *
+     * @return true if the file was read and parsed successfully (or genuinely
+     *         doesn't exist yet, which is a legitimate empty state), false if a
+     *         read/parse error occurred. On false, {@link #ignoreData} is left
+     *         untouched - a transient read error (e.g. the file watcher observing
+     *         our own write mid-flight) must never be treated as "the file is now
+     *         empty", or every previously-ignored entry appears to vanish from
+     *         the Ignored Findings window and reappears as an active finding in
+     *         the editor until the next successful reload.
+     */
+    private boolean loadIgnoreDataInternal() {
+        Path ignoreFile = getIgnoreFilePath();
+        if (!Files.exists(ignoreFile)) {
+            CxLogger.info(String.format("RTS-Ignore: Ignore file doesn't exist: %s", ignoreFile));
+            ignoreData = new HashMap<>();
+            return true;
+        }
+        try (InputStream inputStream = Files.newInputStream(ignoreFile)) {
+            ObjectMapper mapper = new ObjectMapper();
+            Map<String, IgnoreEntry> data = mapper.readValue(inputStream,
+                    new TypeReference<Map<String, IgnoreEntry>>() {
+                    });
+            ignoreData.clear();
+            ignoreData.putAll(data);
+            return true;
+        } catch (IOException e) {
+            CxLogger.warning("RTS-Ignore: Failed to read ignore file (keeping previous in-memory state): "
+                    + ignoreFile + " - " + e.getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * Returns all ignore entries.
+     *
+     * @return list of ignore entries.
+     */
+    public List<IgnoreEntry> getAllIgnoreEntries() {
+        return new ArrayList<>(ignoreData.values());
+    }
+
+    /**
+     * Returns the ignore data map for this project.
+     * This is an instance method to ensure project-level isolation.
+     *
+     * @return the ignore data map
+     */
+    public Map<String, IgnoreEntry> getIgnoreData() {
+        return ignoreData;
+    }
+
+    /**
+     * Checks if a ScanIssue is ignored based on similarity ID.
+     *
+     * @param similarityId The similarity ID of the issue
+     * @return true if the issue is ignored, false otherwise
+     */
+    public boolean isIgnored(String similarityId) {
+        if (similarityId == null || similarityId.isEmpty()) {
+            return false;
+        }
+        return ignoreData.containsKey(similarityId);
+    }
+
+    /**
+     * Saves the current ignore data to the ignore file.
+     * Writes the ignore data as formatted JSON to the file specified by {@link #getIgnoreFilePath()}.
+     * Creates a new file if it doesn't exist, or truncates the existing file.
+     * Notifies all subscribers about the update.
+     * Logs a warning if saving fails.
+     */
+    private void saveIgnoreFile() {
+        try {
+            String json = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(ignoreData);
+            writeAtomically(getIgnoreFilePath(), json);
+            notifyListeners();
+        } catch (IOException e) {
+            CxLogger.warning("RTS-Ignore: Exception occurred while adding ignore entry into file: " + e.getMessage());
+        }
+    }
+
+    /**
+     * Writes content to the target path atomically: write to a sibling temp
+     * file, then move it into place with ATOMIC_MOVE.
+     *
+     * Files.writeString(..., TRUNCATE_EXISTING) truncates the file to zero
+     * length before writing the new content, which is observable as two
+     * separate filesystem events (truncate, then write). Eclipse's resource
+     * watcher (native hooks or polling refresh) can fire on that intermediate,
+     * momentarily-empty state, causing a concurrent loadIgnoreData() call to
+     * throw MismatchedInputException on a file that was never actually
+     * corrupted on disk - just read mid-write. An atomic rename never exposes
+     * that intermediate state: a reader always sees either the complete old
+     * content or the complete new content.
+     */
+    private void writeAtomically(Path target, String content) throws IOException {
+        Path tempFile = target.resolveSibling(target.getFileName().toString() + "." + UUID.randomUUID() + ".tmp");
+        try {
+            Files.writeString(tempFile, content, StandardCharsets.UTF_8,
+                    StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+            try {
+                Files.move(tempFile, target, java.nio.file.StandardCopyOption.ATOMIC_MOVE,
+                        java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+            } catch (java.nio.file.AtomicMoveNotSupportedException e) {
+                // Some filesystems (e.g. certain network drives) don't support atomic
+                // moves across the temp/target pair - fall back to a plain replace.
+                Files.move(tempFile, target, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+            }
+        } finally {
+            Files.deleteIfExists(tempFile);
+        }
+    }
+
+    public void addListener(IgnoreListener listener) {
+        if (listener != null) {
+            listeners.add(listener);
+        }
+    }
+
+    public void removeListener(IgnoreListener listener) {
+        listeners.remove(listener);
+    }
+
+    private void notifyListeners() {
+        for (IgnoreListener listener : new ArrayList<>(listeners)) {
+            try {
+                listener.onIgnoreUpdated();
+            } catch (Exception e) {
+                CxLogger.warning("Error notifying ignore listener: " + e.getMessage());
+            }
+        }
+    }
+
+
+    /**
+     * Updates the temporary ignore list file based on active ignore entries.
+     * Creates a list of temporary items from active ignore entries, categorized by their type (OSS, Secrets, IAC, Containers, ASCA).
+     * For each entry type:
+     * - OSS: adds package manager, name and version
+     * - Secrets: adds package name and secret value
+     * - IAC: adds package name and similarity ID
+     * - Containers: adds image name and image tag
+     * - ASCA: adds file name, line number and rule ID for each active file
+     * The temporary list is then saved to a JSON file at the path specified by {@link #getTempListPath()}.
+     */
+    public void updateIgnoreTempList() {
+        List<TempItem> tempList = new ArrayList<>();
+        CxLogger.info(String.format("RTS-Ignore: [TEMP_LIST_UPDATE] Updating temp list with %d ignore entries", ignoreData.size()));
+
+        for (IgnoreEntry entry : ignoreData.values()) {
+            boolean hasActive = entry.files.stream().anyMatch(f -> f.active);
+            if (!hasActive) {
+                CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Skipping entry with no active files: " + entry.getPackageName());
+                continue;
+            }
+            switch (entry.type) {
+                case OSS:
+                    CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Adding OSS entry: " + entry.getPackageName());
+                    tempList.add(TempItem.forOss(entry.packageManager, entry.packageName, entry.packageVersion));
+                    break;
+                case SECRETS:
+                    CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Adding SECRETS entry: " + entry.getPackageName());
+                    tempList.add(TempItem.forSecret(entry.packageName, entry.secretValue));
+                    break;
+                case IAC:
+                    CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Adding IAC entry: " + entry.getPackageName());
+                    tempList.add(TempItem.forIac(entry.packageName, entry.similarityId));
+                    break;
+                case CONTAINERS:
+                    CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Adding CONTAINERS entry: " + entry.getImageName());
+                    tempList.add(TempItem.forContainer(entry.imageName, entry.imageTag));
+                    break;
+                case ASCA:
+                    for (IgnoreEntry.FileReference file : entry.files) {
+                        if (!file.active) continue;
+                        String originalPath = Paths.get(workspaceRootPath, file.path).toAbsolutePath().toString();
+                        String scannedTempPath = scannedFileMap.getOrDefault(originalPath, originalPath);
+                        CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Adding ASCA entry: " + entry.getPackageName() + " at line " + file.line);
+                        tempList.add(TempItem.forAsca(
+                                Paths.get(scannedTempPath).getFileName().toString(),
+                                file.line,
+                                entry.ruleId
+                        ));
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        try {
+            CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Writing " + tempList.size() + " items to temp list file");
+            String json = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(tempList);
+            writeAtomically(getTempListPath(), json);
+            CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE_SUCCESS] Temp list updated successfully with " + tempList.size() + " items");
+
+            // If tempList is empty, verify the file is actually empty
+            if (tempList.isEmpty()) {
+                CxLogger.info("RTS-Ignore: [TEMP_LIST_UPDATE] Temp list is empty - file should contain empty array []");
+            }
+        } catch (IOException e) {
+            CxLogger.error("RTS-Ignore: [TEMP_LIST_UPDATE_ERROR] Failed to update temp list: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Revives a previously ignored package by setting all its file references to inactive.
+     * This makes the vulnerability visible again in future scans.
+     *
+     * @param entryToRevive The unique key identifying the ignored package
+     * @return true if the package was found and revived, false otherwise
+     */
+    public boolean reviveEntry(IgnoreEntry entryToRevive) {
+        boolean success = reviveEntryInternal(entryToRevive);
+        if (success) {
+            saveIgnoreFile();
+            updateIgnoreTempList();
+        }
+        return success;
+    }
+
+    /**
+     * Internal method to revive an entry without saving to disk.
+     * Used by batch operations that need to revive multiple entries before saving once.
+     *
+     * @param entryToRevive The unique key identifying the ignored package
+     * @return true if the package was found and revived, false otherwise
+     */
+    private boolean reviveEntryInternal(IgnoreEntry entryToRevive) {
+        String entryKey = ignoreData.entrySet().stream()
+                .filter(e -> matchesEntry(e.getValue(), entryToRevive))
+                .map(Map.Entry::getKey)
+                .findFirst()
+                .orElse(null);
+        if (entryKey == null) {
+            CxLogger.warning("RTS-Ignore: Entry not found in ignoreData map");
+            return false;
+        }
+        IgnoreEntry actualEntry = ignoreData.get(entryKey);
+        String packageName = entryToRevive.getPackageName();
+        for (IgnoreEntry.FileReference file : actualEntry.getFiles()) {
+            file.active = false;
+        }
+        CxLogger.info("RTS-Ignore: Revived package: " + packageName);
+        return true;
+    }
+
+
+    public Path getIgnoreFilePath() {
+        return Paths.get(workspacePath, ".checkmarxIgnored");
+    }
+
+    /**
+     * Deletes the ignore file (.checkmarxIgnored) and the temporary ignore list file.
+     * Called when the user no longer has a valid license (platform-only license).
+     * This ensures that ignored findings are cleared when the feature is not available.
+     */
+    public void deleteIgnoreFiles() {
+        try {
+            Path ignoreFilePath = getIgnoreFilePath();
+            if (Files.exists(ignoreFilePath)) {
+                Files.delete(ignoreFilePath);
+                CxLogger.info("RTS-Ignore: Deleted ignore file at " + ignoreFilePath);
+            }
+
+            Path tempListPath = Paths.get(workspacePath, ".checkmarxIgnoredTempList.json");
+            if (Files.exists(tempListPath)) {
+                Files.delete(tempListPath);
+                CxLogger.info("RTS-Ignore: Deleted temp list file at " + tempListPath);
+            }
+
+            // Clear in-memory data
+            ignoreData.clear();
+            previousIgnoreData.clear();
+
+            // Notify listeners that ignore data has changed
+            notifyListeners();
+        } catch (IOException e) {
+            CxLogger.error("RTS-Ignore: Failed to delete ignore files", e);
+        }
+    }
+
+    /**
+     * Returns the path to the temporary ignore list.
+     * Creates the file if it doesn't exist.
+     *
+     * @return path to the temporary ignore list.
+     *
+     */
+    public Path getTempListPath() {
+        Path tempListPath = Paths.get(workspacePath, ".checkmarxIgnoredTempList.json");
+        if (Files.exists(tempListPath)) {
+            try {
+                // Validate it's a valid JSON array
+                if (Files.readString(tempListPath).trim().isEmpty()) {
+                    Files.writeString(tempListPath, "[]", StandardCharsets.UTF_8,
+                            StandardOpenOption.TRUNCATE_EXISTING);
+                }
+                return tempListPath;
+            } catch (IOException e) {
+                CxLogger.error("Failed to validate temp list: " + tempListPath, e);
+                createEmptyTempList(tempListPath);
+            }
+        } else {
+            createEmptyTempList(tempListPath);
+        }
+        return tempListPath;  // Guaranteed to exist and contain []
+    }
+
+    private void createEmptyTempList(Path tempListPath) {
+        try {
+            Files.createDirectories(tempListPath.getParent());
+            Files.writeString(tempListPath, "[]", StandardCharsets.UTF_8);
+            CxLogger.info(String.format("RTS-Ignore: Created empty temp list at %s", tempListPath));
+        } catch (IOException e) {
+            CxLogger.error("Failed to create empty temp list", e);
+        }
+    }
+
+    /**
+     * normalizes the given file path to be relative to the project's workspace root.
+     *
+     * @param filePath
+     * @return
+     */
+    public String normalizePath(String filePath) {
+        if (filePath == null || filePath.isEmpty()) {
+            return "";
+        }
+        try {
+            return Path.of(workspaceRootPath)
+                    .relativize(Paths.get(filePath))
+                    .toString()
+                    .replace("\\", "/");
+        } catch (Exception e) {
+            // Malformed/foreign path (e.g. a different filesystem root) - fall back to
+            // the raw path rather than throwing, so callers that iterate over many
+            // issues (e.g. "ignore all of this type") don't abort partway through.
+            return filePath.replace("\\", "/");
+        }
+    }
+
+    private void handleFileChange() {
+        CxLogger.info("RTS-Ignore: [FILE_WATCHER] File change detected in .checkmarxIgnored");
+        CxLogger.info("RTS-Ignore: [FILE_WATCHER] Current ignoreData size: " + ignoreData.size());
+        refreshFromDisk();
+        CxLogger.info("RTS-Ignore: [FILE_WATCHER] After refresh, ignoreData size: " + ignoreData.size());
+    }
+
+    /**
+     * Re-reads .checkmarxIgnored from disk and reconciles derived state
+     * (.checkmarxIgnoredTempList.json, listeners) against it.
+     *
+     * This is the same reconciliation the file watcher triggers on a detected
+     * change, exposed so callers that can't rely on Eclipse's resource-change
+     * notification firing reliably for every edit (e.g. a genuinely external
+     * edit made while native/polling refresh is disabled, or before a
+     * time-sensitive read like kicking off a scan) can force it explicitly.
+     *
+     * @return true if the file was read successfully (or doesn't exist),
+     *         false if a transient read/parse error occurred - in which case
+     *         in-memory state was left untouched and no reconciliation ran.
+     */
+    public boolean refreshFromDisk() {
+        Map<String, IgnoreEntry> beforeIgnoreData = copyIgnoreData(ignoreData);
+        if (!loadIgnoreDataInternal()) {
+            // Transient read failure (e.g. watcher observed a mid-write state) -
+            // ignoreData was left untouched, so there is nothing real to react to
+            // this cycle. Bail out without cascading a false "everything
+            // deactivated" into detectAndHandleActiveChanges()/updateIgnoreTempList().
+            return false;
+        }
+        detectAndHandleActiveChanges();
+        previousIgnoreData = copyIgnoreData(ignoreData);
+
+        // Only notify listeners if the ignore data actually changed
+        if (!ignoreDataEquals(beforeIgnoreData, ignoreData)) {
+            notifyListeners();
+        }
+        return true;
+    }
+
+    private boolean ignoreDataEquals(Map<String, IgnoreEntry> map1, Map<String, IgnoreEntry> map2) {
+        if (map1.size() != map2.size()) {
+            return false;
+        }
+        for (String key : map1.keySet()) {
+            if (!map2.containsKey(key)) {
+                return false;
+            }
+            // Compare JSON serialization for deep equality
+            try {
+                String json1 = MAPPER.writeValueAsString(map1.get(key));
+                String json2 = MAPPER.writeValueAsString(map2.get(key));
+                if (!json1.equals(json2)) {
+                    return false;
+                }
+            } catch (IOException e) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    private void detectAndHandleActiveChanges() {
+        CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Detecting active changes in ignore data");
+        List<ActiveFile> previousActiveFiles = getActiveFilesList(previousIgnoreData);
+        List<ActiveFile> currentActiveFiles = getActiveFilesList(ignoreData);
+
+        CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Previous active files: " + previousActiveFiles.size());
+        CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Current active files: " + currentActiveFiles.size());
+
+        List<ActiveFile> deactivatedFiles = previousActiveFiles.stream()
+                .filter(prev -> currentActiveFiles.stream()
+                        .noneMatch(cur -> cur.packageKey.equals(prev.packageKey) && cur.path.equals(prev.path)))
+                .collect(Collectors.toList());
+
+        if (!deactivatedFiles.isEmpty()) {
+            CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Found " + deactivatedFiles.size() + " deactivated files");
+            for (ActiveFile f : deactivatedFiles) {
+                CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Removing deactivated entry: " + f.packageKey + " at " + f.path);
+                removeIgnoredEntryWithoutTempUpdate(f.packageKey, f.path);
+            }
+            updateIgnoreTempList();
+        }
+
+        // Remove entries where all files are inactive
+        List<String> keysToRemove = new ArrayList<>();
+        for (Map.Entry<String, IgnoreEntry> entry : ignoreData.entrySet()) {
+            boolean hasActive = entry.getValue().files.stream().anyMatch(f -> f.active);
+            if (!hasActive) {
+                CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Entry has no active files, marking for removal: " + entry.getKey());
+                keysToRemove.add(entry.getKey());
+            }
+        }
+        if (!keysToRemove.isEmpty()) {
+            CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Removing " + keysToRemove.size() + " entries with no active files");
+            for (String key : keysToRemove) {
+                CxLogger.info("RTS-Ignore: [DETECT_CHANGES] Removing key: " + key);
+                ignoreData.remove(key);
+            }
+            saveIgnoreFile();
+        }
+
+        CxLogger.info("RTS-Ignore: [DETECT_CHANGES_COMPLETE] After changes, ignoreData size: " + ignoreData.size());
+    }
+
+    private static final class ActiveFile {
+        final String packageKey;
+        final String path;
+
+        ActiveFile(String packageKey, String path) {
+            this.packageKey = packageKey;
+            this.path = path;
+        }
+    }
+
+    private List<ActiveFile> getActiveFilesList(Map<String, IgnoreEntry> data) {
+        List<ActiveFile> result = new ArrayList<>();
+        for (Map.Entry<String, IgnoreEntry> e : data.entrySet()) {
+            for (IgnoreEntry.FileReference fileRef : e.getValue().files) {
+                if (fileRef.active) {
+                    result.add(new ActiveFile(e.getKey(), fileRef.path));
+                }
+            }
+        }
+        return result;
+    }
+
+    private void removeIgnoredEntryWithoutTempUpdate(String packageKey, String filePath) {
+        IgnoreEntry entry = ignoreData.get(packageKey);
+        if (entry == null) return;
+        entry.files.removeIf(fileRef -> fileRef.path.equals(filePath));
+        if (entry.files.isEmpty()) {
+            ignoreData.remove(packageKey);
+        }
+        saveIgnoreFile();
+
+    }
+
+    private Map<String, IgnoreEntry> copyIgnoreData(Map<String, IgnoreEntry> src) {
+        // Deep copy via JSON round-trip
+        try {
+            String json = MAPPER.writeValueAsString(src);
+            return MAPPER.readValue(json, new TypeReference<Map<String, IgnoreEntry>>() {
+            });
+        } catch (IOException e) {
+            CxLogger.error("Failed to deep copy ignoreData, falling back to shallow copy", e);
+            return new HashMap<>(src);
+        }
+    }
+
+    // Helper method to match entries by properties
+    public boolean matchesEntry(IgnoreEntry entry1, IgnoreEntry entry2) {
+        if (entry1.getType() != entry2.getType()) return false;
+        // Match based on type-specific unique identifiers
+        switch (entry1.getType()) {
+            case OSS:
+                return Objects.equals(entry1.getPackageName(), entry2.getPackageName()) &&
+                        Objects.equals(entry1.getPackageVersion(), entry2.getPackageVersion()) &&
+                        Objects.equals(entry1.getPackageManager(), entry2.getPackageManager());
+            case CONTAINERS:
+                return Objects.equals(entry1.getImageName(), entry2.getImageName()) &&
+                        Objects.equals(entry1.getImageTag(), entry2.getImageTag());
+            case SECRETS:
+                return Objects.equals(entry1.getPackageName(), entry2.getPackageName()) &&
+                        Objects.equals(entry1.getSecretValue(), entry2.getSecretValue());
+            case IAC:
+                return Objects.equals(entry1.getPackageName(), entry2.getPackageName()) &&
+                        Objects.equals(entry1.getSimilarityId(), entry2.getSimilarityId());
+            case ASCA:
+                return Objects.equals(entry1.getPackageName(), entry2.getPackageName()) &&
+                        Objects.equals(entry1.getRuleId(), entry2.getRuleId());
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Saves the current ignore data to disk.
+     * This is a public wrapper for the private saveIgnoreFile method.
+     * Used when ignore data is modified directly (e.g., line number updates).
+     */
+    public void saveIgnoreDataToDisk() {
+        saveIgnoreFile();
+        updateIgnoreTempList();
+    }
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreManager.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreManager.java
new file mode 100644
index 00000000..bc894b77
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/IgnoreManager.java
@@ -0,0 +1,939 @@
+package com.checkmarx.eclipse.devassist.ignore;
+import org.eclipse.core.resources.IProject;
+import com.checkmarx.eclipse.common.utils.CxLogger;
+
+
+
+import java.nio.file.Paths;
+import java.time.Instant;
+import java.util.*;
+
+import com.checkmarx.eclipse.devassist.backend.DevAssistScanStateHolder;
+import com.checkmarx.eclipse.devassist.common.ScanResult;
+import com.checkmarx.eclipse.devassist.model.ScanIssue;
+import com.checkmarx.eclipse.devassist.model.Vulnerability;
+import com.checkmarx.eclipse.devassist.problems.ProblemHolderService;
+import com.checkmarx.eclipse.devassist.utils.DevAssistUtils;
+
+import static com.checkmarx.eclipse.devassist.utils.DevAssistConstants.QUICK_FIX;
+import static java.lang.String.format;
+
+/**
+ * Manages the ignore file (.checkmarxIgnored) within the project's workspace.
+ * Handles reading, writing, and updating ignore entries.
+ * Monitors the ignore file for changes and updates internal state accordingly.
+ * Provides methods to ignore issues and update temporary ignore lists.
+ */
+public final class IgnoreManager {
+    private static IgnoreManager instance;
+    private final org.eclipse.core.resources.IProject project;
+    private final ProblemHolderService problemHolder;
+    private final IgnoreFileManager ignoreFileManager;
+
+    public IgnoreManager(org.eclipse.core.resources.IProject project) {
+        this.project = project;
+        this.problemHolder = ProblemHolderService.getInstance(project);
+        this.ignoreFileManager = IgnoreFileManager.getInstance(project);
+    }
+
+    public static synchronized IgnoreManager getInstance(org.eclipse.core.resources.IProject project) {
+        if (instance == null || instance.project != project) {
+            instance = new IgnoreManager(project);
+        }
+        return instance;
+    }
+
+    /**
+     * Adds an entry to the ignore file for this specific occurrence only (this
+     * file). If the same vulnerability (by key) is already ignored elsewhere
+     * (e.g. via "ignore all" or a previous "ignore this" in another file), the
+     * existing entry's file list is merged into rather than replaced, so
+     * ignoring in one file never clears an ignore already recorded for another.
+     *
+     * @param issueToIgnore The scan issue to ignore
+     * @param clickId       The ID of the clicked action or vulnerability, used to retrieve additional details
+     */
+    public void addIgnoredEntry(ScanIssue issueToIgnore, String clickId) {
+        CxLogger.info(String.format("RTS-Ignore: Adding ignore entry for issue: %s", issueToIgnore.getTitle()));
+
+        String vulnerabilityKey = createJsonKeyForIgnoreEntry(issueToIgnore, clickId);
+        if (vulnerabilityKey.isEmpty()) {
+            CxLogger.info("RTS-Ignore: Ignoring vulnerability failed. Vulnerability key is empty.");
+            return;
+        }
+        IgnoreEntry existingEntry = ignoreFileManager.getIgnoreData().get(vulnerabilityKey);
+        IgnoreEntry ignoreEntry;
+        if (existingEntry != null) {
+            ignoreEntry = existingEntry;
+            upsertFileReference(ignoreEntry, issueToIgnore, resolveVulnerability(issueToIgnore, clickId));
+        } else {
+            // Convert ScanIssue → IgnoreEntry (includes this occurrence's file reference)
+            ignoreEntry = buildIgnoreEntry(issueToIgnore, clickId);
+        }
+        if (Objects.isNull(ignoreEntry)) {
+            // Notification removed: use Eclipse MessageDialog instead
+            return;
+        }
+        CxLogger.info(String.format("RTS-Ignore: Ignoring %s", vulnerabilityKey));
+        ignoreFileManager.updateIgnoreData(vulnerabilityKey, ignoreEntry);
+        // For a ScanIssue grouping several vulnerabilities on one line (ASCA/IAC), the cached
+        // ScanIssue in ProblemHolderService/CxFindingsView still holds every vulnerability in
+        // the group - including the one just ignored - until the next scan rebuilds it via the
+        // adaptor's per-vulnerability filtering. Without an immediate rescan, isIgnored(issue)
+        // checks made against that stale cached issue (e.g. ProblemDecorator.decorateEditor,
+        // CxFindingsView.refreshTreeWithFilter) can resolve to the just-ignored vulnerability
+        // and incorrectly treat the WHOLE line as ignored, hiding any other still-active
+        // vulnerability on it until something else happens to trigger a rescan.
+        triggerRescanForFile(issueToIgnore.getFilePath());
+//         showIgnoreSuccessNotification(project, issueToIgnore, vulnerabilityKey);
+        CxLogger.info(String.format("RTS-Ignore: Successfully added ignore entry for issue: %s", issueToIgnore.getTitle()));
+    }
+
+    /**
+     * Adds (or reactivates) a single file reference on an existing ignore
+     * entry for the given issue's file, without touching any other file's
+     * reference already recorded on that entry.
+     * <p>
+     * ASCA/IAC ignore keys deliberately omit the line number (see
+     * {@link #createJsonKeyForIgnoreEntry}), so a single key legitimately covers every
+     * occurrence of that rule in the file - matching an existing {@link IgnoreEntry.FileReference}
+     * by path alone would find *any* prior occurrence recorded under this key and overwrite its
+     * line/problematicLine, silently losing track of it instead of recording this (different)
+     * occurrence separately. Matching by path + problematicLine identifies the SAME occurrence
+     * (e.g. re-ignoring after a revive), while a different problematicLine is always treated as
+     * a new occurrence to add.
+     */
+    private void upsertFileReference(IgnoreEntry entry, ScanIssue issue, Vulnerability vulnerability) {
+        if (issue.getLocations() == null || issue.getLocations().isEmpty()) {
+            return;
+        }
+        String path = ignoreFileManager.normalizePath(issue.getFilePath());
+        int line = issue.getLocations().get(0).getLine();
+        String problematicLine = vulnerability != null && vulnerability.getProblematicLine() != null
+                ? vulnerability.getProblematicLine() : "";
+        if (entry.files == null) {
+            entry.files = new ArrayList<>();
+        }
+        for (IgnoreEntry.FileReference ref : entry.files) {
+            boolean sameOccurrence = path.equals(ref.getPath())
+                    && (problematicLine.isEmpty()
+                        ? ref.getProblematicLine() == null
+                        : problematicLine.equals(ref.getProblematicLine()));
+            if (sameOccurrence) {
+                ref.setActive(true);
+                ref.setLine(line);
+                return;
+            }
+        }
+        entry.files.add(new IgnoreEntry.FileReference(path, true, line, problematicLine));
+    }
+
+
+    /**
+     * Adds an entry to the ignore file for all occurrences of the specified issue.
+     * This method performs the following steps:
+     * 1. Creates a vulnerability key for the given issue
+     * 2. Gets all issues from the problem holder and creates a deep copy
+     * 3. Creates an ignore entry for the issue
+     * 4. Iterates through all issues and adds matching ones to the ignore list
+     * 5. Updates the ignore file and removes the issues from the problem holder
+     *
+     * @param issueToIgnore The scan issue to ignore across all files
+     * @param clickId       The ID that was clicked to trigger the ignore action
+     */
+    public void addAllIgnoredEntry(ScanIssue issueToIgnore, String clickId) {
+        try {
+            CxLogger.info(String.format("RTS-Ignore: Adding ignore entry for issue: %s", issueToIgnore.getTitle()));
+            String vulnerabilityKey = createJsonKeyForIgnoreEntry(issueToIgnore, clickId);
+            CxLogger.info("RTS-Ignore: Ignoring all vulnerabilities for: " + vulnerabilityKey);
+            if (vulnerabilityKey.isEmpty()) {
+                CxLogger.info("RTS-Ignore: Ignoring all vulnerabilities failed. Vulnerability key is empty.");
+                return;
+            }
+            IgnoreEntry ignoreEntry = buildIgnoreEntry(issueToIgnore, clickId);
+            if (Objects.isNull(ignoreEntry)) {
+                // Notification removed: use Eclipse MessageDialog instead
+                return;
+            }
+            // Best-effort: pick up every other currently-known occurrence of this
+            // vulnerability from the problem holder. This may legitimately be empty
+            // (e.g. a file whose scan was skipped as unchanged since the holder was
+            // last populated) - that must NOT stop the clicked occurrence itself from
+            // being ignored, so no early-return on an empty/no-match snapshot here.
+            Map<String, List<ScanIssue>> allIssues = new HashMap<>();
+            for (Map.Entry<String, List<ScanIssue>> entry : problemHolder.getAllScanIssues().entrySet()) {
+                allIssues.put(entry.getKey(), new ArrayList<>(entry.getValue()));
+            }
+            List<IgnoreEntry.FileReference> fileRefs = new ArrayList<>();
+            for (List<ScanIssue> issues : allIssues.values()) {  // Safe: allIssues never mutates
+                for (ScanIssue issue : issues) {
+                    // Issues missing a location (e.g. malformed/partial entries) can't be
+                    // matched by key reliably and have no line to record - skip them
+                    // instead of letting a single bad issue abort ignoring every match.
+                    if (issue == null || issue.getLocations() == null || issue.getLocations().isEmpty()) {
+                        continue;
+                    }
+                    if (!createJsonKeyForIgnoreEntry(issue, clickId).equals(vulnerabilityKey)) {
+                        continue;
+                    }
+                    fileRefs.add(new IgnoreEntry.FileReference(
+                            ignoreFileManager.normalizePath(issue.getFilePath()),
+                            true,
+                            issue.getLocations().get(0).getLine(), ""));
+                }
+            }
+            // Guarantee the clicked occurrence itself is covered even if it was
+            // somehow absent from the problemHolder snapshot above.
+            String clickedPath = ignoreFileManager.normalizePath(issueToIgnore.getFilePath());
+            boolean clickedCovered = fileRefs.stream().anyMatch(ref -> clickedPath.equals(ref.getPath()));
+            if (!clickedCovered && issueToIgnore.getLocations() != null && !issueToIgnore.getLocations().isEmpty()) {
+                fileRefs.add(new IgnoreEntry.FileReference(
+                        clickedPath, true, issueToIgnore.getLocations().get(0).getLine(), ""));
+            }
+            ignoreEntry.files = fileRefs;
+            ignoreFileManager.updateIgnoreData(vulnerabilityKey, ignoreEntry);
+            CxLogger.info(String.format("RTS-Ignore: Successfully added ignore entry for issue: %s", issueToIgnore.getTitle()));
+        } catch (Exception e) {
+            CxLogger.warning("RTS-Ignore: Failed to add ignore-all entry for issue: "
+                    + (issueToIgnore != null ? issueToIgnore.getTitle() : "unknown") + " - " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * Revives a single ignored vulnerability.
+     * Shows a notification with an "Undo" option that allows the user to restore the ignored state.
+     * The revive operation is performed first, then the user can undo it if desired.
+     * This follows the same pattern as the VS Code extension's revivePackage method.
+     *
+     * @param entryToRevive The ignore entry to revive
+     */
+    public void reviveSingleEntry(IgnoreEntry entryToRevive) {
+        CxLogger.info(format("RTS-Ignore: Reviving entry: %s", entryToRevive.getPackageName()));
+        Map<String, IgnoreEntry> ignoredEntries = new HashMap<>(ignoreFileManager.getIgnoreData());
+
+        // Count active files before reviving
+        int fileCount = (int) entryToRevive.files.stream()
+                .filter(f -> f.active)
+                .count();
+        // Perform the revive operation (sets all file references to inactive)
+        boolean success = ignoreFileManager.reviveEntry(entryToRevive);
+        if (!success) {
+            // Notification removed: use Eclipse MessageDialog instead
+            CxLogger.warning(format("RTS-Ignore: Failed to revive entry: %s", entryToRevive.getPackageName()));
+            return;
+        }
+        // Trigger rescan for affected files
+        triggerRescanForEntry(entryToRevive);
+        // Show notification with undo option
+//         showReviveUndoNotification(entryToRevive, fileCount, ignoredEntries);
+        CxLogger.info(format("RTS-Ignore: Successfully revived entry: %s", entryToRevive.getPackageName()));
+    }
+
+    /**
+     * Revives multiple ignored vulnerabilities in bulk.
+     * Batches all the revive operations together and saves to disk once at the end,
+     * then triggers rescans for all affected files.
+     *
+     * @param entriesToRevive List of entries to revive
+     */
+    public void reviveMultipleEntries(List<IgnoreEntry> entriesToRevive) {
+        if (entriesToRevive == null || entriesToRevive.isEmpty()) {
+            CxLogger.warning("RTS-Ignore: No package keys provided for bulk revive");
+            return;
+        }
+        CxLogger.info(format("RTS-Ignore: Bulk reviving %d entries", entriesToRevive.size()));
+
+        int successCount = 0;
+        int totalFileCount = 0;
+        List<IgnoreEntry> failedIgnoreEntry = new ArrayList<>();
+        List<IgnoreEntry> revivedEntries = new ArrayList<>();
+
+        // Revive all entries in memory first (without individual saves)
+        for (IgnoreEntry entryToRevive : entriesToRevive) {
+            int fileCount = (int) entryToRevive.files.stream()
+                    .filter(f -> f.active)
+                    .count();
+            // Use internal revive that doesn't save to disk
+            boolean success = reviveSingleEntryInternal(entryToRevive);
+            if (success) {
+                successCount++;
+                totalFileCount += fileCount;
+                revivedEntries.add(entryToRevive);
+                CxLogger.info(String.format("RTS-Ignore: Successfully revived in memory: %s", entryToRevive.getPackageName()));
+            } else {
+                failedIgnoreEntry.add(entryToRevive);
+                CxLogger.warning(String.format("RTS-Ignore: Failed to revive entry: %s", entryToRevive.getPackageName()));
+            }
+        }
+
+        // Save to disk once after all revives
+        if (successCount > 0) {
+            ignoreFileManager.saveIgnoreDataToDisk();
+            CxLogger.info(format("RTS-Ignore: Saved all %d revived entries to disk", successCount));
+        }
+
+        // Trigger rescans for all revived entries
+        for (IgnoreEntry entry : revivedEntries) {
+            triggerRescanForEntry(entry);
+        }
+
+        // Log summary
+        String message;
+        if (successCount == 1) {
+            message = String.format("Revived 1 vulnerability in %d file%s",
+                    totalFileCount, totalFileCount == 1 ? "" : "s");
+        } else if (successCount > 1) {
+            message = String.format("Revived %d vulnerabilities in %d file%s",
+                    successCount, totalFileCount, totalFileCount == 1 ? "" : "s");
+        } else {
+            message = "No vulnerabilities revived";
+        }
+        if (!failedIgnoreEntry.isEmpty()) {
+            message += String.format(" (%d failed)", failedIgnoreEntry.size());
+        }
+        CxLogger.info(format("RTS-Ignore: Bulk revive summary: %s", message));
+    }
+
+    /**
+     * Internal method to revive a single entry without saving to disk.
+     * Used by bulk operations that batch multiple revives before a single save.
+     *
+     * @param entryToRevive The ignore entry to revive
+     * @return true if the entry was found and revived, false otherwise
+     */
+    private boolean reviveSingleEntryInternal(IgnoreEntry entryToRevive) {
+        CxLogger.info(format("RTS-Ignore: Reviving entry (internal): %s", entryToRevive.getPackageName()));
+
+        // Find the entry in ignoreData map by matching properties
+        String entryKey = ignoreFileManager.getIgnoreData().entrySet().stream()
+                .filter(e -> ignoreFileManager.matchesEntry(e.getValue(), entryToRevive))
+                .map(Map.Entry::getKey)
+                .findFirst()
+                .orElse(null);
+
+        if (entryKey == null) {
+            CxLogger.warning(format("RTS-Ignore: Entry not found in ignoreData: %s", entryToRevive.getPackageName()));
+            return false;
+        }
+
+        IgnoreEntry actualEntry = ignoreFileManager.getIgnoreData().get(entryKey);
+        // Set all file references to inactive
+        for (IgnoreEntry.FileReference file : actualEntry.getFiles()) {
+            file.active = false;
+        }
+        CxLogger.info(format("RTS-Ignore: Marked all files as inactive for: %s", entryToRevive.getPackageName()));
+        return true;
+    }
+
+    /**
+     * Checks whether the given scan issue is currently ignored: the composite
+     * vulnerability key must match AND the entry must have an active file
+     * reference for this issue's specific file. This makes "ignore this" scoped
+     * to the file it was ignored from (an entry with one active file reference
+     * only hides the finding in that file), while "ignore all of this type"
+     * (which records an active reference per matching file) hides it everywhere,
+     * matching the {@code .checkmarxIgnored} files array's path/active/line
+     * per-occurrence tracking.
+     *
+     * @param issue The scan issue to check
+     * @return true if an active ignore entry exists for this issue's file
+     */
+    public boolean isIgnored(ScanIssue issue) {
+        if (issue == null) {
+            return false;
+        }
+        if (issue.getScanEngine() == com.checkmarx.eclipse.devassist.model.ScanEngine.ASCA) {
+            // ASCA's ignore key intentionally omits the line number (see
+            // createJsonKeyForIgnoreEntry) so one key can cover several distinct occurrences
+            // of the same rule in one file, each tracked independently by problematicLine in
+            // that entry's FileReference list (see isAscaVulnerabilityIgnored). That
+            // per-occurrence filtering already runs upstream in AscaScanResultAdaptor before a
+            // ScanIssue ever reaches this call (from decoration/tree-filtering call sites) -
+            // any ASCA ScanIssue that does reach here already has only its non-ignored
+            // vulnerabilities. A coarse key+path match here (ignoring problematicLine) would
+            // incorrectly treat this issue as ignored whenever ANY occurrence of the same rule
+            // in this file is ignored - including ones on a completely different line.
+            return false;
+        }
+        String key = createJsonKeyForIgnoreEntry(issue, "");
+        if (key.isEmpty()) {
+            return false;
+        }
+        IgnoreEntry entry = ignoreFileManager.getIgnoreData().get(key);
+        if (entry == null || entry.files == null) {
+            return false;
+        }
+        String normalizedPath = ignoreFileManager.normalizePath(issue.getFilePath());
+        return entry.files.stream()
+                .anyMatch(ref -> ref.isActive() && normalizedPath.equals(ref.getPath()));
+    }
+
+    /**
+     * Triggers an immediate real-time rescan for every file referenced by the
+     * given (just-revived) ignore entry, scoped to just those files - matching
+     * the JetBrains plugin's revive behavior of a per-file rescan rather than a
+     * full project rescan. Since the entry no longer exists (or is inactive) in
+     * {@code .checkmarxIgnored} by the time this runs, the scan's ignore-file
+     * exclusion no longer suppresses it, so the revived finding reappears.
+     *
+     * @param entry The ignore entry that was just revived
+     */
+    private void triggerRescanForEntry(IgnoreEntry entry) {
+        if (entry == null || entry.getFiles() == null || project == null) {
+            return;
+        }
+        org.eclipse.core.runtime.IPath projectLocation = project.getLocation();
+        if (projectLocation == null) {
+            return;
+        }
+        String basePath = projectLocation.toOSString();
+
+        for (IgnoreEntry.FileReference fileRef : entry.getFiles()) {
+            if (fileRef == null || fileRef.getPath() == null) {
+                continue;
+            }
+            try {
+                String absolutePath = Paths.get(basePath, fileRef.getPath()).toString();
+                org.eclipse.core.resources.IFile file = org.eclipse.core.resources.ResourcesPlugin.getWorkspace()
+                        .getRoot().getFileForLocation(new org.eclipse.core.runtime.Path(absolutePath));
+                if (file == null || !file.exists()) {
+                    CxLogger.warning("RTS-Ignore: Cannot trigger rescan, file not found: " + fileRef.getPath());
+                    continue;
+                }
+
+                // Reviving only mutates .checkmarxIgnored - the source file's content and
+                // mtime are untouched, so DevAssistScanStateHolder's cached state hash for
+                // it is still identical to what was last scanned. Without clearing it here,
+                // ScanManager.scanFileWithOutcome() would see hasChanged()==false and skip
+                // the scan entirely (no scanner ever runs), so the revived finding would
+                // never reappear. Clearing just this file's entry forces exactly one real
+                // scan cycle; the hash is repopulated normally once that scan succeeds, so
+                // ordinary edit-based caching for this file is unaffected afterwards.
+                // Use file.getLocation().toOSString() (not the manually-joined path above)
+                // since that is the exact key RealTimeScanJob/ScanManager use to read/write
+                // the cache - any formatting difference here would silently no-op the clear.
+                DevAssistScanStateHolder stateHolder = getOrCreateStateHolder();
+                if (stateHolder != null) {
+                    stateHolder.clearFileState(file.getLocation().toOSString());
+                }
+
+                com.checkmarx.eclipse.devassist.backend.listener.RealTimeScanJob scanJob =
+                        new com.checkmarx.eclipse.devassist.backend.listener.RealTimeScanJob(file, file.getName());
+                scanJob.schedule(0);
+                CxLogger.info("RTS-Ignore: Triggered rescan for revived entry file: " + fileRef.getPath());
+            } catch (Exception e) {
+                CxLogger.warning("RTS-Ignore: Failed to trigger rescan for file: " + fileRef.getPath()
+                        + " - " + e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Triggers an immediate real-time rescan for a single file right after an ignore write, so
+     * the cached scan issues (and everything decorated/filtered from them) reflect the new
+     * ignore state right away instead of only after the next incidental rescan. Mirrors
+     * {@link #triggerRescanForEntry(IgnoreEntry)}'s resolution/cache-clear/schedule pattern.
+     *
+     * @param filePath absolute path of the file to rescan
+     */
+    private void triggerRescanForFile(String filePath) {
+        if (filePath == null || filePath.isEmpty() || project == null) {
+            return;
+        }
+        try {
+            org.eclipse.core.resources.IFile file = org.eclipse.core.resources.ResourcesPlugin.getWorkspace()
+                    .getRoot().getFileForLocation(new org.eclipse.core.runtime.Path(filePath));
+            if (file == null || !file.exists()) {
+                CxLogger.warning("RTS-Ignore: Cannot trigger rescan, file not found: " + filePath);
+                return;
+            }
+
+            // See triggerRescanForEntry for why the cached state hash must be cleared: ignoring
+            // only mutates .checkmarxIgnored, not the source file, so without this the scan would
+            // be skipped entirely as "unchanged".
+            DevAssistScanStateHolder stateHolder = getOrCreateStateHolder();
+            if (stateHolder != null) {
+                stateHolder.clearFileState(file.getLocation().toOSString());
+            }
+
+            com.checkmarx.eclipse.devassist.backend.listener.RealTimeScanJob scanJob =
+                    new com.checkmarx.eclipse.devassist.backend.listener.RealTimeScanJob(file, file.getName());
+            scanJob.schedule(0);
+            CxLogger.info("RTS-Ignore: Triggered rescan for ignored entry's file: " + filePath);
+        } catch (Exception e) {
+            CxLogger.warning("RTS-Ignore: Failed to trigger rescan for file: " + filePath + " - " + e.getMessage());
+        }
+    }
+
+    /**
+     * Fetches (or lazily creates) the same per-project {@link DevAssistScanStateHolder}
+     * instance that {@code RealTimeScanJob}/{@code ScanManager} use for edit-based
+     * caching, via the identical session-property key. Sharing the exact instance
+     * (rather than constructing a disconnected one) is required for
+     * {@link DevAssistScanStateHolder#clearFileState(String)} to have any effect on
+     * the subsequent scan cycle triggered by revive.
+     */
+    private DevAssistScanStateHolder getOrCreateStateHolder() {
+        if (project == null) {
+            return null;
+        }
+        try {
+            org.eclipse.core.runtime.QualifiedName stateHolderKey = new org.eclipse.core.runtime.QualifiedName(
+                    "com.checkmarx.eclipse.plugin", "state-holder");
+            DevAssistScanStateHolder stateHolder = (DevAssistScanStateHolder) project.getSessionProperty(stateHolderKey);
+            if (stateHolder == null) {
+                stateHolder = new DevAssistScanStateHolder();
+                project.setSessionProperty(stateHolderKey, stateHolder);
+            }
+            return stateHolder;
+        } catch (Exception e) {
+            CxLogger.warning("RTS-Ignore: Failed to access scan state holder: " + e.getMessage());
+            return null;
+        }
+    }
+
+    private IgnoreEntry buildIgnoreEntry(ScanIssue issue, String clickId) {
+        IgnoreEntry entry = new IgnoreEntry();
+        if (issue == null) {
+            return entry;
+        }
+        // Convert model.ScanEngine to utils.ScanEngine
+        com.checkmarx.eclipse.devassist.model.ScanEngine modelEngine = issue.getScanEngine();
+        com.checkmarx.eclipse.devassist.utils.ScanEngine engine = null;
+        if (modelEngine != null) {
+            engine = com.checkmarx.eclipse.devassist.utils.ScanEngine.valueOf(modelEngine.toString());
+            entry.type = engine;
+        }
+
+        // ASCA/IAC can group several vulnerabilities under one ScanIssue (same line). The
+        // ScanIssue's own title/ruleId/similarityId are the group's aggregate values (e.g.
+        // "3 Checkmarx One Assist issues") and are identical for every vulnerability in the
+        // group and across every line flagged by the same rule - keying/describing the ignore
+        // entry off them would ignore the whole group/rule instead of just the clicked
+        // occurrence. Resolve the specific Vulnerability the user clicked instead.
+        Vulnerability vulnerability = (engine == com.checkmarx.eclipse.devassist.utils.ScanEngine.ASCA
+                || engine == com.checkmarx.eclipse.devassist.utils.ScanEngine.IAC)
+                ? resolveVulnerability(issue, clickId) : null;
+
+        String problematicLine = "";
+        if (vulnerability != null) {
+            entry.title = vulnerability.getTitle();
+            entry.severity = vulnerability.getSeverity();
+            entry.description = vulnerability.getDescription();
+            entry.ruleId = vulnerability.getRuleId();
+            entry.similarityId = vulnerability.getSimilarityId();
+            entry.packageName = vulnerability.getTitle();
+            problematicLine = vulnerability.getProblematicLine() != null ? vulnerability.getProblematicLine() : "";
+        } else {
+            entry.title = issue.getTitle();
+            entry.severity = issue.getSeverity();
+            entry.description = issue.getDescription();
+            entry.ruleId = issue.getRuleId();
+            entry.similarityId = issue.getSimilarityId();
+            if (engine == com.checkmarx.eclipse.devassist.utils.ScanEngine.CONTAINERS) {
+                entry.packageName = issue.getTitle() + ":" + issue.getImageTag();
+                entry.imageName = issue.getTitle();
+                entry.imageTag = issue.getImageTag();
+            } else {
+                entry.packageName = issue.getTitle();
+            }
+        }
+        entry.packageManager = issue.getPackageManager();
+        entry.packageVersion = issue.getPackageVersion();
+        entry.secretValue = issue.getSecretValue();
+        entry.dateAdded = java.time.Instant.now().toString();
+
+        if (issue.getLocations() != null && !issue.getLocations().isEmpty()) {
+            IgnoreEntry.FileReference ref = new IgnoreEntry.FileReference(
+                ignoreFileManager.normalizePath(issue.getFilePath()),
+                true,
+                issue.getLocations().get(0).getLine(),
+                problematicLine
+            );
+            entry.files.add(ref);
+        }
+        return entry;
+    }
+
+    /**
+     * Resolves the specific {@link Vulnerability} the user acted on within a (possibly
+     * multi-vulnerability) ScanIssue. {@code clickId} is the vulnerability id carried on the
+     * hover's per-vulnerability "Ignore this" link; when it's absent/empty/the quick-fix
+     * sentinel (e.g. "Ignore This Finding" from the Findings tree's right-click menu, which
+     * acts on the whole ScanIssue node rather than a specific vulnerability), falls back to
+     * the issue's own id - which, by construction in the ASCA/IAC adaptors, is assigned to the
+     * first (highest-severity) vulnerability of the *original* group.
+     * <p>
+     * That id can go stale: once that original first vulnerability is itself ignored on an
+     * earlier pass, the adaptor drops it from {@code issue.getVulnerabilities()} on the next
+     * rebuild, so the id no longer matches anything in the (now-filtered) list even though
+     * other vulnerabilities from the same group remain. In that case, fall back to the first
+     * vulnerability actually present - unambiguous when it's the only one left, and otherwise
+     * consistent with the original "first in the group" intent of {@code getScanIssueId()}.
+     */
+    private Vulnerability resolveVulnerability(ScanIssue issue, String clickId) {
+        String vulnerabilityId = (clickId == null || clickId.isEmpty() || clickId.equals(QUICK_FIX))
+                ? issue.getScanIssueId() : clickId;
+        Vulnerability vulnerability = DevAssistUtils.getVulnerabilityDetails(issue, vulnerabilityId);
+        if (vulnerability == null && issue.getVulnerabilities() != null && !issue.getVulnerabilities().isEmpty()) {
+            vulnerability = issue.getVulnerabilities().get(0);
+        }
+        return vulnerability;
+    }
+
+    /**
+     * Builds a unique key identifying the given scan issue's vulnerability, matching the
+     * composite key format used by the JetBrains plugin so ignore/revive/isIgnored checks
+     * are consistent across scan engines (OSS, CONTAINERS, SECRETS, IAC, ASCA).
+     */
+    public String createJsonKeyForIgnoreEntry(ScanIssue issue, String clickId) {
+        if (issue == null || issue.getScanEngine() == null) return "";
+        String relativePath = ignoreFileManager.normalizePath(issue.getFilePath());
+        com.checkmarx.eclipse.devassist.utils.ScanEngine engine =
+                com.checkmarx.eclipse.devassist.utils.ScanEngine.valueOf(issue.getScanEngine().toString());
+        switch (engine) {
+            case OSS:
+                return formatJsonKeyForIgnoreEntry(engine, issue.getPackageManager(), issue.getTitle(), issue.getPackageVersion());
+            case CONTAINERS:
+                return formatJsonKeyForIgnoreEntry(engine, issue.getTitle(), issue.getImageTag(), "");
+            case SECRETS:
+                return formatJsonKeyForIgnoreEntry(engine, issue.getTitle(), issue.getSecretValue(), relativePath);
+            case IAC: {
+                Vulnerability vulnerability = resolveVulnerability(issue, clickId);
+                return vulnerability != null && vulnerability.getSimilarityId() != null ?
+                        formatJsonKeyForIgnoreEntry(engine, vulnerability.getTitle(), vulnerability.getSimilarityId(), relativePath) : "";
+            }
+            case ASCA: {
+                Vulnerability vulnerability = resolveVulnerability(issue, clickId);
+                return vulnerability != null && vulnerability.getRuleId() != null ?
+                        formatJsonKeyForIgnoreEntry(engine, vulnerability.getTitle(), String.valueOf(vulnerability.getRuleId()), relativePath) : "";
+            }
+            default:
+                return formatJsonKeyForIgnoreEntry(engine, "", "", issue.getTitle());
+        }
+    }
+
+    /**
+     * Checks whether a specific ASCA vulnerability is ignored, based on its rule name and the
+     * actual source text of the line it was flagged on ("problematic line"), rather than just
+     * line number (which drifts as the file is edited) or file path alone (which would match
+     * every occurrence of the same rule anywhere in the file). Used to filter individual
+     * vulnerabilities out of a ScanIssue that may group several onto the same line, since ASCA's
+     * CLI has no ignore-file exclusion of its own (see AscaScannerService#getIgnoreFilePath) -
+     * this app-level check is the only enforcement point.
+     *
+     * @param vulnerability the specific vulnerability to check
+     * @param ignoreEntries the current ignore entries to check against
+     * @param filePath      the file path of the issue
+     * @return {@code true} if this specific vulnerability is ignored; {@code false} otherwise
+     */
+    public boolean isAscaVulnerabilityIgnored(Vulnerability vulnerability, List<IgnoreEntry> ignoreEntries, String filePath) {
+        if (vulnerability == null || ignoreEntries == null) {
+            return false;
+        }
+        String normalizedPath = ignoreFileManager.normalizePath(filePath);
+        String issueProblematicLine = vulnerability.getProblematicLine();
+        String vulnTitle = vulnerability.getTitle();
+        for (IgnoreEntry entry : ignoreEntries) {
+            if (entry.getType() != com.checkmarx.eclipse.devassist.utils.ScanEngine.ASCA) {
+                continue;
+            }
+            // Match by rule name: the ignore entry's packageName must match the vulnerability's title (rule name)
+            boolean ruleNameMatch = (entry.getPackageName() != null && entry.getPackageName().equals(vulnTitle))
+                    || (entry.getPackageName() == null && vulnTitle == null);
+            if (!ruleNameMatch || entry.getFiles() == null) {
+                continue;
+            }
+            for (IgnoreEntry.FileReference ref : entry.getFiles()) {
+                boolean pathMatch = ref.isActive() && normalizedPath.equals(ref.getPath());
+                boolean problematicLineMatch = (issueProblematicLine == null && ref.getProblematicLine() == null)
+                        || (issueProblematicLine != null && issueProblematicLine.equals(ref.getProblematicLine()));
+                if (pathMatch && problematicLineMatch) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if there are any ignored entries for the specified scan engine type.
+     * Used to skip the (expensive) full re-scan / line-number reconciliation
+     * done by {@link #updateLineNumbersForIgnoredEntries} when a file's scan
+     * engine has no ignored entries at all.
+     *
+     * @param scanEngine The scan engine type to check for ignored entries
+     * @return {@code true} if there are any ignored entries for the specified scan engine,
+     * {@code false} otherwise
+     */
+    public boolean hasIgnoredEntries(com.checkmarx.eclipse.devassist.utils.ScanEngine scanEngine) {
+        return ignoreFileManager.getIgnoreData().values().stream()
+                .anyMatch(entry -> entry.getType() == scanEngine);
+    }
+
+    /**
+     * Creates a list of ignore entry keys for a given scan issue.
+     * For IAC and ASCA scan engines, it generates keys for each vulnerability found in the scan issue.
+     * For other scan engines (OSS, SECRETS, CONTAINERS), it generates a single key using the quick fix ID.
+     *
+     * @param scanIssue The scan issue to create ignore keys for
+     * @return A list of unique keys that can be used to identify ignore entries for this scan issue
+     */
+    private List<String> createIgnoreKeysForScanIssue(ScanIssue scanIssue) {
+        List<String> keys = new ArrayList<>();
+        if (scanIssue.getScanEngine() == com.checkmarx.eclipse.devassist.model.ScanEngine.IAC
+                || scanIssue.getScanEngine() == com.checkmarx.eclipse.devassist.model.ScanEngine.ASCA) {
+            // IAC / ASCA - build key for EACH vulnerability
+            if (scanIssue.getVulnerabilities() == null || scanIssue.getVulnerabilities().isEmpty()) {
+                return keys;
+            }
+            for (Vulnerability vulnerability : scanIssue.getVulnerabilities()) {
+                String vulnerabilityId = vulnerability.getVulnerabilityId();
+                if (vulnerabilityId == null || vulnerabilityId.isEmpty()) {
+                    continue;
+                }
+                String key = createJsonKeyForIgnoreEntry(scanIssue, vulnerabilityId);
+                if (!key.isEmpty()) {
+                    keys.add(key);
+                }
+            }
+        } else {
+            String key = createJsonKeyForIgnoreEntry(scanIssue, QUICK_FIX);
+            if (!key.isEmpty()) {
+                keys.add(key);
+            }
+        }
+        return keys;
+    }
+
+    /**
+     * Updates line numbers for ignored entries (OSS/SECRETS/CONTAINERS/IAC) based on a fresh,
+     * UNFILTERED scan of the file (i.e. run without passing the ignore file to the scan engine,
+     * so already-ignored issues are still present in the results). If a user edits a file above an
+     * ignored finding, the finding's line shifts - without this reconciliation the gutter
+     * icon/marker for that ignored finding would render at its stale line. Also removes ignore
+     * entries whose finding is no longer present in the scan results (e.g. the vulnerable code was
+     * deleted).
+     *
+     * @param fullScanResults The UNFILTERED scan results for the file
+     * @param filePath        The path of the file that was scanned and needs line number updates
+     */
+    public void updateLineNumbersForIgnoredEntries(ScanResult<?> fullScanResults, String filePath) {
+        List<ScanIssue> allIssuesForFile = fullScanResults.getIssues();
+        if (allIssuesForFile == null || allIssuesForFile.isEmpty()) {
+            CxLogger.info(String.format("RTS-Ignore: No issues found in scan results for file: %s", filePath));
+            return;
+        }
+        com.checkmarx.eclipse.devassist.model.ScanEngine modelScanEngine = allIssuesForFile.get(0).getScanEngine();
+        if (modelScanEngine == null) {
+            CxLogger.info(String.format("RTS-Ignore: Scan engine type is null for file: %s", filePath));
+            return;
+        }
+        com.checkmarx.eclipse.devassist.utils.ScanEngine scanEngineType =
+                com.checkmarx.eclipse.devassist.utils.ScanEngine.valueOf(modelScanEngine.toString());
+
+        boolean hasChanges = false;
+        List<String> keysToRemove = new ArrayList<>();
+        Map<String, ScanIssue> scanIssueKeyMap = new HashMap<>();
+        for (ScanIssue scanIssue : allIssuesForFile) {
+            for (String key : createIgnoreKeysForScanIssue(scanIssue)) {
+                scanIssueKeyMap.put(key, scanIssue);
+            }
+        }
+        String relativePath = ignoreFileManager.normalizePath(filePath);
+        for (Map.Entry<String, IgnoreEntry> mapEntry : ignoreFileManager.getIgnoreData().entrySet()) {
+            IgnoreEntry ignoreEntry = mapEntry.getValue();
+            if (ignoreEntry.getType() != scanEngineType) {
+                continue; // Skip entries from different scan engines
+            }
+            ScanIssue matchingScanIssue = scanIssueKeyMap.get(mapEntry.getKey());
+            if (matchingScanIssue != null) {
+                String matchingIssuePath = ignoreFileManager.normalizePath(matchingScanIssue.getFilePath());
+                if (matchingIssuePath.equals(relativePath)) {
+                    if (matchingScanIssue.getLocations() == null || matchingScanIssue.getLocations().isEmpty()) {
+                        continue;
+                    }
+                    int newLineNumber = matchingScanIssue.getLocations().get(0).getLine();
+                    for (IgnoreEntry.FileReference fileRef : ignoreEntry.getFiles()) {
+                        if (fileRef.getPath().equals(relativePath) && fileRef.isActive()) {
+                            Integer oldLineNumber = fileRef.getLine();
+                            if (oldLineNumber == null || oldLineNumber != newLineNumber) {
+                                fileRef.setLine(newLineNumber);
+                                hasChanges = true;
+                            }
+                        }
+                    }
+                }
+            } else {
+                // Not found in scan results - remove if this entry has a reference for this file
+                boolean hasFileRefForCurrentFile = ignoreEntry.getFiles().stream()
+                        .anyMatch(fileRef -> fileRef.getPath().equals(relativePath) && fileRef.isActive());
+                if (hasFileRefForCurrentFile) {
+                    keysToRemove.add(mapEntry.getKey());
+                }
+            }
+        }
+        updateInIgnoredEntries(keysToRemove, hasChanges, relativePath);
+    }
+
+    /**
+     * Removes entries marked for removal and persists any line-number changes to disk.
+     *
+     * @param keysToRemove List of keys to remove from ignore data
+     * @param toUpdate     Flag indicating whether line numbers were updated and need to be saved
+     * @param relativePath Relative path of the file being processed
+     */
+    private void updateInIgnoredEntries(List<String> keysToRemove, boolean toUpdate, String relativePath) {
+        if (!keysToRemove.isEmpty()) {
+            for (String keyToRemove : keysToRemove) {
+                ignoreFileManager.getIgnoreData().remove(keyToRemove);
+                toUpdate = true;
+            }
+        }
+        if (toUpdate) {
+            ignoreFileManager.saveIgnoreDataToDisk();
+            CxLogger.info(String.format("RTS-Ignore: Line numbers updated and saved for file: %s", relativePath));
+        } else {
+            CxLogger.info(String.format("RTS-Ignore: No line number changes detected for file: %s", relativePath));
+        }
+    }
+
+    /**
+     * Updates line numbers for ignored ASCA entries based on new scan results, using
+     * problematicLine content for matching (ASCA's ignore key intentionally omits the line
+     * number - see {@link #createJsonKeyForIgnoreEntry} - so occurrences of the same rule in a
+     * file are tracked by the source text of the flagged line rather than its position, since
+     * that drifts as the file is edited). Removes file references/entries whose problematicLine
+     * is no longer present in the scan result (e.g. the vulnerable code was deleted).
+     * <p>
+     * The passed-in {@code fullScanResults} must be UNFILTERED (built with an
+     * {@link com.checkmarx.eclipse.devassist.scanners.asca.AscaScanResultAdaptor} that keeps
+     * already-ignored vulnerabilities) so every currently-ignored occurrence can still be matched.
+     *
+     * @param fullScanResults The UNFILTERED scan results containing updated line numbers and issues
+     * @param filePath        The path of the file that was scanned and needs line number updates
+     */
+    public void updateLineNumbersForIgnoredEntriesByProblematicLine(ScanResult<?> fullScanResults, String filePath) {
+        List<ScanIssue> allIssuesForFile = fullScanResults.getIssues();
+        if (allIssuesForFile == null || allIssuesForFile.isEmpty()) {
+            CxLogger.info(String.format("ASCA-Ignore: No issues found in scan results for file: %s", filePath));
+            return;
+        }
+        String relativePath = ignoreFileManager.normalizePath(filePath);
+        boolean hasChanges = false;
+
+        List<VulnerabilityWithLine> vulnerabilitiesWithLine = new ArrayList<>();
+        Set<String> presentProblematicLines = new HashSet<>();
+        for (ScanIssue scanIssue : allIssuesForFile) {
+            if (scanIssue.getVulnerabilities() != null) {
+                for (Vulnerability v : scanIssue.getVulnerabilities()) {
+                    int line = (scanIssue.getLocations() != null && !scanIssue.getLocations().isEmpty())
+                            ? scanIssue.getLocations().get(0).getLine() : 0;
+                    vulnerabilitiesWithLine.add(new VulnerabilityWithLine(v.getProblematicLine(), line));
+                    if (v.getProblematicLine() != null) {
+                        presentProblematicLines.add(v.getProblematicLine());
+                    }
+                }
+            }
+        }
+
+        List<String> keysToRemove = new ArrayList<>();
+        for (Map.Entry<String, IgnoreEntry> mapEntry : ignoreFileManager.getIgnoreData().entrySet()) {
+            IgnoreEntry ignoreEntry = mapEntry.getValue();
+            if (ignoreEntry.getType() != com.checkmarx.eclipse.devassist.utils.ScanEngine.ASCA) {
+                continue; // Only process ASCA entries
+            }
+            List<IgnoreEntry.FileReference> fileRefs = ignoreEntry.getFiles();
+            List<IgnoreEntry.FileReference> fileRefsToRemove = new ArrayList<>();
+            for (IgnoreEntry.FileReference fileRef : fileRefs) {
+                if (fileRef.getPath().equals(relativePath) && fileRef.isActive()) {
+                    String ignoredProblematicLine = fileRef.getProblematicLine();
+                    VulnerabilityWithLine match = vulnerabilitiesWithLine.stream()
+                            .filter(vwl -> Objects.equals(vwl.problematicLine, ignoredProblematicLine))
+                            .findFirst().orElse(null);
+                    if (match != null && match.line > 0
+                            && (fileRef.getLine() == null || fileRef.getLine() != match.line)) {
+                        fileRef.setLine(match.line);
+                        hasChanges = true;
+                    }
+                    if (ignoredProblematicLine == null || !presentProblematicLines.contains(ignoredProblematicLine)) {
+                        fileRefsToRemove.add(fileRef);
+                        hasChanges = true;
+                    }
+                }
+            }
+            if (!fileRefsToRemove.isEmpty()) {
+                fileRefs.removeAll(fileRefsToRemove);
+            }
+            if (ignoreEntry.getFiles().isEmpty()) {
+                keysToRemove.add(mapEntry.getKey());
+            }
+        }
+        for (String keyToRemove : keysToRemove) {
+            ignoreFileManager.getIgnoreData().remove(keyToRemove);
+            hasChanges = true;
+        }
+        if (hasChanges) {
+            ignoreFileManager.saveIgnoreDataToDisk();
+            CxLogger.info(String.format(
+                    "ASCA-Ignore: Line numbers and obsolete entries updated by problematicLine and saved for file: %s",
+                    relativePath));
+        } else {
+            CxLogger.info(String.format(
+                    "ASCA-Ignore: No line number or entry changes detected by problematicLine for file: %s",
+                    relativePath));
+        }
+    }
+
+    /** Helper for matching a problematicLine to its current line number. */
+    private static class VulnerabilityWithLine {
+        final String problematicLine;
+        final int line;
+
+        VulnerabilityWithLine(String problematicLine, int line) {
+            this.problematicLine = problematicLine;
+            this.line = line;
+        }
+    }
+
+    /**
+     * Removes all ASCA ignore entries/file references for a file when a full re-scan finds no
+     * issues at all in it (e.g. every flagged line was deleted).
+     *
+     * @param filePath The path of the file for which ignore entries should be removed
+     */
+    public void removeIgnoreEntriesForFileIfEmpty(String filePath) {
+        String relativePath = ignoreFileManager.normalizePath(filePath);
+        List<String> keysToRemove = new ArrayList<>();
+        boolean removed = false;
+        for (Map.Entry<String, IgnoreEntry> mapEntry : ignoreFileManager.getIgnoreData().entrySet()) {
+            IgnoreEntry ignoreEntry = mapEntry.getValue();
+            if (ignoreEntry.getType() != com.checkmarx.eclipse.devassist.utils.ScanEngine.ASCA) {
+                continue;
+            }
+            List<IgnoreEntry.FileReference> fileRefs = ignoreEntry.getFiles();
+            fileRefs.removeIf(fileRef -> fileRef.getPath().equals(relativePath));
+            if (ignoreEntry.getFiles().isEmpty()) {
+                keysToRemove.add(mapEntry.getKey());
+            }
+        }
+        for (String keyToRemove : keysToRemove) {
+            ignoreFileManager.getIgnoreData().remove(keyToRemove);
+            removed = true;
+        }
+        if (removed) {
+            ignoreFileManager.saveIgnoreDataToDisk();
+            CxLogger.info(String.format("ASCA-Ignore: Removed ignore entries for file with no issues: %s", relativePath));
+        }
+    }
+
+    private String formatJsonKeyForIgnoreEntry(com.checkmarx.eclipse.devassist.utils.ScanEngine scanEngine,
+                                                String title, String secondary, String path) {
+        if (scanEngine == com.checkmarx.eclipse.devassist.utils.ScanEngine.CONTAINERS) {
+            return format("%s:%s:%s", scanEngine, title, secondary);
+        } else {
+            return format("%s:%s:%s:%s", scanEngine, title, secondary, path);
+        }
+    }
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/TempItem.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/TempItem.java
new file mode 100644
index 00000000..abe38ab7
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ignore/TempItem.java
@@ -0,0 +1,173 @@
+package com.checkmarx.eclipse.devassist.ignore;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public final class TempItem {
+    private String Title;
+    private String SecretValue;
+    private String SimilarityID;
+    private String FileName;
+    private Integer Line;
+    private Integer RuleID;
+    private String PackageManager;
+    private String PackageName;
+    private String PackageVersion;
+    private String ImageName;
+    private String ImageTag;
+
+    public TempItem() {
+    }
+
+
+    public static TempItem forOss(String pm, String name, String version) {
+        TempItem t = new TempItem();
+        t.PackageManager = pm;
+        t.PackageName = name;
+        t.PackageVersion = version;
+        return t;
+    }
+
+    public static TempItem forSecret(String title, String secretValue) {
+        TempItem t = new TempItem();
+        t.Title = title;
+        t.SecretValue = secretValue;
+        return t;
+    }
+
+    public static TempItem forIac(String title, String similarityId) {
+        TempItem t = new TempItem();
+        t.Title = title;
+        t.SimilarityID = similarityId;
+        return t;
+    }
+
+    public static TempItem forContainer(String imageName, String imageTag) {
+        TempItem t = new TempItem();
+        t.ImageName = imageName;
+        t.ImageTag = imageTag;
+        return t;
+    }
+
+    public static TempItem forAsca(String fileName, Integer line, Integer ruleId) {
+        TempItem t = new TempItem();
+        t.FileName = fileName;
+        t.Line = line;
+        t.RuleID = ruleId;
+        return t;
+    }
+
+
+	public String getTitle() {
+		return Title;
+	}
+
+
+	public void setTitle(String title) {
+		Title = title;
+	}
+
+
+	public String getSecretValue() {
+		return SecretValue;
+	}
+
+
+	public void setSecretValue(String secretValue) {
+		SecretValue = secretValue;
+	}
+
+
+	public String getSimilarityID() {
+		return SimilarityID;
+	}
+
+
+	public void setSimilarityID(String similarityID) {
+		SimilarityID = similarityID;
+	}
+
+
+	public String getFileName() {
+		return FileName;
+	}
+
+
+	public void setFileName(String fileName) {
+		FileName = fileName;
+	}
+
+
+	public Integer getLine() {
+		return Line;
+	}
+
+
+	public void setLine(Integer line) {
+		Line = line;
+	}
+
+
+	public Integer getRuleID() {
+		return RuleID;
+	}
+
+
+	public void setRuleID(Integer ruleID) {
+		RuleID = ruleID;
+	}
+
+
+	public String getPackageManager() {
+		return PackageManager;
+	}
+
+
+	public void setPackageManager(String packageManager) {
+		PackageManager = packageManager;
+	}
+
+
+	public String getPackageName() {
+		return PackageName;
+	}
+
+
+	public void setPackageName(String packageName) {
+		PackageName = packageName;
+	}
+
+
+	public String getPackageVersion() {
+		return PackageVersion;
+	}
+
+
+	public void setPackageVersion(String packageVersion) {
+		PackageVersion = packageVersion;
+	}
+
+
+	public String getImageName() {
+		return ImageName;
+	}
+
+
+	public void setImageName(String imageName) {
+		ImageName = imageName;
+	}
+
+
+	public String getImageTag() {
+		return ImageTag;
+	}
+
+
+	public void setImageTag(String imageTag) {
+		ImageTag = imageTag;
+	}
+    
+    
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/inspection/DevAssistInspectionMgr.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/inspection/DevAssistInspectionMgr.java
index 6411003d..3949fa26 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/inspection/DevAssistInspectionMgr.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/inspection/DevAssistInspectionMgr.java
@@ -108,9 +108,15 @@ public ProblemDescriptor[] startScanAndCreateProblemDescriptors(
 			problemHelperBuilder.scanIssueList(allScanIssues);
 			ProblemHelper helperWithIssues = problemHelperBuilder.build();
 
-			// Cache issues
-			helperWithIssues.getProblemHolderService().addScanIssues(
-					problemHelper.getFilePath(), allScanIssues);
+			// NOTE: do NOT call problemHolderService.addScanIssues() here. The
+			// only caller of this method (ResultPublisher.createAndRenderDecorations)
+			// already cached this exact issue list via ResultPublisher.updateFindingsView()
+			// moments earlier. Re-caching the same list here re-publishes
+			// ISSUES_UPDATED_TOPIC a second time for the same scan cycle, causing
+			// CxFindingsView to run a second, redundant applyDecorationsToOpenEditors()
+			// pass concurrently with the direct decorateUI() call below - widening the
+			// race window with IgnoreFileManager's async file-watcher callback and
+			// producing inconsistent ignored/severity icon states on the same line.
 
 			// Create problems with decoration
 			List<ProblemDescriptor> allProblems = createProblemDescriptorsWithDecoration(helperWithIssues);
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemDecorator.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemDecorator.java
index d6db2172..adf6a684 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemDecorator.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemDecorator.java
@@ -1,11 +1,19 @@
 package com.checkmarx.eclipse.devassist.problems;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.DefaultPositionUpdater;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IPositionUpdater;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
@@ -15,6 +23,9 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.texteditor.ITextEditor;
 
+import com.checkmarx.eclipse.devassist.ignore.IgnoreEntry;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.ui.findings.editor.FindingsAnnotation;
 import com.checkmarx.eclipse.devassist.ui.findings.marker.MarkerIssueMapper;
 import com.checkmarx.eclipse.devassist.model.Location;
@@ -40,6 +51,71 @@ public class ProblemDecorator {
 	// Track annotations we've created so we can remove them later
 	private static final Map<String, List<Annotation>> fileAnnotations = new HashMap<>();
 
+	// Live-tracked line positions for ignored entries, keyed by
+	// "<normalizedPath>#<title>#<originalIgnoreFileLine>". Registered on the
+	// document via Position/PositionUpdater so edits made above an ignored line
+	// shift it automatically (Eclipse's equivalent of JetBrains' RangeMarker),
+	// instead of re-reading the static line number stored in .checkmarxIgnored
+	// on every redecoration pass.
+	private static final String IGNORED_POSITION_CATEGORY = "com.checkmarx.eclipse.ignoredLineTracking";
+	private static final Map<String, TrackedPosition> ignoredLinePositions = new HashMap<>();
+
+	private static final class TrackedPosition {
+		final IDocument document;
+		final Position position;
+
+		TrackedPosition(IDocument document, Position position) {
+			this.document = document;
+			this.position = position;
+		}
+	}
+
+	/**
+	 * Returns the current (edit-tracked) offset for an ignored entry's line,
+	 * creating and registering a tracked {@link Position} the first time this
+	 * entry is seen for the given document. Falls back to the given original
+	 * line's offset if tracking can't be set up.
+	 */
+	private static int resolveTrackedIgnoredOffset(IDocument document, String key, int originalLineOffset) {
+		TrackedPosition tracked = ignoredLinePositions.get(key);
+		if (tracked != null && tracked.document == document && !tracked.position.isDeleted()) {
+			return Math.max(0, Math.min(tracked.position.getOffset(), document.getLength()));
+		}
+
+		try {
+			if (!document.containsPositionCategory(IGNORED_POSITION_CATEGORY)) {
+				document.addPositionCategory(IGNORED_POSITION_CATEGORY);
+				IPositionUpdater updater = new DefaultPositionUpdater(IGNORED_POSITION_CATEGORY);
+				document.addPositionUpdater(updater);
+			}
+			Position position = new Position(originalLineOffset, 0);
+			document.addPosition(IGNORED_POSITION_CATEGORY, position);
+			ignoredLinePositions.put(key, new TrackedPosition(document, position));
+			return originalLineOffset;
+		} catch (BadLocationException | BadPositionCategoryException e) {
+			return originalLineOffset;
+		}
+	}
+
+	/**
+	 * Normalize file path for consistent key lookups in fileAnnotations map.
+	 * Converts to lowercase on Windows and uses forward slashes.
+	 * This prevents path key mismatches between different code paths that might
+	 * format paths differently (e.g. Maven editor vs regular editor).
+	 */
+	private static String normalizeFilePath(String filePath) {
+		if (filePath == null || filePath.isEmpty()) {
+			return "";
+		}
+		String normalized = filePath.replace("\\", "/");
+		// On Windows, normalize to lowercase for case-insensitive matching
+		if (System.getProperty("os.name").toLowerCase().contains("win")) {
+			normalized = normalized.toLowerCase();
+		}
+		CxLogger.info(LOG_TAG + "[PATH_NORMALIZE] Original: " + filePath + " -> Normalized: " + normalized);
+		return normalized;
+	}
+
 	/**
 	 * Render scan results as annotations in the editor.
 	 *
@@ -62,12 +138,19 @@ public static void decorateEditor(IFile file, List<ScanIssue> scanIssues) {
 		// This ensures fileAnnotations map keys match the same path format used
 		// throughout the codebase
 		String filePath = file.getLocation().toOSString();
+		String normalizedFilePath = normalizeFilePath(filePath);
+
+		CxLogger.info(LOG_TAG + "============================================");
+		CxLogger.info(LOG_TAG + "[DECORATE_START] File: " + filePath);
+		CxLogger.info(LOG_TAG + "[DECORATE_START] Normalized: " + normalizedFilePath);
+		CxLogger.info(LOG_TAG + "[DECORATE_START] ScanIssues count: " + scanIssues.size());
+		CxLogger.info(LOG_TAG + "[DECORATE_START] Current fileAnnotations keys: " + fileAnnotations.keySet());
 
 		try {
 			// Find open editor for this file
 			ITextEditor editor = findOpenEditor(file);
 			if (editor == null) {
-				CxLogger.info(LOG_TAG + "No open editor for: " + filePath);
+				CxLogger.info(LOG_TAG + "[DECORATE_SKIP] No open editor for: " + filePath);
 				return;
 			}
 
@@ -76,24 +159,37 @@ public static void decorateEditor(IFile file, List<ScanIssue> scanIssues) {
 					.getAnnotationModel(editor.getEditorInput());
 
 			if (annotationModel == null) {
-				CxLogger.warning(LOG_TAG + "No annotation model available");
+				CxLogger.warning(LOG_TAG + "[DECORATE_FAIL] No annotation model available");
 				return;
 			}
 
 			// Remove previous annotations for this file (BEFORE isEmpty check)
 			// This ensures stale annotations are cleared even if file is now clean
-			clearAnnotations(filePath, annotationModel);
-
-			// Early return if no issues to add
-			if (scanIssues.isEmpty()) {
-				return;
-			}
-
-			// Add new annotations for each issue
-			List<Annotation> annotations = new java.util.ArrayList<>();
+			CxLogger.info(LOG_TAG + "[CLEAR_START] Clearing previous annotations for: " + normalizedFilePath);
+			clearAnnotations(normalizedFilePath, annotationModel);
+
+			// Remove previous IMarkers for this file too - ensureMarker() below only adds
+			// markers, so without this, issues that were ignored/resolved/filtered out
+			// since the last decoration (e.g. via the ignore action) leave a stale gutter
+			// icon and Problems-view entry behind even though the squiggly is gone.
+			MarkerIssueMapper.clearAllMarkers(file);
+
+			// Add new annotations for each issue. Note: we do NOT early-return when
+			// scanIssues is empty - a file can go from "has active findings" to "fully
+			// ignored" (all findings ignored one-by-one), and we still need to run the
+			// ignored-entries pass below so the "ignored" gutter icon replaces the
+			// severity icon that was just cleared above.
+			List<Annotation> annotations = new ArrayList<>();
+			Set<Integer> activeLines = new HashSet<>();
+
+			IProject project = file.getProject();
+			IgnoreManager ignoreManager = project != null ? IgnoreManager.getInstance(project) : null;
 
 			for (ScanIssue issue : scanIssues) {
 				try {
+					if (ignoreManager != null && ignoreManager.isIgnored(issue)) {
+						continue;
+					}
 					// Ensure the IMarker CheckmarxMarkerResolutionGenerator's
 					// Ctrl+1/quick-fix-in-hover
 					// actions anchor to exists as soon as the squiggly does, rather than only after
@@ -101,6 +197,10 @@ public static void decorateEditor(IFile file, List<ScanIssue> scanIssues) {
 					// user separately navigates to this finding from the Findings view.
 					MarkerIssueMapper.ensureMarker(file, issue);
 
+					if (issue.getLocations() != null && !issue.getLocations().isEmpty()) {
+						activeLines.add(issue.getLocations().get(0).getLine());
+					}
+
 					FindingsAnnotation annotation = createAnnotation(editor, issue);
 					if (annotation != null) {
 						annotation.addButton(filePath, null);
@@ -135,16 +235,24 @@ public static void decorateEditor(IFile file, List<ScanIssue> scanIssues) {
 				}
 			}
 
-			// Store annotations for later cleanup
-			fileAnnotations.put(filePath, annotations);
+			// Draw the theme-aware "ignored" gutter icon for every active
+			// .checkmarxIgnored entry on this file whose line isn't already owned by an
+			// active (non-ignored) finding above.
+			annotations.addAll(decorateIgnoredEntries(file, editor, annotationModel, activeLines));
+
+			// Store annotations for later cleanup (using normalized path)
+			fileAnnotations.put(normalizedFilePath, annotations);
 
-			CxLogger.info(LOG_TAG + "COMPLETE: Added " + annotations.size() +
+			CxLogger.info(LOG_TAG + "[DECORATE_COMPLETE] Added " + annotations.size() +
 					" annotations to editor");
+			CxLogger.info(LOG_TAG + "[DECORATE_COMPLETE] FileAnnotations now has: " + fileAnnotations.size() + " entries");
+			CxLogger.info(LOG_TAG + "============================================");
 
 		} catch (Exception e) {
-			CxLogger.warning(LOG_TAG + " Error decorating editor: " +
+			CxLogger.warning(LOG_TAG + "[DECORATE_ERROR] Error decorating editor: " +
 					e.getMessage());
 			e.printStackTrace();
+			CxLogger.info(LOG_TAG + "============================================");
 		}
 	}
 
@@ -187,6 +295,92 @@ private static FindingsAnnotation createAnnotation(ITextEditor editor,
 		}
 	}
 
+	/**
+	 * Draw a theme-aware "ignored" gutter annotation for every active
+	 * {@code .checkmarxIgnored} entry that targets this file, skipping any line
+	 * that an active (non-ignored) finding already owns in this decoration pass.
+	 *
+	 * Uses a zero-length {@link Position} so only the vertical ruler/gutter icon
+	 * is rendered - no in-text squiggle - matching the requirement that an
+	 * ignored finding shows solely the "ignored" icon in place of its previous
+	 * severity icon.
+	 *
+	 * @param file            File being decorated
+	 * @param editor          Open text editor for the file
+	 * @param annotationModel Annotation model to add the ignored annotations to
+	 * @param activeLines     1-based line numbers already covered by an active
+	 *                        (non-ignored) finding in this same pass
+	 * @return The list of ignored annotations added, for later cleanup
+	 */
+	private static List<Annotation> decorateIgnoredEntries(IFile file, ITextEditor editor,
+			IAnnotationModel annotationModel, Set<Integer> activeLines) {
+		List<Annotation> result = new ArrayList<>();
+		try {
+			IProject project = file.getProject();
+			if (project == null) {
+				return result;
+			}
+
+			IgnoreFileManager ignoreFileManager = IgnoreFileManager.getInstance(project);
+			String normalizedPath = ignoreFileManager.normalizePath(file.getLocation().toOSString());
+
+			IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
+			if (document == null) {
+				return result;
+			}
+
+			String annotationType = "com.checkmarx.eclipse.findings.ignored" +
+					(DevAssistUtils.isDarkTheme() ? "_dark" : "");
+
+			for (IgnoreEntry entry : ignoreFileManager.getAllIgnoreEntries()) {
+				if (entry.getFiles() == null) {
+					continue;
+				}
+				for (IgnoreEntry.FileReference ref : entry.getFiles()) {
+					if (!ref.isActive() || ref.getLine() == null) {
+						continue;
+					}
+					if (!normalizedPath.equals(ref.getPath())) {
+						continue;
+					}
+
+					int zeroBasedLine = ref.getLine() - 1;
+					if (zeroBasedLine < 0 || zeroBasedLine >= document.getNumberOfLines()) {
+						continue;
+					}
+
+					try {
+						IRegion lineInfo = document.getLineInformation(zeroBasedLine);
+						String trackingKey = normalizedPath + "#" + entry.getTitle() + "#" + ref.getLine();
+						int trackedOffset = resolveTrackedIgnoredOffset(document, trackingKey, lineInfo.getOffset());
+						int currentLine = document.getLineOfOffset(trackedOffset) + 1;
+
+						if (activeLines.contains(currentLine)) {
+							// An active (non-ignored) finding already owns this line this pass.
+							continue;
+						}
+
+						Position pos = new Position(trackedOffset, 0);
+
+						String description = entry.getDescription() != null ? entry.getDescription()
+								: entry.getPackageName();
+						FindingsAnnotation annotation = new FindingsAnnotation(
+								annotationType,
+								entry.getTitle(),
+								"Ignored: " + description);
+						annotationModel.addAnnotation(annotation, pos);
+						result.add(annotation);
+					} catch (Exception e) {
+						CxLogger.warning(LOG_TAG + " Error adding ignored annotation: " + e.getMessage());
+					}
+				}
+			}
+		} catch (Exception e) {
+			CxLogger.warning(LOG_TAG + " Error decorating ignored entries: " + e.getMessage());
+		}
+		return result;
+	}
+
 	/**
 	 * Map severity level to theme-aware custom Findings annotation type.
 	 * Returns dark theme variant in dark theme, light variant in light theme.
@@ -476,19 +670,43 @@ private static void clearAnnotations(String filePath,
 			IAnnotationModel annotationModel) {
 
 		try {
-			List<Annotation> previousAnnotations = fileAnnotations.get(filePath);
+			String normalizedPath = normalizeFilePath(filePath);
+			CxLogger.info(LOG_TAG + "[CLEAR_DEBUG] Looking up with normalized path: " + normalizedPath);
+			CxLogger.info(LOG_TAG + "[CLEAR_DEBUG] Available keys in fileAnnotations: " + fileAnnotations.keySet());
+
+			List<Annotation> previousAnnotations = fileAnnotations.get(normalizedPath);
 			if (previousAnnotations != null) {
+				CxLogger.info(LOG_TAG + "[CLEAR_DEBUG] Found " + previousAnnotations.size() + " annotations to remove");
 				for (Annotation annotation : previousAnnotations) {
 					annotationModel.removeAnnotation(annotation);
+					CxLogger.info(LOG_TAG + "[CLEAR_DEBUG] Removed annotation: " + annotation);
 				}
-				fileAnnotations.remove(filePath);
+				fileAnnotations.remove(normalizedPath);
 
-				CxLogger.info(LOG_TAG + " Cleared " + previousAnnotations.size() +
-						" previous annotations");
+				CxLogger.info(LOG_TAG + "[CLEAR_SUCCESS] Cleared " + previousAnnotations.size() +
+						" previous annotations for: " + normalizedPath);
+			} else {
+				// FALLBACK: If lookup failed, try direct removal from annotation model
+				CxLogger.warning(LOG_TAG + "[CLEAR_FALLBACK] No annotations found in map for: " + normalizedPath);
+				CxLogger.warning(LOG_TAG + "[CLEAR_FALLBACK] Attempting direct removal of FindingsAnnotations from model");
+				List<Annotation> toRemove = new ArrayList<>();
+				annotationModel.getAnnotationIterator().forEachRemaining(ann -> {
+					if (ann instanceof FindingsAnnotation) {
+						toRemove.add(ann);
+						CxLogger.info(LOG_TAG + "[CLEAR_FALLBACK] Will remove FindingsAnnotation: " + ann);
+					}
+				});
+				for (Annotation ann : toRemove) {
+					annotationModel.removeAnnotation(ann);
+				}
+				if (!toRemove.isEmpty()) {
+					CxLogger.info(LOG_TAG + "[CLEAR_FALLBACK] Removed " + toRemove.size() + " FindingsAnnotations directly from model");
+				}
 			}
 		} catch (Exception e) {
-			CxLogger.warning(LOG_TAG + " Error clearing annotations: " +
+			CxLogger.warning(LOG_TAG + "[CLEAR_ERROR] Error clearing annotations: " +
 					e.getMessage());
+			e.printStackTrace();
 		}
 	}
 
@@ -499,11 +717,16 @@ private static void clearAnnotations(String filePath,
 	 */
 	public static void clearAllAnnotations() {
 		try {
+			CxLogger.info(LOG_TAG + "[CLEAR_ALL_START] Clearing all annotations from all open editors");
 			IWorkbench workbench = PlatformUI.getWorkbench();
 			if (workbench == null) {
+				CxLogger.warning(LOG_TAG + "[CLEAR_ALL] Workbench is null");
 				return;
 			}
 
+			int editorCount = 0;
+			int annotationCount = 0;
+
 			for (var window : workbench.getWorkbenchWindows()) {
 				IWorkbenchPage page = window.getActivePage();
 				if (page == null) {
@@ -525,6 +748,7 @@ public static void clearAllAnnotations() {
 							continue;
 						}
 
+						editorCount++;
 						IAnnotationModel annotationModel = editor.getDocumentProvider()
 								.getAnnotationModel(editor.getEditorInput());
 						if (annotationModel == null) {
@@ -541,18 +765,21 @@ public static void clearAllAnnotations() {
 
 						for (Annotation annotation : toRemove) {
 							annotationModel.removeAnnotation(annotation);
+							annotationCount++;
 						}
+						CxLogger.info(LOG_TAG + "[CLEAR_ALL] Cleared " + toRemove.size() + " annotations from editor " + editorCount);
 					} catch (Exception e) {
-						CxLogger.warning(LOG_TAG + " Error clearing annotations from editor: " + e.getMessage());
+						CxLogger.warning(LOG_TAG + "[CLEAR_ALL_ERROR] Error clearing annotations from editor: " + e.getMessage());
 					}
 				}
 			}
 
 			// Clear the fileAnnotations map
+			CxLogger.info(LOG_TAG + "[CLEAR_ALL] Clearing fileAnnotations map with " + fileAnnotations.size() + " entries");
 			fileAnnotations.clear();
-			CxLogger.info(LOG_TAG + " All annotations cleared from all open editors");
+			CxLogger.info(LOG_TAG + "[CLEAR_ALL_COMPLETE] All annotations cleared - Editors: " + editorCount + ", Annotations removed: " + annotationCount);
 		} catch (Exception e) {
-			CxLogger.warning(LOG_TAG + " Error clearing all annotations: " + e.getMessage());
+			CxLogger.warning(LOG_TAG + "[CLEAR_ALL_ERROR] Error clearing all annotations: " + e.getMessage());
 		}
 	}
 
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemHolderService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemHolderService.java
index 9aedecc4..70579c6f 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemHolderService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/problems/ProblemHolderService.java
@@ -49,7 +49,7 @@ public static ProblemHolderService getInstance(IProject project) {
 		}
 		try {
 			org.eclipse.core.runtime.QualifiedName key = new org.eclipse.core.runtime.QualifiedName(
-				"com.checkmarx.eclipse.plugin", "problem-holder-service");
+				"com.checkmarx.eclipse.plugin", "problem-holder");
 			ProblemHolderService instance = (ProblemHolderService) project.getSessionProperty(key);
 			if (instance == null) {
 				instance = new ProblemHolderService();
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/CopilotIntegration.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/CopilotIntegration.java
index f9d78d9c..850698c9 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/CopilotIntegration.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/CopilotIntegration.java
@@ -17,9 +17,10 @@
  * Integration with GitHub Copilot for Eclipse
  * (https://github.com/microsoft/copilot-for-eclipse).
  * <p>
- * Opens the Copilot Chat view in <b>Agent</b> mode with a pre-filled prompt and
- * submits it automatically, using the command contributed by the Copilot
- * plugin: {@code com.microsoft.copilot.eclipse.commands.openChatView}.
+ * Opens the Copilot Chat view in <b>Agent</b> mode with a pre-filled prompt in a
+ * <b>new chat session</b> and submits it automatically, using the command
+ * contributed by the Copilot plugin: {@code com.microsoft.copilot.eclipse.commands.openChatView}.
+ * Each prompt is opened in its own isolated chat session for independent Agent conversations.
  * <p>
  * Fallback strategy, in order:
  * <ol>
@@ -57,6 +58,9 @@ public final class CopilotIntegration {
 	/** Chat mode to switch to before submitting ("Agent" or "Ask"). */
 	private static final String PARAM_MODE = "com.microsoft.copilot.eclipse.commands.openChatView.mode";
 
+	/** New conversation. */
+	private static final String COPILOT_NEW_CONVERSATION_COMMAND = "com.microsoft.copilot.eclipse.commands.newConversation";
+
 	private static final String CHAT_MODE_AGENT = "Agent";
 
 	private static final String COPILOT_MARKETPLACE_URL = "https://marketplace.eclipse.org/content/github-copilot";
@@ -69,8 +73,11 @@ private CopilotIntegration() {
 	}
 
 	/**
-	 * Opens GitHub Copilot Chat in Agent mode with the given prompt and submits it
-	 * automatically.
+	 * Opens GitHub Copilot Chat in Agent mode with the given prompt in a new chat
+	 * session and submits it automatically.
+	 * <p>
+	 * Each call creates a new chat session instead of reusing an existing
+	 * conversation, ensuring isolated contexts for each prompt.
 	 * <p>
 	 * If Copilot is not installed, an "install Copilot" notification is shown. In
 	 * every case where the prompt could not be handed off to Copilot directly, it
@@ -126,48 +133,70 @@ public static boolean isCopilotInstalled() {
 	 * @return true if the command was found, enabled, and executed without error
 	 */
 	private static boolean openChatInAgentModeAndSend(String prompt) {
-		final boolean[] success = { false };
-
-		try {
-			Display.getDefault().syncExec(() -> {
-				try {
-					ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
-					if (commandService == null) {
-						CxLogger.warning(LOG_PREFIX + " ICommandService not available");
-						return;
-					}
-
-					Command command = commandService.getCommand(COPILOT_OPEN_CHAT_COMMAND);
-					if (command == null || !command.isDefined()) {
-						CxLogger.warning(LOG_PREFIX + " Copilot command not defined: " + COPILOT_OPEN_CHAT_COMMAND);
-						return;
-					}
-
-					if (!command.isEnabled()) {
-						CxLogger.warning(LOG_PREFIX + " Copilot command is not enabled: " + COPILOT_OPEN_CHAT_COMMAND);
-						return;
-					}
-
-					// The handler reads these as raw command parameters (always Strings) -
-					// passing a real Boolean here throws a ClassCastException in Copilot's handler.
-					Map<String, String> parameters = new HashMap<>();
-					parameters.put(PARAM_INPUT_VALUE, prompt);
-					parameters.put(PARAM_AUTO_SEND, Boolean.TRUE.toString());
-					parameters.put(PARAM_MODE, CHAT_MODE_AGENT);
-
-					command.executeWithChecks(new ExecutionEvent(command, parameters, null, null));
-					success[0] = true;
-				} catch (Exception e) {
-					CxLogger.warning(LOG_PREFIX + " Error executing Copilot open chat command: " + e.getMessage());
-				}
-			});
-		} catch (Exception e) {
-			CxLogger.error(LOG_PREFIX + " Unexpected error opening Copilot Chat: " + e.getMessage(), e);
-		}
-
-		return success[0];
+	    final boolean[] success = { false };
+
+	    try {
+	        // 1. Run the reset command synchronously on the UI Thread
+	        Display.getDefault().syncExec(() -> {
+	            try {
+	                ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+	                if (commandService == null) return;
+
+	                Command newConvCommand = commandService.getCommand(COPILOT_NEW_CONVERSATION_COMMAND);
+	                if (newConvCommand != null && newConvCommand.isDefined() && newConvCommand.isEnabled()) {
+	                    newConvCommand.executeWithChecks(new ExecutionEvent(newConvCommand, new HashMap<>(), null, null));
+	                }
+	            } catch (Exception e) {
+	                CxLogger.warning(LOG_PREFIX + " Error clearing conversation state: " + e.getMessage());
+	            }
+	        });
+
+	        // 2. Offload to a background thread to wait out the Copilot UI rebuild process safely
+	        Thread executionThread = new Thread(() -> {
+	            try {
+	                // Give the SWT Browser/HTML view 450-500ms to completely finish loading the fresh session
+	                Thread.sleep(450); 
+	            } catch (InterruptedException e) {
+	                Thread.currentThread().interrupt();
+	            }
+
+	            /**
+	             *  Fetch and prepare the standard chat view command.
+	             *  Schedule the prompt injection to run immediately AFTER the UI thread finishes clearing
+	             *  Re-enter the UI Thread to pass parameters and trigger the auto-send action
+	             */
+	            Display.getDefault().syncExec(() -> {
+	                try {
+	                    ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+	                    if (commandService == null) return;
+
+	                    Command command = commandService.getCommand(COPILOT_OPEN_CHAT_COMMAND);
+	                    if (command != null && command.isDefined() && command.isEnabled()) {
+	                        
+	                        Map<String, String> parameters = new HashMap<>();
+	                        parameters.put(PARAM_INPUT_VALUE, prompt);
+	                        parameters.put(PARAM_AUTO_SEND, Boolean.TRUE.toString());
+	                        parameters.put(PARAM_MODE, CHAT_MODE_AGENT);
+
+	                        command.executeWithChecks(new ExecutionEvent(command, parameters, null, null));
+	                        success[0] = true;
+	                    }
+	                } catch (Exception e) {
+	                    CxLogger.warning(LOG_PREFIX + " Post-sleep submission failed: " + e.getMessage());
+	                }
+	            });
+	        });
+
+	        executionThread.start();
+	        // If your calling method relies on a strictly blocking response, you can optionally call executionThread.join(); here
+
+	    } catch (Exception e) {
+	        CxLogger.error(LOG_PREFIX + " Unexpected exception handling background dispatch: " + e.getMessage(), e);
+	    }
+
+	    return success[0];
 	}
-
+	
 
 	/**
 	 * Shows a notification prompting the user to install GitHub Copilot for
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/RemediationLinkHandler.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/RemediationLinkHandler.java
index eb731f7a..58ebfa35 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/RemediationLinkHandler.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/remediation/RemediationLinkHandler.java
@@ -3,13 +3,22 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jgit.annotations.NonNull;
 import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 
 import com.checkmarx.eclipse.common.utils.CxLogger;
 import com.checkmarx.eclipse.devassist.model.ScanIssue;
 import com.checkmarx.eclipse.devassist.problems.ProblemHolderService;
+import com.checkmarx.eclipse.devassist.telemetry.TelemetryService;
+import com.checkmarx.eclipse.devassist.ui.findings.CxFindingsView;
 
 import static com.checkmarx.eclipse.devassist.utils.DevAssistConstants.SEPERATOR;
 import static java.lang.String.format;
@@ -60,11 +69,10 @@ public boolean handleLink(@NonNull String link, @NonNull ScanIssue scanIssue) {
             return false;
         }
 
+        // Note: the scanIssue is already known here, so unlike the other handleLink()
+        // overload, a missing engine-name segment (e.g. links built without it, such as
+        // "ignorethis"/"ignoreallofthis") must not block the action from running.
         String engineName = extractEngineName(linkData);
-        if (Objects.isNull(engineName) || engineName.isEmpty()) {
-            CxLogger.warning("RTS-Fix: Remediation action failed, Scan engine name not found in remediation link: " + link);
-            return false;
-        }
 
         CxLogger.info(format("RTS-Fix: %s Remediation action called for engine: %s with issue id: %s", action, engineName, scanIssueId));
 
@@ -127,30 +135,39 @@ public boolean handleLink(@NonNull String link) {
      * @return true if the action is successfully handled, false otherwise
      */
     private boolean handleActions(@NonNull String action, @NonNull ScanIssue scanIssue, @NonNull String actionId) {
-        // Note: Commented code sections below are preserved as requested for future use
-        // when dependencies become available (IgnoreManager, TelemetryService)
-
         switch (action) {
             case FIX:
-//                TelemetryService.logFixWithCxOneAssistAction(scanIssue);
                 remediationManager.fixWithCxOneAssist(scanIssue, actionId);
+                TelemetryService.logFixWithCxOneAssistAction(scanIssue);
                 break;
             case VIEW_DETAILS:
-//                TelemetryService.logViewDetailsAction(scanIssue);
                 remediationManager.viewDetails(scanIssue, actionId);
+                TelemetryService.logViewDetailsAction(scanIssue);
                 break;
-            case IGNORE_THIS_TYPE:
-//                IgnoreManager ignoremanager = IgnoreManager.getInstance(project);
-//                ignoremanager.addIgnoredEntry(scanIssue, actionId);
-//                TelemetryService.logIgnorePackageAction(scanIssue);
-                CxLogger.warning("RTS-Fix: IGNORE_THIS_TYPE action not yet implemented");
+            case IGNORE_THIS_TYPE: {
+                IProject project = getActiveProject();
+                if (Objects.isNull(project)) {
+                    CxLogger.warning("RTS-Fix: Remediation action failed, no active project found for IGNORE_THIS_TYPE");
+                    return false;
+                }
+                com.checkmarx.eclipse.devassist.ignore.IgnoreManager.getInstance(project).addIgnoredEntry(scanIssue, actionId);
+                TelemetryService.logIgnorePackageAction(scanIssue);
+                deleteMarkerForIssue(project, scanIssue);
+                refreshFindingsView();
                 break;
-            case IGNORE_ALL_OF_THIS_TYPE:
-//                IgnoreManager ignoremanager = IgnoreManager.getInstance(project);
-//                ignoremanager.addAllIgnoredEntry(scanIssue, actionId);
-//                TelemetryService.logIgnoreAllAction(scanIssue);
-                CxLogger.warning("RTS-Fix: IGNORE_ALL_OF_THIS_TYPE action not yet implemented");
+            }
+            case IGNORE_ALL_OF_THIS_TYPE: {
+                IProject project = getActiveProject();
+                if (Objects.isNull(project)) {
+                    CxLogger.warning("RTS-Fix: Remediation action failed, no active project found for IGNORE_ALL_OF_THIS_TYPE");
+                    return false;
+                }
+                com.checkmarx.eclipse.devassist.ignore.IgnoreManager.getInstance(project).addAllIgnoredEntry(scanIssue, actionId);
+                TelemetryService.logIgnoreAllAction(scanIssue);
+                deleteMarkersForAllMatches(project, scanIssue);
+                refreshFindingsView();
                 break;
+            }
             default:
                 CxLogger.warning(format("RTS-Fix: Remediation action %s is not supported", action));
                 return false;
@@ -158,6 +175,21 @@ private boolean handleActions(@NonNull String action, @NonNull ScanIssue scanIss
         return true;
     }
 
+    /**
+     * Resolves the active project the same way {@code CxFindingsView} does
+     * (single-project workspace assumption used throughout the ignore/revive feature).
+     */
+    @Nullable
+    private org.eclipse.core.resources.IProject getActiveProject() {
+        org.eclipse.core.resources.IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+        for (org.eclipse.core.resources.IProject project : projects) {
+            if (project.isOpen()) {
+                return project;
+            }
+        }
+        return null;
+    }
+
     /**
      * Extracts the engine name from the link data array.
      *
@@ -318,4 +350,106 @@ private ScanIssue getScanIssueUsingVulnerabilityId(@NonNull List<ScanIssue> scan
         }
         return null;
     }
+
+    /**
+     * Deletes markers for a single ignored issue from the editor.
+     * Finds the file where the issue is located and removes the marker.
+     *
+     * @param project the active project
+     * @param scanIssue the scan issue to find and delete markers for
+     */
+    private void deleteMarkerForIssue(@NonNull IProject project, @NonNull ScanIssue scanIssue) {
+        try {
+            String filePath = scanIssue.getFilePath();
+            if (filePath == null || filePath.isEmpty()) {
+                CxLogger.warning("RTS-Fix: Cannot delete marker, scan issue has no file path");
+                return;
+            }
+
+            IFile file = project.getFile(filePath);
+            if (file == null || !file.exists()) {
+                CxLogger.warning("RTS-Fix: Cannot delete marker, file not found: " + filePath);
+                return;
+            }
+
+            IMarker[] markers = file.findMarkers("com.checkmarx.eclipse.plugin.checkmarxProblemMarker", true, IResource.DEPTH_ZERO);
+            for (IMarker marker : markers) {
+                try {
+                    String markerScanIssueId = marker.getAttribute("scanIssueId", "");
+                    if (markerScanIssueId.equals(scanIssue.getScanIssueId())) {
+                        marker.delete();
+                        CxLogger.info("RTS-Fix: Deleted marker for issue: " + scanIssue.getTitle());
+                        return;
+                    }
+                } catch (Exception e) {
+                    CxLogger.warning("RTS-Fix: Error checking marker attribute: " + e.getMessage());
+                }
+            }
+        } catch (Exception e) {
+            CxLogger.error("RTS-Fix: Error deleting marker for ignored issue", e);
+        }
+    }
+
+    /**
+     * Deletes all markers for issues matching the ignore-all criteria.
+     * For OSS/CONTAINERS, finds all markers with the same package/image.
+     *
+     * @param project the active project
+     * @param scanIssue the scan issue to match against
+     */
+    private void deleteMarkersForAllMatches(@NonNull IProject project, @NonNull ScanIssue scanIssue) {
+        try {
+            IMarker[] allMarkers = project.findMarkers("com.checkmarx.eclipse.plugin.checkmarxProblemMarker", true, IResource.DEPTH_INFINITE);
+            int deletedCount = 0;
+
+            for (IMarker marker : allMarkers) {
+                try {
+                    String markerTitle = marker.getAttribute(IMarker.MESSAGE, "");
+                    if (markerTitle.contains(scanIssue.getTitle())) {
+                        marker.delete();
+                        deletedCount++;
+                    }
+                } catch (Exception e) {
+                    CxLogger.warning("RTS-Fix: Error checking marker for deletion: " + e.getMessage());
+                }
+            }
+
+            if (deletedCount > 0) {
+                CxLogger.info("RTS-Fix: Deleted " + deletedCount + " markers for ignore-all action");
+            }
+        } catch (Exception e) {
+            CxLogger.error("RTS-Fix: Error deleting markers for ignore-all", e);
+        }
+    }
+
+    /**
+     * Refreshes the Findings View to update the tree and remove ignored findings.
+     * Finds the CxFindingsView instance and calls refreshTreeWithFilter() on it.
+     */
+    private void refreshFindingsView() {
+        try {
+            IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+            if (window == null) {
+                CxLogger.warning("RTS-Fix: Cannot refresh findings view, no active workbench window");
+                return;
+            }
+
+            IWorkbenchPage page = window.getActivePage();
+            if (page == null) {
+                CxLogger.warning("RTS-Fix: Cannot refresh findings view, no active workbench page");
+                return;
+            }
+
+            CxFindingsView view = (CxFindingsView) page.findView(CxFindingsView.ID);
+            if (view == null) {
+                CxLogger.warning("RTS-Fix: Cannot refresh findings view, view not found");
+                return;
+            }
+
+            view.refreshTreeWithFilter();
+            CxLogger.info("RTS-Fix: Refreshed Findings View");
+        } catch (Exception e) {
+            CxLogger.error("RTS-Fix: Error refreshing findings view", e);
+        }
+    }
 }
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScanResultAdaptor.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScanResultAdaptor.java
index c3173e68..cc5b222b 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScanResultAdaptor.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScanResultAdaptor.java
@@ -2,6 +2,9 @@
 
 import com.checkmarx.ast.asca.ScanDetail;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreEntry;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.model.Location;
 import com.checkmarx.eclipse.devassist.model.ScanIssue;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
@@ -9,6 +12,7 @@
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
 import com.checkmarx.eclipse.devassist.utils.DevAssistUtils;
 import com.checkmarx.eclipse.common.utils.CxLogger;
+import org.eclipse.core.resources.IProject;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -35,6 +39,7 @@ public class AscaScanResultAdaptor implements ScanResult<Object> {
 
 	private final com.checkmarx.ast.asca.ScanResult ascaScanResult;
 	private final String filePath;
+	private final IProject project;
 	private final List<ScanIssue> scanIssues;
 
 	/**
@@ -43,11 +48,36 @@ public class AscaScanResultAdaptor implements ScanResult<Object> {
 	 *
 	 * @param ascaScanResult the ASCA scan results to be wrapped
 	 * @param filePath       the path of the file being scanned
+	 * @param project        the project the file belongs to, used to filter out
+	 *                       already-ignored vulnerabilities - ASCA's CLI has no
+	 *                       ignore-file exclusion of its own (see
+	 *                       AscaScannerService#getIgnoreFilePath), so this app-level
+	 *                       filtering is the only enforcement point
 	 */
-	public AscaScanResultAdaptor(com.checkmarx.ast.asca.ScanResult ascaScanResult, String filePath) {
+	public AscaScanResultAdaptor(com.checkmarx.ast.asca.ScanResult ascaScanResult, String filePath, IProject project) {
+		this(ascaScanResult, filePath, project, true);
+	}
+
+	/**
+	 * Constructs an instance of AscaScanResultAdaptor with optional ignore filtering.
+	 *
+	 * @param ascaScanResult the ASCA scan results to be wrapped
+	 * @param filePath       the path of the file being scanned
+	 * @param project        the project the file belongs to, used to filter out
+	 *                       already-ignored vulnerabilities
+	 * @param filterIgnored  whether to filter out already-ignored vulnerabilities
+	 *                       (true = filter, false = keep all). Pass false when
+	 *                       building the adaptor used to reconcile ignored
+	 *                       entries' line numbers, since that pass needs every
+	 *                       vulnerability - including already-ignored ones - to
+	 *                       track which occurrences are still present in the code.
+	 */
+	public AscaScanResultAdaptor(com.checkmarx.ast.asca.ScanResult ascaScanResult, String filePath, IProject project,
+			boolean filterIgnored) {
 		this.ascaScanResult = ascaScanResult;
 		this.filePath = filePath;
-		this.scanIssues = buildIssues();
+		this.project = project;
+		this.scanIssues = filterIgnored ? buildIssues() : buildIssuesUnfiltered();
 	}
 
 	@Override
@@ -61,10 +91,30 @@ public List<ScanIssue> getIssues() {
 	}
 
 	/**
-	 * Builds a list of ScanIssue objects from the ASCA scan results.
+	 * Builds a list of ScanIssue objects from the ASCA scan results, filtering out
+	 * already-ignored vulnerabilities.
 	 * Groups multiple vulnerabilities on the same line and sorts them by severity.
 	 */
 	private List<ScanIssue> buildIssues() {
+		return buildIssuesInternal(true);
+	}
+
+	/**
+	 * Builds a list of ScanIssue objects from the ASCA scan results WITHOUT filtering
+	 * ignored vulnerabilities. Used to reconcile ignored entries' line numbers, where all
+	 * vulnerabilities (including already-ignored ones) are needed to track which occurrences
+	 * are still present in the code.
+	 */
+	private List<ScanIssue> buildIssuesUnfiltered() {
+		return buildIssuesInternal(false);
+	}
+
+	/**
+	 * Groups multiple vulnerabilities on the same line and sorts them by severity.
+	 *
+	 * @param applyFilter true to filter out already-ignored vulnerabilities, false to keep all
+	 */
+	private List<ScanIssue> buildIssuesInternal(boolean applyFilter) {
 		if (ascaScanResult == null || ascaScanResult.getScanDetails() == null) {
 			CxLogger.info(LOG_TAG + " No scan results or scan details available");
 			return Collections.emptyList();
@@ -86,25 +136,42 @@ private List<ScanIssue> buildIssues() {
 							return detailsList;
 						})));
 
+		// ASCA's CLI has no ignore-file exclusion of its own (see
+		// AscaScannerService#getIgnoreFilePath), so already-ignored vulnerabilities must be
+		// filtered out here, at the point ScanIssues are built - fetched once per file build
+		// rather than per group, since it's the same snapshot for every line in this file.
+		IgnoreManager ignoreManager = (applyFilter && project != null) ? IgnoreManager.getInstance(project) : null;
+		List<IgnoreEntry> ignoreEntries = (applyFilter && project != null)
+				? IgnoreFileManager.getInstance(project).getAllIgnoreEntries() : Collections.emptyList();
+
 		List<ScanIssue> issues = groupedIssues.values().stream()
-				.map(this::createScanIssueForGroup)
+				.map(detailList -> createScanIssueForGroup(detailList, ignoreManager, ignoreEntries))
 				.filter(Objects::nonNull)
 				.collect(Collectors.toList());
 
-		CxLogger.info(LOG_TAG + " Converted " + issues.size() + " grouped scan issues for file: " + filePath);
+		CxLogger.info(LOG_TAG + (applyFilter ? " Converted " : " Converted (unfiltered) ") + issues.size()
+				+ " grouped scan issues for file: " + filePath);
 		return issues;
 	}
 
 	/**
 	 * Creates a ScanIssue from a group of ASCA scan details that are on the same
-	 * line.
+	 * line, filtering out any vulnerability already recorded as ignored -
+	 * individually, by rule name + problematic line - rather than dropping or
+	 * keeping the whole group, so ignoring one vulnerability on a multi-vulnerability
+	 * line never hides the others on that line.
 	 *
 	 * @param ascaScanDetails the list of ASCA scan details for the same line
 	 *                        (already sorted by severity)
-	 * @return a ScanIssue representing the ASCA finding(s), or null if conversion
-	 *         fails
+	 * @param ignoreManager   resolves whether a given vulnerability is ignored, or
+	 *                        {@code null} if no project context is available or filtering
+	 *                        is disabled
+	 * @param ignoreEntries   the current ignore entries to check against
+	 * @return a ScanIssue representing the ASCA finding(s), or null if every
+	 *         vulnerability in the group is ignored or conversion fails
 	 */
-	private ScanIssue createScanIssueForGroup(List<ScanDetail> ascaScanDetails) {
+	private ScanIssue createScanIssueForGroup(List<ScanDetail> ascaScanDetails, IgnoreManager ignoreManager,
+			List<IgnoreEntry> ignoreEntries) {
 		if (ascaScanDetails == null || ascaScanDetails.isEmpty()) {
 			return null;
 		}
@@ -112,14 +179,25 @@ private ScanIssue createScanIssueForGroup(List<ScanDetail> ascaScanDetails) {
 		try {
 			ScanIssue scanIssue = getScanIssue(ascaScanDetails);
 
-			// Add vulnerabilities from all details in the group
+			// Add vulnerabilities from all details in the group, skipping ones already ignored
 			for (int i = 0; i < ascaScanDetails.size(); i++) {
 				ScanDetail detail = ascaScanDetails.get(i);
 				String vulnerabilityId = (i == 0) ? scanIssue.getScanIssueId() : null;
 				Vulnerability vuln = createVulnerability(detail, vulnerabilityId);
+
+				if (ignoreManager != null && ignoreManager.isAscaVulnerabilityIgnored(vuln, ignoreEntries, filePath)) {
+					CxLogger.info(LOG_TAG + " Skipping ignored vulnerability '" + vuln.getTitle() +
+							"' on line " + detail.getLine());
+					continue;
+				}
 				scanIssue.getVulnerabilities().add(vuln);
 			}
 
+			// If every vulnerability on this line is ignored, drop the ScanIssue entirely
+			if (scanIssue.getVulnerabilities().isEmpty()) {
+				return null;
+			}
+
 			// Update title based on actual number of vulnerabilities
 			updateScanIssueTitleAndLocation(scanIssue, ascaScanDetails);
 
@@ -188,6 +266,8 @@ private Vulnerability createVulnerability(ScanDetail scanDetail, String override
 		vulnerability.setTitle(scanDetail.getRuleName());
 		vulnerability.setDescription(scanDetail.getDescription());
 		vulnerability.setSeverity(mapSeverity(scanDetail.getSeverity()));
+		vulnerability.setRuleId(scanDetail.getRuleID());
+		vulnerability.setProblematicLine(scanDetail.getProblematicLine());
 
 		CxLogger.info(LOG_TAG + " Created vulnerability '" + scanDetail.getRuleName() +
 				"' with vulnerabilityId '" + vulnerabilityId + "'");
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScannerService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScannerService.java
index cb1dad02..5b2ad7e1 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScannerService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/asca/AscaScannerService.java
@@ -17,6 +17,7 @@
 import com.checkmarx.eclipse.devassist.basescanner.BaseScannerService;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
 import com.checkmarx.eclipse.devassist.common.ScannerConfig;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
 import com.checkmarx.eclipse.devassist.utils.ScanEngine;
 
@@ -107,13 +108,45 @@ private com.checkmarx.eclipse.devassist.common.ScanResult<Object> scanInternal(S
 			if (rawResults == null) {
 				return null;
 			}
-			return new AscaScanResultAdaptor((com.checkmarx.ast.asca.ScanResult) rawResults, filePath);
+			com.checkmarx.ast.asca.ScanResult ascaScanResult = (com.checkmarx.ast.asca.ScanResult) rawResults;
+			// Update line numbers for ignored ASCA issues if any exist
+			updateIgnoredFileDataOnLatestResult(ascaScanResult, filePath, proj);
+			return new AscaScanResultAdaptor(ascaScanResult, filePath, proj);
 		} catch (Exception e) {
 			CxLogger.error(LOG_TAG + " Scan failed: " + e.getMessage(), e);
 			return null;
 		}
 	}
 
+	/**
+	 * Reconciles ignored ASCA entries' line numbers against this scan's raw results, and removes
+	 * ignore entries whose finding is no longer present (e.g. the flagged code was deleted). If a
+	 * user edits a file above an ignored finding, its line shifts - without this, the gutter
+	 * icon/marker for that ignored finding would render at its stale line.
+	 * <p>
+	 * Unlike the other scanners, no second ("full") scan is needed here: ASCA's CLI invocation
+	 * never actually excludes ignored findings (see {@link #getIgnoreFilePath}), so
+	 * {@code rawResults} already contains every vulnerability, including already-ignored ones.
+	 */
+	private void updateIgnoredFileDataOnLatestResult(com.checkmarx.ast.asca.ScanResult rawResults, String filePath,
+			IProject proj) {
+		try {
+			IgnoreManager ignoreManager = IgnoreManager.getInstance(proj);
+			if (!ignoreManager.hasIgnoredEntries(ScanEngine.ASCA)) {
+				return;
+			}
+			if (rawResults != null && rawResults.getScanDetails() != null && !rawResults.getScanDetails().isEmpty()) {
+				AscaScanResultAdaptor unfilteredAdaptor = new AscaScanResultAdaptor(rawResults, filePath, proj, false);
+				ignoreManager.updateLineNumbersForIgnoredEntriesByProblematicLine(unfilteredAdaptor, filePath);
+			} else {
+				ignoreManager.removeIgnoreEntriesForFileIfEmpty(filePath);
+			}
+		} catch (Exception e) {
+			CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored ASCA line numbers: "
+					+ e.getMessage());
+		}
+	}
+
 	/**
 	 * Get file content from document (if available) or from file system.
 	 */
@@ -184,7 +217,7 @@ private Object runAscaScan(String filePath, String fileContent) {
 
 			try {
 				CxLogger.info(LOG_TAG + " Starting ASCA scan: " + filePath);
-				String ignoreFilePath = getIgnoreFilePath();
+				String ignoreFilePath = getIgnoreFilePath(project);
 				Object scanResult = executeAscaScanner(tempFilePath, ignoreFilePath);
 				CxLogger.info(LOG_TAG + " ASCA scan completed");
 				return scanResult;
@@ -208,11 +241,15 @@ private Object executeAscaScanner(String filePath, String ignoreFilePath) {
 
 	/**
 	 * Get ignore file path for ASCA scanning.
-	 * Returns empty string by default - can be extended to read from
-	 * .checkmarxIgnored file.
+	 * Note: matching the JetBrains plugin's behavior, ASCA's CLI invocation does
+	 * not currently accept a working ignore-file exclusion, so this path is
+	 * resolved but intentionally not forwarded to ScanAsca() below - ASCA-ignored
+	 * findings are instead excluded at the app level via
+	 * IgnoreManager/IgnoreFileManager#isIgnored() in the findings tree/decoration
+	 * filtering pipeline.
 	 */
-	private String getIgnoreFilePath() {
-		return "";
+	private String getIgnoreFilePath(IProject project) {
+		return com.checkmarx.eclipse.devassist.utils.DevAssistUtils.getIgnoreFilePath(project);
 	}
 
 	/**
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/containers/ContainerScannerService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/containers/ContainerScannerService.java
index bd3cb02e..6a8bb52a 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/containers/ContainerScannerService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/containers/ContainerScannerService.java
@@ -6,6 +6,7 @@
 import com.checkmarx.eclipse.devassist.common.ScannerConfig;
 import com.checkmarx.eclipse.common.wrapper.WrapperProvider;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.model.ScanIssue;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
@@ -154,12 +155,11 @@ public ScanResult<ContainersRealtimeResults> scan(String filePath, IDocument doc
                 Files.writeString(tempFilePath, fileContent, StandardCharsets.UTF_8);
 
                 CxLogger.info(LOG_TAG + " Start Container Realtime Scan On File: " + filePath);
-                // String ignoreFilePath = DevAssistUtils.getIgnoreFilePath(proj != null ? proj
-                // : this.project);
+                String ignoreFilePath = DevAssistUtils.getIgnoreFilePath(proj != null ? proj : this.project);
 
                 ContainersRealtimeResults scanResults = null;
                 try {
-                    scanResults = wrapperProvider.containersRealtimeScan(tempFilePath.toString(), "");
+                    scanResults = wrapperProvider.containersRealtimeScan(tempFilePath.toString(), ignoreFilePath);
                 } catch (Exception e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -183,28 +183,27 @@ public ScanResult<ContainersRealtimeResults> scan(String filePath, IDocument doc
 
     /**
      * Re-runs scan without ignore settings to calculate line updates for ignored
-     * entries.
+     * entries. If a user edits a file above an ignored container finding, its line shifts -
+     * without this, the gutter icon/marker for that ignored finding would render at its
+     * stale line.
      */
     private void updateIgnoredFileDataOnLatestResult(String tempFilePath, IProject proj, String filePath) {
-        // try {
-        // IgnoreManager ignoreManager = new IgnoreManager(proj);
-        // if (ignoreManager.hasIgnoredEntries(ScanEngine.CONTAINERS)) {
-        // CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for
-        // ignored packages");
-        // ContainersRealtimeResults fullScanResults = CxWrapperFactory.build()
-        // .containersRealtimeScan(tempFilePath, "");
-        //
-        // if (fullScanResults != null) {
-        // ContainerScanResultAdaptor fullScanResultAdaptor = new
-        // ContainerScanResultAdaptor(fullScanResults, this.fileType, filePath);
-        // ignoreManager.updateLineNumbersForIgnoredEntries(fullScanResultAdaptor,
-        // filePath);
-        // }
-        // }
-        // } catch (Exception e) {
-        // CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored file
-        // line numbers: " + e.getMessage());
-        // }
+        try {
+            IgnoreManager ignoreManager = IgnoreManager.getInstance(proj);
+            if (!ignoreManager.hasIgnoredEntries(com.checkmarx.eclipse.devassist.utils.ScanEngine.CONTAINERS)) {
+                return;
+            }
+            CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for ignored packages");
+            ContainersRealtimeResults fullScanResults = wrapperProvider.containersRealtimeScan(tempFilePath, "");
+            if (fullScanResults != null) {
+                ContainerScanResultAdaptor fullScanResultAdaptor =
+                        new ContainerScanResultAdaptor(fullScanResults, this.fileType, filePath);
+                ignoreManager.updateLineNumbersForIgnoredEntries(fullScanResultAdaptor, filePath);
+            }
+        } catch (Exception e) {
+            CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored container line numbers: "
+                    + e.getMessage());
+        }
     }
 
     /**
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScanResultAdaptor.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScanResultAdaptor.java
index 3a6ec5fc..94f97d1b 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScanResultAdaptor.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScanResultAdaptor.java
@@ -165,6 +165,11 @@ private Vulnerability createVulnerability(IacRealtimeResults.Issue iacIssue, Str
 		vulnerability.setTitle(iacIssue.getTitle());
 		vulnerability.setDescription(iacIssue.getDescription());
 		vulnerability.setSeverity(mapSeverity(iacIssue.getSeverity()));
+		vulnerability.setActualValue(iacIssue.getActualValue());
+		vulnerability.setExpectedValue(iacIssue.getExpectedValue());
+		// Per-instance discriminator: lets the ignore key tell apart multiple IaC
+		// vulnerabilities grouped onto the same line (see IgnoreManager#createJsonKeyForIgnoreEntry)
+		vulnerability.setSimilarityId(iacIssue.getSimilarityId());
 
 		CxLogger.info(LOG_TAG + " Created vulnerability '" + iacIssue.getTitle() +
 				"' with vulnerabilityId '" + vulnerabilityId + "'");
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScannerService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScannerService.java
index 2fb5b613..a8db03ef 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScannerService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/iac/IacScannerService.java
@@ -28,6 +28,7 @@
 import com.checkmarx.eclipse.devassist.basescanner.BaseScannerService;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
 import com.checkmarx.eclipse.devassist.common.ScannerConfig;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
 import com.checkmarx.eclipse.devassist.utils.DevAssistUtils;
@@ -144,12 +145,13 @@ public ScanResult<IacRealtimeResults> scan(String filePath, IDocument document,
                     String tempFilePath = saveResult.getLeft().toString();
                     CxLogger.info(LOG_TAG + " Start IAC Realtime Scan On File: " + filePath);
 
-//                    String ignoreFilePath = getIgnoreFilePath(proj);
+                    String containerTool = DevAssistUtils.getContainerTool();
+                    String ignoreFilePath = DevAssistUtils.getIgnoreFilePath(proj);
 
                     IacRealtimeResults scanResults = null;
 					try {
 						scanResults = wrapperProvider
-						        .iacRealtimeScan(tempFilePath, DevAssistUtils.getContainerTool(), "");
+						        .iacRealtimeScan(tempFilePath, containerTool, ignoreFilePath);
 					} catch (Exception e) {
 						// TODO Auto-generated catch block
 						CxLogger.warning(String.format("%s Exception occurred while IAC scan for file %s: %s", LOG_TAG, filePath, e.getMessage()));
@@ -161,8 +163,8 @@ public ScanResult<IacRealtimeResults> scan(String filePath, IDocument document,
 
                     IacScanResultAdaptor scanResultAdaptor = new IacScanResultAdaptor(scanResults, filePath);
 
-                    // Perform secondary scan to sync updated line numbers for ignored issues if needed
-//                    updateIgnoredFileDataOnLatestResult(tempFilePath, proj, filePath);
+                    // Update line numbers for ignored IaC issues if any exist
+                    updateIgnoredFileDataOnLatestResult(tempFilePath, proj, filePath, containerTool);
 
                     return scanResultAdaptor;
                 }
@@ -191,25 +193,28 @@ public ScanResult<IacRealtimeResults> scan(String filePath) {
     }
 
     /**
-     * Performs a full scan without passing the ignore file to update line numbers of ignored entries.
+     * Re-runs the scan without the ignore file to reconcile ignored IaC issues' line numbers
+     * against a fresh, unfiltered result. If a user edits a file above an ignored IaC finding,
+     * its line shifts - without this, the gutter icon/marker for that ignored finding would
+     * render at its stale line.
      */
-    private void updateIgnoredFileDataOnLatestResult(String tempFilePath, IProject proj, String filePath) {
-//        try {
-//            String ignoreFilePath = getIgnoreFilePath(proj);
-//            if (ignoreFilePath != null && !ignoreFilePath.isBlank() && new File(ignoreFilePath).exists()) {
-//                CxLogger.debug(LOG_TAG + " IaC: Performing full scan without ignore file to update line numbers");
-//                
-//                IacRealtimeResults fullScanResults = CxWrapperFactory.build()
-//                        .iacRealtimeScan(tempFilePath, DevAssistUtils.getContainerTool(), "");
-//
-//                if (fullScanResults != null) {
-//                    IacScanResultAdaptor fullScanResultAdaptor = new IacScanResultAdaptor(fullScanResults, fileType, filePath);
-//                    // Hook for updating ignored line markers if IgnoreManager is active
-//                }
-//            }
-//        } catch (IOException | CxException | InterruptedException e) {
-//            CxLogger.warning(LOG_TAG + " RTS-IaC: Exception occurred while performing full scan without ignore file: " + e.getMessage());
-//        }
+    private void updateIgnoredFileDataOnLatestResult(String tempFilePath, IProject proj, String filePath,
+            String containerTool) {
+        try {
+            IgnoreManager ignoreManager = IgnoreManager.getInstance(proj);
+            if (!ignoreManager.hasIgnoredEntries(com.checkmarx.eclipse.devassist.utils.ScanEngine.IAC)) {
+                return;
+            }
+            CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for ignored IaC issues");
+            IacRealtimeResults fullScanResults = wrapperProvider.iacRealtimeScan(tempFilePath, containerTool, "");
+            if (fullScanResults != null) {
+                IacScanResultAdaptor fullScanResultAdaptor = new IacScanResultAdaptor(fullScanResults, filePath);
+                ignoreManager.updateLineNumbersForIgnoredEntries(fullScanResultAdaptor, filePath);
+            }
+        } catch (Exception e) {
+            CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored IaC line numbers: "
+                    + e.getMessage());
+        }
     }
 
     /**
@@ -317,12 +322,4 @@ private String getFileExtension(String filePath) {
         }
         return null;
     }
-
-//    private String getIgnoreFilePath(IProject proj) {
-//        try {
-//            return DevAssistUtils.getIgnoreFilePath(proj);
-//        } catch (Exception e) {
-//            return "";
-//        }
-//    }
 }
\ No newline at end of file
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/oss/OssScannerService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/oss/OssScannerService.java
index f716940e..e7e43766 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/oss/OssScannerService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/oss/OssScannerService.java
@@ -28,6 +28,7 @@
 import com.checkmarx.eclipse.devassist.basescanner.BaseScannerService;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
 import com.checkmarx.eclipse.devassist.common.ScannerConfig;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
 import com.checkmarx.eclipse.devassist.utils.PackageManager;
@@ -123,13 +124,17 @@ public ScanResult<OssRealtimeResults> scanWithDocument(String filePath, IDocumen
 
 				CxLogger.info(LOG_TAG + " Starting Realtime OSS Scan on File: " + filePath);
 
-				OssRealtimeResults scanResults = wrapperProvider.ossRealtimeScan(mainTempPath.get(), "");
+				String ignoreFilePath = com.checkmarx.eclipse.devassist.utils.DevAssistUtils.getIgnoreFilePath(project);
+				OssRealtimeResults scanResults = wrapperProvider.ossRealtimeScan(mainTempPath.get(), ignoreFilePath);
 				if (scanResults == null) {
 					return null;
 				}
 
 				OssScanResultAdaptor scanResultAdaptor = new OssScanResultAdaptor(scanResults, filePath);
 
+				// Update line numbers for ignored packages if any exist
+				updateIgnoredFileDataOnLatestResult(mainTempPath.get(), filePath);
+
 				return scanResultAdaptor;
 
 			} catch (Exception e) {
@@ -143,24 +148,28 @@ public ScanResult<OssRealtimeResults> scanWithDocument(String filePath, IDocumen
 	}
 
 	/**
-	 * Performs full scan without passing ignore file to update line numbers of ignored entries.
+	 * Re-runs the scan without the ignore file to reconcile ignored packages' line numbers
+	 * against a fresh, unfiltered result. If a user edits a file above an ignored package
+	 * finding, its line shifts - without this, the gutter icon/marker for that ignored finding
+	 * would render at its stale line.
 	 */
-//	private void updateIgnoredFileDataOnLatestResult(String tempFilePath, IProject proj, String filePath) {
-//		try {
-//			// Extension point for ignore manager syncing when ignore files are active
-//			String ignoreFilePath = getIgnoreFilePath(proj);
-//			if (ignoreFilePath != null && !ignoreFilePath.isBlank() && new File(ignoreFilePath).exists()) {
-//				CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for ignored packages");
-//				OssRealtimeResults fullScanResults = CxWrapperFactory.build().ossRealtimeScan(tempFilePath, "");
-//				if (fullScanResults != null && fullScanResults.getPackages() != null) {
-//					OssScanResultAdaptor fullScanResultAdaptor = new OssScanResultAdaptor(fullScanResults, filePath);
-//					// Connects with ignore manager line number updater if implemented
-//				}
-//			}
-//		} catch (Exception e) {
-//			CxLogger.warning(LOG_TAG + " Exception occurred while performing full scan without ignore file: " + e.getMessage());
-//		}
-//	}
+	private void updateIgnoredFileDataOnLatestResult(String tempFilePath, String filePath) {
+		try {
+			IgnoreManager ignoreManager = IgnoreManager.getInstance(project);
+			if (!ignoreManager.hasIgnoredEntries(com.checkmarx.eclipse.devassist.utils.ScanEngine.OSS)) {
+				return;
+			}
+			CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for ignored packages");
+			OssRealtimeResults fullScanResults = wrapperProvider.ossRealtimeScan(tempFilePath, "");
+			if (fullScanResults != null && fullScanResults.getPackages() != null) {
+				OssScanResultAdaptor fullScanResultAdaptor = new OssScanResultAdaptor(fullScanResults, filePath);
+				ignoreManager.updateLineNumbersForIgnoredEntries(fullScanResultAdaptor, filePath);
+			}
+		} catch (Exception e) {
+			CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored OSS line numbers: "
+					+ e.getMessage());
+		}
+	}
 
 	/**
 	 * Persists the main manifest file into the temporary directory for scanning.
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/secrets/SecretsScannerService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/secrets/SecretsScannerService.java
index 16886279..8dfa17ec 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/secrets/SecretsScannerService.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/scanners/secrets/SecretsScannerService.java
@@ -27,8 +27,10 @@
 import com.checkmarx.eclipse.devassist.basescanner.BaseScannerService;
 import com.checkmarx.eclipse.devassist.common.ScanResult;
 import com.checkmarx.eclipse.devassist.common.ScannerConfig;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
+import com.checkmarx.eclipse.devassist.utils.DevAssistUtils;
 
 /**
  * Realtime Secrets scanner service for Eclipse.
@@ -131,10 +133,10 @@ public ScanResult<SecretsRealtimeResults> scan(String filePath, IDocument docume
                 }
 
                 CxLogger.info(LOG_TAG + " Starting scan: " + filePath);
-//                String ignoreFilePath = getIgnoreFilePath(proj);
+                String ignoreFilePath = DevAssistUtils.getIgnoreFilePath(proj);
 
                 SecretsRealtimeResults scanResults = wrapperProvider
-                        .secretsRealtimeScan(tempFilePath.get(), "");
+                        .secretsRealtimeScan(tempFilePath.get(), ignoreFilePath);
 
                 if (scanResults == null) {
                     CxLogger.warning(LOG_TAG + " Secrets scanner: no results returned - " + filePath);
@@ -174,27 +176,26 @@ public ScanResult<SecretsRealtimeResults> scan(String filePath) {
     }
 
     /**
-     * Performs a full scan without passing the ignore file to update line numbers of ignored entries.
+     * Performs a full scan without passing the ignore file to update line numbers of ignored
+     * entries. If a user edits a file above an ignored secret, its line shifts - without this,
+     * the gutter icon/marker for that ignored secret would render at its stale line.
      */
     private void updateIgnoredFileDataOnLatestResult(String tempFilePath, IProject proj, String filePath) {
-////        String ignoreFilePath = getIgnoreFilePath(proj);
-//		if (ignoreFilePath != null && !ignoreFilePath.isBlank() && new File(ignoreFilePath).exists()) {
-//		    CxLogger.warning(LOG_TAG + " Secrets: Performing full scan without ignore file to update line numbers");
-//
-//		    SecretsRealtimeResults fullScanResults = null;
-//			try {
-//				fullScanResults = CxWrapperFactory.build()
-//				        .secretsRealtimeScan(tempFilePath, "");
-//			} catch (Exception e) {
-//				// TODO Auto-generated catch block
-//				e.printStackTrace();
-//			}
-//
-//		    if (fullScanResults != null) {
-//		        SecretsScanResultAdaptor fullScanResultAdaptor = new SecretsScanResultAdaptor(fullScanResults, filePath);
-//		        // Hook for updating ignored line markers if IgnoreManager is active
-//		    }
-//		}
+        try {
+            IgnoreManager ignoreManager = IgnoreManager.getInstance(proj);
+            if (!ignoreManager.hasIgnoredEntries(com.checkmarx.eclipse.devassist.utils.ScanEngine.SECRETS)) {
+                return;
+            }
+            CxLogger.info(LOG_TAG + " Performing full scan to update line numbers for ignored secrets");
+            SecretsRealtimeResults fullScanResults = wrapperProvider.secretsRealtimeScan(tempFilePath, "");
+            if (fullScanResults != null) {
+                SecretsScanResultAdaptor fullScanResultAdaptor = new SecretsScanResultAdaptor(fullScanResults, filePath);
+                ignoreManager.updateLineNumbersForIgnoredEntries(fullScanResultAdaptor, filePath);
+            }
+        } catch (Exception e) {
+            CxLogger.warning(LOG_TAG + " Exception occurred while updating ignored secrets line numbers: "
+                    + e.getMessage());
+        }
     }
 
     /**
@@ -295,12 +296,4 @@ private String getFileContent(String filePath, IDocument document) {
         }
         return null;
     }
-
-//    private String getIgnoreFilePath(IProject proj) {
-//        try {
-//            return DevAssistUtils.getIgnoreFilePath(proj);
-//        } catch (Exception e) {
-//            return "";
-//        }
-//    }
 }
\ No newline at end of file
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/telemetry/TelemetryService.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/telemetry/TelemetryService.java
new file mode 100644
index 00000000..536e78f8
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/telemetry/TelemetryService.java
@@ -0,0 +1,200 @@
+package com.checkmarx.eclipse.devassist.telemetry;
+
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+import org.eclipse.core.runtime.Platform;
+
+import com.checkmarx.eclipse.common.utils.CxLogger;
+import com.checkmarx.eclipse.common.wrapper.CxWrapperFactory;
+import com.checkmarx.eclipse.devassist.backend.Constants;
+import com.checkmarx.eclipse.devassist.model.ScanEngine;
+import com.checkmarx.eclipse.devassist.model.ScanIssue;
+
+import static java.lang.String.format;
+
+/**
+ * Telemetry service for logging user interactions with remediation actions
+ * (Fix with CxOne Assist, View Details, Ignore, Ignore All).
+ * Mirrors the JetBrains plugin's TelemetryService: every event is sent
+ * asynchronously via the Checkmarx CLI wrapper's telemetryAIEvent, and a
+ * failure to send is only logged - it never surfaces to the user or blocks
+ * the action being reported on.
+ */
+public final class TelemetryService {
+
+    // AI Provider constant
+    private static final String AI_PROVIDER = "Copilot";
+
+    // Agent name base, matching JetBrains' "Jetbrains <IDE name>" pattern
+    private static final String ECLIPSE_AGENT_NAME = "Eclipse";
+
+    // Event Types
+    private static final String EVENT_TYPE_CLICK = "click";
+
+    // Sub Types
+    private static final String SUB_TYPE_FIX_WITH_AI_CHAT = "fixWithAIChat";
+    private static final String SUB_TYPE_VIEW_DETAILS = "viewDetails";
+    private static final String SUB_TYPE_IGNORE_PACKAGE = "ignorePackage";
+    private static final String SUB_TYPE_IGNORE_ALL = "ignoreAll";
+
+    // Engine Names
+    private static final String ENGINE_OSS = "Oss";
+    private static final String ENGINE_SECRETS = "Secrets";
+    private static final String ENGINE_IAC = "IaC";
+    private static final String ENGINE_ASCA = "Asca";
+    private static final String ENGINE_CONTAINERS = "Containers";
+
+    private TelemetryService() {
+    }
+
+    /**
+     * Sends a user-action ("click") telemetry event.
+     *
+     * @param eventType       the type of event (e.g., "click")
+     * @param subType         the specific action (e.g., "fixWithAIChat", "viewDetails")
+     * @param engine          the scan engine type
+     * @param problemSeverity the severity of the issue
+     */
+    public static void setUserEventDataForLogs(String eventType, String subType, String engine, String problemSeverity) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                CxWrapperFactory.build().telemetryAIEvent(
+                        AI_PROVIDER,      // aiProvider
+                        getAgentName(),   // agent
+                        eventType,        // eventType
+                        subType,          // subType
+                        engine,           // engine
+                        problemSeverity,  // problemSeverity
+                        "",               // scanType
+                        "",               // status
+                        0                 // totalCount
+                );
+            } catch (Exception e) {
+                CxLogger.warning(format("Telemetry: Failed to log user event telemetry for %s - %s", subType, e.getMessage()));
+            }
+        });
+    }
+
+    /**
+     * Logs a user action for a given scan issue.
+     *
+     * @param scanIssue     the scan issue being acted upon
+     * @param actionSubType the specific action sub-type for telemetry
+     * @param actionName    the action name, used only for logging
+     */
+    private static void logUserAction(ScanIssue scanIssue, String actionSubType, String actionName) {
+        if (Objects.isNull(scanIssue)) {
+            CxLogger.warning("Telemetry: Cannot log " + actionName + " action - scan issue is null");
+            return;
+        }
+
+        String engine = mapScanEngineToTelemetryEngine(scanIssue.getScanEngine());
+        String severity = normalizeSeverity(scanIssue.getSeverity());
+
+        setUserEventDataForLogs(EVENT_TYPE_CLICK, actionSubType, engine, severity);
+    }
+
+    /**
+     * Logs user action for "Fix with CxOne Assist".
+     *
+     * @param scanIssue the scan issue being acted upon
+     */
+    public static void logFixWithCxOneAssistAction(ScanIssue scanIssue) {
+        logUserAction(scanIssue, SUB_TYPE_FIX_WITH_AI_CHAT, "Fix with CxOne Assist");
+    }
+
+    /**
+     * Logs user action for "View Details".
+     *
+     * @param scanIssue the scan issue being acted upon
+     */
+    public static void logViewDetailsAction(ScanIssue scanIssue) {
+        logUserAction(scanIssue, SUB_TYPE_VIEW_DETAILS, "View Details");
+    }
+
+    /**
+     * Logs user action for "Ignore this vulnerability".
+     *
+     * @param scanIssue the scan issue being acted upon
+     */
+    public static void logIgnorePackageAction(ScanIssue scanIssue) {
+        logUserAction(scanIssue, SUB_TYPE_IGNORE_PACKAGE, "Ignore Package");
+    }
+
+    /**
+     * Logs user action for "Ignore all of this type".
+     *
+     * @param scanIssue the scan issue being acted upon
+     */
+    public static void logIgnoreAllAction(ScanIssue scanIssue) {
+        logUserAction(scanIssue, SUB_TYPE_IGNORE_ALL, "Ignore All");
+    }
+
+    /**
+     * Maps the model's ScanEngine enum to the telemetry engine string expected
+     * by the backend (matching JetBrains' naming exactly).
+     */
+    private static String mapScanEngineToTelemetryEngine(ScanEngine scanEngine) {
+        if (Objects.isNull(scanEngine)) {
+            return ENGINE_OSS; // default fallback
+        }
+
+        switch (scanEngine) {
+            case OSS:
+                return ENGINE_OSS;
+            case SECRETS:
+                return ENGINE_SECRETS;
+            case IAC:
+                return ENGINE_IAC;
+            case ASCA:
+                return ENGINE_ASCA;
+            case CONTAINERS:
+                return ENGINE_CONTAINERS;
+            default:
+                return ENGINE_OSS; // default fallback
+        }
+    }
+
+    /**
+     * Normalizes severity strings to match the existing Constants format.
+     */
+    private static String normalizeSeverity(String severity) {
+        if (Objects.isNull(severity) || severity.trim().isEmpty()) {
+            return Constants.UNKNOWN;
+        }
+
+        switch (severity.toLowerCase().trim()) {
+            case "critical":
+                return Constants.CRITICAL_SEVERITY;
+            case "high":
+                return Constants.HIGH_SEVERITY;
+            case "medium":
+                return Constants.MEDIUM_SEVERITY;
+            case "low":
+                return Constants.LOW_SEVERITY;
+            case "malicious":
+                return Constants.MALICIOUS_SEVERITY;
+            default:
+                return Constants.UNKNOWN;
+        }
+    }
+
+    /**
+     * Gets the agent name based on the running Eclipse platform version.
+     */
+    private static String getAgentName() {
+        try {
+            String version = Platform.getBundle("org.eclipse.platform") != null
+                    ? Platform.getBundle("org.eclipse.platform").getVersion().toString()
+                    : null;
+            if (version != null) {
+                return ECLIPSE_AGENT_NAME + " " + version;
+            }
+        } catch (Exception e) {
+            CxLogger.warning("Telemetry: Could not determine Eclipse platform version, using default - " + e.getMessage());
+        }
+
+        return ECLIPSE_AGENT_NAME;
+    }
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/CxFindingsView.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/CxFindingsView.java
index 60eb0762..9fc0f884 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/CxFindingsView.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/CxFindingsView.java
@@ -28,13 +28,11 @@
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-
 import com.checkmarx.eclipse.devassist.ui.findings.provider.FindingsContentProvider;
 import com.checkmarx.eclipse.devassist.ui.findings.provider.FindingsLabelProvider;
 import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
@@ -42,21 +40,28 @@
 import com.checkmarx.eclipse.common.preferences.Preferences;
 import com.checkmarx.eclipse.devassist.backend.Constants;
 import com.checkmarx.eclipse.devassist.backend.listener.CheckmarxDocumentListener;
+import com.checkmarx.eclipse.devassist.backend.listener.CheckmarxEditorListener;
 import com.checkmarx.eclipse.devassist.backend.listener.RealTimeScanJob;
 import com.checkmarx.eclipse.devassist.model.ScanIssue;
 import com.checkmarx.eclipse.devassist.ui.findings.model.FileNodeLabel;
 import com.checkmarx.eclipse.devassist.ui.findings.model.ScanDetailWithPath;
 import com.checkmarx.eclipse.devassist.model.Location;
 import com.checkmarx.eclipse.devassist.model.ScanEngine;
+import com.checkmarx.eclipse.devassist.problems.ProblemDecorator;
 import com.checkmarx.eclipse.devassist.problems.ProblemHolderService;
 import com.checkmarx.eclipse.devassist.remediation.RemediationManager;
 import com.checkmarx.eclipse.devassist.ui.findings.actions.VulnerabilityFilterAction;
 import com.checkmarx.eclipse.devassist.ui.findings.actions.VulnerabilityFilterState;
-import com.checkmarx.eclipse.devassist.ui.findings.ignored.IgnoredProblemsStore;
-import com.checkmarx.eclipse.devassist.ui.findings.ignored.IgnoredProblemsStore.IgnoredProblemsListener;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
+import com.checkmarx.eclipse.devassist.telemetry.TelemetryService;
+import com.checkmarx.eclipse.common.utils.CxLogger;
+
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
@@ -70,7 +75,7 @@
  * capabilities.
  * Uses {@link TreeViewer} for flexible tree rendering with custom providers.
  */
-public class CxFindingsView extends ViewPart implements IgnoredProblemsListener {
+public class CxFindingsView extends ViewPart {
 
 	public static final String ID = "com.checkmarx.eclipse.devassist.ui.findings.CxFindingsView";
 	private org.osgi.service.event.EventHandler eventHandler;
@@ -78,7 +83,14 @@ public class CxFindingsView extends ViewPart implements IgnoredProblemsListener
 
 	private TreeViewer treeViewer;
 	private Map<String, List<ScanIssue>> currentIssues = new HashMap<>();
-	private IgnoredProblemsStore ignoredStore;
+	// Files that had at least one active (non-ignored) finding as of the last
+	// applyDecorationsToOpenEditors() pass. Used to detect the "file just lost its
+	// last active finding" transition without having to re-decorate every file
+	// ever tracked in currentIssues on every single refresh - see
+	// applyDecorationsToOpenEditors() for details.
+	private Set<String> lastDecoratedFiles = new HashSet<>();
+	private IgnoreFileManager ignoreFileManager;
+	private IProject currentProject;
 	Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 	public static final Image FINDINGS_PROMOTIONAL_CUBE = createScaledImage("/icons/cx-one-assist-cube.png", 240);
 	private static final Image CHECKMARX_OPEN_SETTINGS_LOGO = AbstractUIPlugin
@@ -105,9 +117,8 @@ public void createPartControl(Composite parent) {
 		// Always subscribe to events first
 		subscribeToEventBroker();
 
-		// Register ignored problems listener
-		ignoredStore = IgnoredProblemsStore.getInstance();
-		ignoredStore.addListener(this);
+		// Initialize ignore file manager lazily when needed
+		ensureIgnoreFileManagerInitialized();
 
 		// Initial render check
 		refreshViewMode();
@@ -174,6 +185,41 @@ private void loadCachedIssues() {
 		}
 	}
 
+	/**
+	 * Ensures IgnoreFileManager is initialized. Called lazily to handle
+	 * cases where projects aren't available at view creation time.
+	 */
+	private void ensureIgnoreFileManagerInitialized() {
+		if (ignoreFileManager == null) {
+			IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+			if (projects.length > 0) {
+				currentProject = projects[0];
+				ignoreFileManager = IgnoreFileManager.getInstance(currentProject);
+			}
+		}
+	}
+
+	/**
+	 * Resolves the owning IProject for a file path.
+	 * Returns the project that owns the file, or null if file not found.
+	 * This per-file resolution replaces the stale currentProject logic.
+	 */
+	private IProject resolveProjectFromFilePath(String filePath) {
+		try {
+			if (filePath == null || filePath.isEmpty()) {
+				return null;
+			}
+			IFile file = ResourcesPlugin.getWorkspace().getRoot()
+					.getFileForLocation(new org.eclipse.core.runtime.Path(filePath));
+			if (file != null && file.exists()) {
+				return file.getProject();
+			}
+		} catch (Exception e) {
+			CxLogger.warning("Failed to resolve project for file: " + filePath);
+		}
+		return null;
+	}
+
 	private Composite openSettingsComposite;
 
 	/**
@@ -387,12 +433,6 @@ public void dispose() {
 			}
 		}
 
-		// 2. Unsubscribe from IgnoredProblemsStore
-		if (ignoredStore != null) {
-			// If your IgnoredProblemsStore supports removing listeners, call it here:
-			// ignoredStore.removeListener(this);
-		}
-
 		super.dispose();
 	}
 
@@ -597,30 +637,33 @@ private void showErrorNotification(String message) {
 
 	/**
 	 * Ignore this specific finding and remove from the Findings View.
-	 * The finding is added to the IgnoredProblemsStore and appears in the Ignored
-	 * Problems Window.
+	 * The finding is added to the IgnoreFileManager and appears in the Ignored
+	 * Findings Window.
 	 */
 	private void ignoreThisFinding(ScanIssue issue) {
-
 		try {
-			// Verify store is initialized
-			if (ignoredStore == null) {
-				System.err.println("[FINDINGS] ERROR: IgnoredProblemsStore is NULL!");
-				showErrorNotification("Error: IgnoredProblemsStore not initialized");
+			if (issue == null) {
+				showErrorNotification("Error: No finding selected");
 				return;
 			}
 
-			// Add to ignored store with full finding details for display in Ignored
-			// Problems View
-			ignoredStore.ignoreProblem(issue);
-
-			// Check if it was actually added
-			boolean isIgnored = ignoredStore.isIgnored(issue.getScanIssueId());
+			// Resolve the project from the issue's file path (per-finding resolution)
+			IProject project = resolveProjectFromFilePath(issue.getFilePath());
+			if (project == null) {
+				showErrorNotification("Error: Could not locate project for this finding");
+				return;
+			}
 
-			// Refresh the tree to remove the ignored finding
+			// Use IgnoreManager to add the issue (matches JetBrains implementation)
+			IgnoreManager ignoreManager = IgnoreManager.getInstance(project);
+			ignoreManager.addIgnoredEntry(issue, DevAssistConstants.QUICK_FIX);
+			TelemetryService.logIgnorePackageAction(issue);
 
+			// Refresh the tree to remove the ignored finding from the view
 			refreshTreeWithFilter();
 
+			CxLogger.info("Successfully ignored finding: " + issue.getTitle());
+
 		} catch (Exception e) {
 			System.err.println("[FINDINGS] ✗ Error ignoring finding: " + e.getMessage());
 			e.printStackTrace();
@@ -632,32 +675,32 @@ private void ignoreThisFinding(ScanIssue issue) {
 	 * Ignore all findings of the same type/package.
 	 * For OSS: ignores all findings with the same package version
 	 * For CONTAINERS: ignores all findings with the same image tag
+	 * Matches JetBrains implementation: addAllIgnoredEntry()
 	 */
 	private void ignoreAllOfType(ScanIssue issue) {
-
 		try {
-			int ignoredCount = 0;
-			String typeIdentifier = issue.getPackageVersion() != null ? issue.getPackageVersion() : issue.getImageTag();
-
-			// Iterate through all current issues and ignore matching ones
-			for (List<ScanIssue> issues : currentIssues.values()) {
-				for (ScanIssue currentIssue : issues) {
-					// Match by same type/package/image
-					if (currentIssue.getScanEngine() == issue.getScanEngine()) {
-						String currentTypeIdentifier = currentIssue.getPackageVersion() != null
-								? currentIssue.getPackageVersion()
-								: currentIssue.getImageTag();
-
-						if (typeIdentifier != null && typeIdentifier.equals(currentTypeIdentifier)) {
-							ignoredStore.ignoreProblem(currentIssue);
-							ignoredCount++;
-						}
-					}
-				}
+			if (issue == null) {
+				showErrorNotification("Error: No finding selected");
+				return;
 			}
 
+			// Resolve the project from the issue's file path (per-finding resolution)
+			IProject project = resolveProjectFromFilePath(issue.getFilePath());
+			if (project == null) {
+				showErrorNotification("Error: Could not locate project for this finding");
+				return;
+			}
+
+			// Use IgnoreManager to add all matching issues (matches JetBrains implementation)
+			IgnoreManager ignoreManager = IgnoreManager.getInstance(project);
+			ignoreManager.addAllIgnoredEntry(issue, DevAssistConstants.QUICK_FIX);
+			TelemetryService.logIgnoreAllAction(issue);
+
+			// Refresh the tree to remove the ignored findings from the view
 			refreshTreeWithFilter();
 
+			CxLogger.info("Successfully ignored all findings of type: " + issue.getTitle());
+
 		} catch (Exception e) {
 			System.err.println("[FINDINGS] ✗ Error ignoring findings of type: " + e.getMessage());
 			e.printStackTrace();
@@ -741,68 +784,40 @@ private void setupRealtimeScanningForFile(org.eclipse.core.resources.IFile file,
 		}
 
 		try {
-			// Extract document for real-time scanning
+			// Delegate registration/dedup to the single, shared CheckmarxEditorListener
+			// (registered once at plugin startup) instead of creating a second,
+			// independent CheckmarxDocumentListener/RealTimeScanJob pair here. Two
+			// independent pairs attached to the same document each debounce and
+			// reschedule scans on their own, colliding on the shared per-file
+			// in-flight lock in DevAssistScanStateHolder - an edit's scan can get
+			// silently BLOCKED by an unrelated duplicate job that is still in-flight,
+			// with nothing left to reschedule it, making scans appear to trigger only
+			// after a further edit.
+			CheckmarxEditorListener sharedListener = CheckmarxEditorListener.getInstance();
 			org.eclipse.jface.text.IDocument document = null;
-			String fileName = file.getName();
-
-			// Try method 1: Direct ITextEditor instance check
-			if (editor instanceof org.eclipse.ui.texteditor.ITextEditor) {
-
-				org.eclipse.ui.texteditor.ITextEditor textEditor = (org.eclipse.ui.texteditor.ITextEditor) editor;
-				document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			}
-
-			// Try method 2: ITextEditor Adapter pattern (for MavenPomEditor, etc.)
-			if (document == null) {
-
-				org.eclipse.ui.texteditor.ITextEditor textEditor = editor
-						.getAdapter(org.eclipse.ui.texteditor.ITextEditor.class);
-				if (textEditor != null) {
-
-					document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-				}
-			}
-
-			// Try method 3: Direct IDocument adapter (some editors provide this directly)
-			if (document == null) {
-
-				document = editor.getAdapter(org.eclipse.jface.text.IDocument.class);
+			if (sharedListener != null) {
+				sharedListener.ensureRealtimeScanningForEditor(editor);
+			} else {
+				// Fallback: shared listener not initialized yet (should not happen once
+				// PluginStartup has run) - register a listener directly so scanning still
+				// works.
+				document = getDocumentFromEditorFallback(editor);
 				if (document != null) {
-
+					String fileName = file.getName();
+					RealTimeScanJob scanJob = new RealTimeScanJob(file, fileName);
+					CheckmarxDocumentListener docListener = new CheckmarxDocumentListener(fileName, scanJob, file, null);
+					document.addDocumentListener(docListener);
 				}
 			}
 
+			// Apply cached decorations if findings exist for this file
+			// Pass the editor directly to avoid search issues with MavenPomEditor
 			if (document == null) {
-
-				return;
+				document = getDocumentFromEditorFallback(editor);
 			}
-
-			// Create a scan job for this file
-			RealTimeScanJob scanJob = new RealTimeScanJob(file, fileName);
-
-			// Create a document listener that reschedules the job on every keystroke
-			com.checkmarx.eclipse.devassist.inspection.DevAssistScanScheduler scheduler = null;
-			if (file != null) {
-				try {
-					org.eclipse.core.resources.IProject project = file.getProject();
-					if (project != null) {
-						scheduler = (com.checkmarx.eclipse.devassist.inspection.DevAssistScanScheduler) project
-								.getSessionProperty(
-										new org.eclipse.core.runtime.QualifiedName("com.checkmarx.eclipse.plugin",
-												"scan-scheduler"));
-					}
-				} catch (Exception e) {
-					// Ignore if scheduler not available
-				}
+			if (document != null) {
+				applyCachedDecorationsForFile(file, document, editor);
 			}
-			CheckmarxDocumentListener docListener = new CheckmarxDocumentListener(fileName, scanJob, file, scheduler);
-
-			// Register the document listener
-			document.addDocumentListener(docListener);
-
-			// Apply cached decorations if findings exist for this file
-			// Pass the editor directly to avoid search issues with MavenPomEditor
-			applyCachedDecorationsForFile(file, document, editor);
 
 		} catch (Exception e) {
 			System.err.println("[REALTIME-SETUP] ✗ EXCEPTION during setup: " + e.getMessage());
@@ -812,10 +827,50 @@ private void setupRealtimeScanningForFile(org.eclipse.core.resources.IFile file,
 		}
 	}
 
+	/**
+	 * Extract the IDocument from an editor, trying the same fallback chain as
+	 * CheckmarxEditorListener (direct ITextEditor, adapter, IDocument adapter) -
+	 * needed here only to feed applyCachedDecorationsForFile(), which requires a
+	 * document even though listener registration itself is now delegated.
+	 */
+	private org.eclipse.jface.text.IDocument getDocumentFromEditorFallback(IEditorPart editor) {
+		if (editor instanceof org.eclipse.ui.texteditor.ITextEditor) {
+			org.eclipse.ui.texteditor.ITextEditor textEditor = (org.eclipse.ui.texteditor.ITextEditor) editor;
+			try {
+				org.eclipse.jface.text.IDocument doc = textEditor.getDocumentProvider()
+						.getDocument(textEditor.getEditorInput());
+				if (doc != null) {
+					return doc;
+				}
+			} catch (Exception e) {
+				// fall through
+			}
+		}
+		org.eclipse.ui.texteditor.ITextEditor textEditor = editor
+				.getAdapter(org.eclipse.ui.texteditor.ITextEditor.class);
+		if (textEditor != null) {
+			try {
+				org.eclipse.jface.text.IDocument doc = textEditor.getDocumentProvider()
+						.getDocument(textEditor.getEditorInput());
+				if (doc != null) {
+					return doc;
+				}
+			} catch (Exception e) {
+				// fall through
+			}
+		}
+		return editor.getAdapter(org.eclipse.jface.text.IDocument.class);
+	}
+
 	/**
 	 * Apply cached decorations (gutter icons, underlines) when editor is opened via
 	 * navigation.
-	 * Uses the provided editor directly instead of searching for it.
+	 *
+	 * Delegates to ProblemDecorator.decorateEditor() (the same entry point used by
+	 * refreshTreeWithFilter()) rather than duplicating annotation-creation logic,
+	 * so this path also gets marker creation, stale-annotation clearing, and the
+	 * "ignored" gutter-icon pass for any .checkmarxIgnored entries on this file -
+	 * matching the JetBrains plugin's restoreGutterIcons()-on-file-open behavior.
 	 */
 	private void applyCachedDecorationsForFile(org.eclipse.core.resources.IFile file,
 			org.eclipse.jface.text.IDocument document,
@@ -842,14 +897,23 @@ private void applyCachedDecorationsForFile(org.eclipse.core.resources.IFile file
 
 			java.util.List<ScanIssue> cachedIssues = problemHolder.getScanIssuesByFile(filePath);
 
-			if (cachedIssues == null || cachedIssues.isEmpty()) {
-
-				return;
+			// Filter to only exclude ignored issues - include OK/UNKNOWN gutter icons
+			// This matches the refreshTreeWithFilter() approach: pass all non-ignored
+			// issues to ProblemDecorator for proper gutter icon decoration
+			IgnoreManager ignoreManager = IgnoreManager.getInstance(project);
+			java.util.List<ScanIssue> activeIssues = new java.util.ArrayList<>();
+			for (ScanIssue issue : cachedIssues) {
+				if (issue == null || issue.getSeverity() == null) {
+					continue;
+				}
+				// Only filter out ignored - keep OK/UNKNOWN for gutter icons
+				if (ignoreManager.isIgnored(issue)) {
+					continue;
+				}
+				activeIssues.add(issue);
 			}
 
-			// Apply decorations directly using the provided editor
-
-			applyDecorationsDirectly(editor, file, cachedIssues);
+			com.checkmarx.eclipse.devassist.problems.ProblemDecorator.decorateEditor(file, activeIssues);
 
 		} catch (Exception e) {
 			System.err.println("[REALTIME-SETUP] Error applying cached decorations: " + e.getMessage());
@@ -857,170 +921,6 @@ private void applyCachedDecorationsForFile(org.eclipse.core.resources.IFile file
 		}
 	}
 
-	/**
-	 * Apply decorations directly to the provided editor without searching for it.
-	 * This avoids issues with MavenPomEditor not being found by IFile comparison.
-	 */
-	private void applyDecorationsDirectly(org.eclipse.ui.IEditorPart editor,
-			org.eclipse.core.resources.IFile file,
-			java.util.List<ScanIssue> scanIssues) {
-		if (editor == null || file == null || scanIssues == null || scanIssues.isEmpty()) {
-			return;
-		}
-
-		try {
-			// Get the text editor
-			org.eclipse.ui.texteditor.ITextEditor textEditor = editor
-					.getAdapter(org.eclipse.ui.texteditor.ITextEditor.class);
-
-			if (textEditor == null) {
-
-				return;
-			}
-
-			// Get document provider and input
-			org.eclipse.ui.texteditor.IDocumentProvider docProvider = textEditor.getDocumentProvider();
-			if (docProvider == null) {
-
-				return;
-			}
-
-			// Get annotation model from the document provider (proper way for all editor
-			// types)
-			org.eclipse.jface.text.source.IAnnotationModel annotationModel = docProvider
-					.getAnnotationModel(textEditor.getEditorInput());
-
-			if (annotationModel == null) {
-
-				return;
-			}
-
-			// Get document from provider
-			org.eclipse.jface.text.IDocument document = docProvider.getDocument(textEditor.getEditorInput());
-
-			if (document == null) {
-
-				return;
-			}
-
-			// Apply each issue's decoration using OSS-specific logic
-			java.util.List<org.eclipse.jface.text.source.Annotation> annotations = new java.util.ArrayList<>();
-
-			for (ScanIssue issue : scanIssues) {
-				try {
-					// Create annotation
-					com.checkmarx.eclipse.devassist.ui.findings.editor.FindingsAnnotation annotation = createAnnotationForIssue(
-							issue);
-
-					if (annotation == null) {
-						continue;
-					}
-
-					// Calculate position (OSS = first line only)
-					org.eclipse.jface.text.Position pos = calculatePositionForIssue(document, issue);
-
-					if (pos != null && pos.getLength() > 0) {
-						annotationModel.addAnnotation(annotation, pos);
-						annotations.add(annotation);
-
-					}
-				} catch (Exception e) {
-					System.err.println("[REALTIME-SETUP-DIRECT] Error decorating issue: " + e.getMessage());
-				}
-			}
-
-		} catch (Exception e) {
-			System.err.println("[REALTIME-SETUP-DIRECT] ✗ Error applying decorations directly: " + e.getMessage());
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create annotation for an issue.
-	 */
-	private com.checkmarx.eclipse.devassist.ui.findings.editor.FindingsAnnotation createAnnotationForIssue(
-			ScanIssue issue) {
-		try {
-			String annotationType = mapSeverityToAnnotationType(issue.getSeverity());
-			return new com.checkmarx.eclipse.devassist.ui.findings.editor.FindingsAnnotation(
-					annotationType,
-					issue.getTitle(),
-					issue.getDescription());
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Map severity to annotation type.
-	 * Handles all 8 severity levels including OK, UNKNOWN, and IGNORED.
-	 */
-	private String mapSeverityToAnnotationType(String severity) {
-		if (severity == null) {
-			return "com.checkmarx.eclipse.findings.unknown";
-		}
-		String upper = severity.toUpperCase();
-		if (upper.contains("MALICIOUS")) {
-			return "com.checkmarx.eclipse.findings.malicious";
-		}
-		if (upper.contains("CRITICAL") || upper.contains("ERROR")) {
-			return "com.checkmarx.eclipse.findings.critical";
-		}
-		if (upper.contains("HIGH")) {
-			return "com.checkmarx.eclipse.findings.high";
-		}
-		if (upper.contains("MEDIUM")) {
-			return "com.checkmarx.eclipse.findings.medium";
-		}
-		if (upper.contains("LOW") || upper.contains("INFO")) {
-			return "com.checkmarx.eclipse.findings.low";
-		}
-		if (upper.contains("UNKNOWN")) {
-			return "com.checkmarx.eclipse.findings.unknown";
-		}
-		if (upper.contains("OK")) {
-			return "com.checkmarx.eclipse.findings.ok";
-		}
-		if (upper.contains("IGNORED")) {
-			return "com.checkmarx.eclipse.findings.ignored";
-		}
-		return "com.checkmarx.eclipse.findings.unknown";
-	}
-
-	/**
-	 * Calculate position for an issue (OSS = first line only).
-	 */
-	private org.eclipse.jface.text.Position calculatePositionForIssue(org.eclipse.jface.text.IDocument document,
-			ScanIssue issue) {
-		try {
-			if (issue.getLocations() == null || issue.getLocations().isEmpty()) {
-				return null;
-			}
-
-			com.checkmarx.eclipse.devassist.model.Location location = issue.getLocations().get(0);
-			int lineNumber = location.getLine() - 1; // 0-based
-
-			int lineCount = document.getNumberOfLines();
-			if (lineNumber < 0 || lineNumber >= lineCount) {
-				return null;
-			}
-
-			org.eclipse.jface.text.IRegion lineInfo = document.getLineInformation(lineNumber);
-			int offset = lineInfo.getOffset();
-			int length = lineInfo.getLength();
-
-			// FIX: Skip leading whitespace to match ProblemDecorator.calculateRange()
-			int trimOffset = getLeadingWhitespaceOffset(document, offset, length);
-			int adjustedOffset = offset + trimOffset;
-			int adjustedLength = Math.max(1, length - trimOffset);
-
-			return new org.eclipse.jface.text.Position(adjustedOffset, adjustedLength);
-
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
 	/**
 	 * Scroll editor to specific line number using native Eclipse ITextEditor
 	 * adapter.
@@ -1127,6 +1027,7 @@ private void showContextMenu(MouseEvent e) {
 			@Override
 			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
 				new RemediationManager().fixWithCxOneAssist(issue, DevAssistConstants.QUICK_FIX);
+				TelemetryService.logFixWithCxOneAssistAction(issue);
 			}
 		});
 
@@ -1138,6 +1039,7 @@ public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
 			@Override
 			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
 				new RemediationManager().viewDetails(issue, DevAssistConstants.QUICK_FIX);
+				TelemetryService.logViewDetailsAction(issue);
 			}
 		});
 
@@ -1196,12 +1098,13 @@ public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
 		menu.setVisible(true);
 	}
 
-	private void refreshTreeWithFilter() {
+	public void refreshTreeWithFilter() {
 
 		// Apply active filters and refresh
 		VulnerabilityFilterState filterState = VulnerabilityFilterState.getInstance();
 
 		Map<String, List<ScanIssue>> filteredIssues = new HashMap<>();
+		Map<String, List<ScanIssue>> decorationIssues = new HashMap<>();
 		int totalAfter = 0;
 
 		for (String filePath : currentIssues.keySet()) {
@@ -1209,7 +1112,11 @@ private void refreshTreeWithFilter() {
 			if (issues == null)
 				continue;
 
+			// Resolve the project for this file path (per-file resolution, not stale currentProject)
+			IProject project = resolveProjectFromFilePath(filePath);
+
 			List<ScanIssue> filtered = new java.util.ArrayList<>();
+			List<ScanIssue> forDecoration = new java.util.ArrayList<>();
 
 			for (ScanIssue issue : issues) {
 				// ✅ Safe null guard FIRST before calling any methods on issue
@@ -1218,24 +1125,26 @@ private void refreshTreeWithFilter() {
 					continue;
 				}
 
-				String issueId = issue.getScanIssueId();
-				boolean isIgnored = ignoredStore != null && ignoredStore.isIgnored(issueId);
+				boolean isIgnored = project != null
+						&& IgnoreManager.getInstance(project).isIgnored(issue);
 				boolean hasFilter = filterState.hasFilter(issue.getSeverity());
 				boolean isProblem = com.checkmarx.eclipse.devassist.utils.DevAssistUtils.isProblem(issue.getSeverity());
 
-				// Filter by OK/UNKNOWN/IGNORED severity (Phase 3)
-				if (!isProblem) {
+				// For decoration: include OK/UNKNOWN gutter icons (only exclude ignored)
+				if (!isIgnored) {
+					forDecoration.add(issue);
+				}
 
+				// Filter by OK/UNKNOWN/IGNORED severity (Phase 3) - for Problems tree only
+				if (!isProblem) {
 					continue;
 				}
 				// Filter by severity preference
 				if (!hasFilter) {
-
 					continue;
 				}
 				// Filter out ignored problems
 				if (isIgnored) {
-
 					continue;
 				}
 
@@ -1246,6 +1155,10 @@ private void refreshTreeWithFilter() {
 				filteredIssues.put(filePath, filtered);
 				totalAfter += filtered.size();
 			}
+
+			if (!forDecoration.isEmpty()) {
+				decorationIssues.put(filePath, forDecoration);
+			}
 		}
 
 		// ✅ Verify treeViewer control before manipulating UI
@@ -1292,18 +1205,41 @@ private void refreshTreeWithFilter() {
 			setPartName(DevAssistConstants.DEVASSIST_TAB);
 		}
 
-		// Apply decorations to open editors for all filtered findings
-		// This ensures annotations are in the annotation model for hover to find them
-		applyDecorationsToOpenEditors(filteredIssues);
+		// Apply decorations to open editors with issues that include OK/UNKNOWN gutter icons
+		// but exclude ignored findings. This ensures:
+		// - Problems tree shows only actual problems (no OK/UNKNOWN)
+		// - Gutter icons appear for OK/UNKNOWN findings in the editor
+		// - Ignored findings have no gutter icon or severity underline
+		applyDecorationsToOpenEditors(decorationIssues);
 	}
 
 	/**
-	 * Apply decorations to all open editors that have findings in filteredIssues.
-	 * This ensures annotations are present in the annotation model when the Findings View
-	 * displays cached results, so hover can find them without waiting for a new scan.
+	 * Apply decorations to open editors for files whose active-finding set needs
+	 * to change: files that currently have active findings, plus files that had
+	 * active findings as of the previous pass but have none now (e.g. every
+	 * finding in the file was just ignored).
+	 *
+	 * Deliberately does NOT iterate every file in {@code currentIssues} (which can
+	 * include every file ever scanned this session, most with nothing to do) -
+	 * every extra call here is a real decorateEditor() invocation that clears and
+	 * rebuilds that file's annotations, so visiting files with no actual state
+	 * change is not just wasted work but, combined with this plugin's existing
+	 * scan-result pipeline firing more than one update per scan, widens the
+	 * window for a stale/racing call to clobber a fresher one's annotations
+	 * ("flicker and lose results"). Restricting the set to only files whose
+	 * active-finding membership actually changed keeps the original
+	 * fully-ignored-file fix while not manufacturing extra no-op calls.
+	 *
+	 * Also ensures annotations are present in the annotation model when the
+	 * Findings View displays cached results, so hover can find them without
+	 * waiting for a new scan.
 	 */
 	private void applyDecorationsToOpenEditors(Map<String, List<ScanIssue>> filteredIssues) {
-		if (filteredIssues == null || filteredIssues.isEmpty()) {
+		Map<String, List<ScanIssue>> effectiveFiltered = filteredIssues != null
+				? filteredIssues
+				: java.util.Collections.emptyMap();
+
+		if (effectiveFiltered.isEmpty() && lastDecoratedFiles.isEmpty()) {
 			return;
 		}
 
@@ -1313,11 +1249,11 @@ private void applyDecorationsToOpenEditors(Map<String, List<ScanIssue>> filtered
 				return;
 			}
 
-			for (String filePath : filteredIssues.keySet()) {
-				List<ScanIssue> issues = filteredIssues.get(filePath);
-				if (issues == null || issues.isEmpty()) {
-					continue;
-				}
+			Set<String> filesToDecorate = new HashSet<>(effectiveFiltered.keySet());
+			filesToDecorate.addAll(lastDecoratedFiles);
+
+			for (String filePath : filesToDecorate) {
+				List<ScanIssue> issues = effectiveFiltered.getOrDefault(filePath, java.util.Collections.emptyList());
 
 				// Find if this file is currently open in an editor
 				try {
@@ -1325,13 +1261,30 @@ private void applyDecorationsToOpenEditors(Map<String, List<ScanIssue>> filtered
 							.getFileForLocation(new org.eclipse.core.runtime.Path(filePath));
 					if (file != null && file.exists()) {
 						// Trigger decoration for this file's open editor (if any)
-						com.checkmarx.eclipse.devassist.problems.ProblemDecorator.decorateEditor(file, issues);
+									ProblemDecorator.decorateEditor(file, issues);
+
+									// Ensure workspace problem markers exist for each issue so the Problems
+									// view shows the findings with the correct severity mapping.
+									try {
+										for (ScanIssue issue : issues) {
+											if (issue == null)
+												continue;
+											// createMarkerForIssue will delegate to MarkerIssueMapper.ensureMarker
+											// which maps Checkmarx severities to Eclipse marker severities
+											createMarkerForIssue(file, issue);
+										}
+									} catch (Exception e) {
+										// Marker creation is best-effort; log and continue decorating other files
+										System.err.println("[FINDINGS] Error ensuring markers for file " + file.getLocation() + ": " + e.getMessage());
+									}
 					}
 				} catch (Exception e) {
 					// Log but continue with other files
 					System.err.println("[FINDINGS] Error decorating file " + filePath + ": " + e.getMessage());
 				}
 			}
+
+			lastDecoratedFiles = new HashSet<>(effectiveFiltered.keySet());
 		} catch (Exception e) {
 			System.err.println("[FINDINGS] Error applying decorations to open editors: " + e.getMessage());
 		}
@@ -1378,31 +1331,4 @@ public TreeViewer getTreeViewer() {
 		return treeViewer;
 	}
 
-	/**
-	 * Listener implementation: called when ignored problems are restored or
-	 * cleared.
-	 */
-	@Override
-	public void onIgnoredProblemsChanged() {
-
-		if (treeViewer != null && treeViewer.getControl() != null && !treeViewer.getControl().isDisposed()) {
-			treeViewer.getControl().getDisplay().asyncExec(this::refreshTreeWithFilter);
-		}
-	}
-
-	private int getLeadingWhitespaceOffset(org.eclipse.jface.text.IDocument document, int lineOffset, int lineLength) {
-		try {
-			String lineText = document.get(lineOffset, lineLength);
-			int count = 0;
-			for (int i = 0; i < lineText.length(); i++) {
-				if (!Character.isWhitespace(lineText.charAt(i)))
-					break;
-				count++;
-			}
-			return count;
-		} catch (Exception e) {
-			return 0;
-		}
-	}
-
 }
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterAction.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterAction.java
index bbe11f49..acda702e 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterAction.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterAction.java
@@ -11,15 +11,21 @@ public abstract class VulnerabilityFilterAction extends Action {
 
     private final String severity;
     private final IFilterChangeListener filterChangeListener;
+    private final VulnerabilityFilterState filterState;
 
     public interface IFilterChangeListener {
         void onFilterChanged();
     }
 
 	public VulnerabilityFilterAction(String severity, IFilterChangeListener listener) {
+		this(severity, listener, VulnerabilityFilterState.getInstance());
+	}
+
+	public VulnerabilityFilterAction(String severity, IFilterChangeListener listener, VulnerabilityFilterState filterState) {
 		super(severity, Action.AS_CHECK_BOX);
 		this.severity = severity;
 		this.filterChangeListener = listener;
+		this.filterState = filterState;
 
 		// Set label with theme-aware styling indicator
 		String label = severity.substring(0, 1).toUpperCase() + severity.substring(1);
@@ -40,12 +46,11 @@ public VulnerabilityFilterAction(String severity, IFilterChangeListener listener
 		setToolTipText(tooltip);
 
 		// Set initial state
-		setChecked(VulnerabilityFilterState.getInstance().hasFilter(severity));
+		setChecked(filterState.hasFilter(severity));
 	}
 
     @Override
     public void run() {
-        VulnerabilityFilterState filterState = VulnerabilityFilterState.getInstance();
         if (isChecked()) {
             filterState.addFilter(severity);
         } else {
@@ -66,29 +71,44 @@ public static class MaliciousFilter extends VulnerabilityFilterAction {
         public MaliciousFilter(IFilterChangeListener listener) {
             super("malicious", listener);
         }
+        public MaliciousFilter(IFilterChangeListener listener, VulnerabilityFilterState filterState) {
+            super("malicious", listener, filterState);
+        }
     }
 
     public static class CriticalFilter extends VulnerabilityFilterAction {
         public CriticalFilter(IFilterChangeListener listener) {
             super("critical", listener);
         }
+        public CriticalFilter(IFilterChangeListener listener, VulnerabilityFilterState filterState) {
+            super("critical", listener, filterState);
+        }
     }
 
     public static class HighFilter extends VulnerabilityFilterAction {
         public HighFilter(IFilterChangeListener listener) {
             super("high", listener);
         }
+        public HighFilter(IFilterChangeListener listener, VulnerabilityFilterState filterState) {
+            super("high", listener, filterState);
+        }
     }
 
     public static class MediumFilter extends VulnerabilityFilterAction {
         public MediumFilter(IFilterChangeListener listener) {
             super("medium", listener);
         }
+        public MediumFilter(IFilterChangeListener listener, VulnerabilityFilterState filterState) {
+            super("medium", listener, filterState);
+        }
     }
 
     public static class LowFilter extends VulnerabilityFilterAction {
         public LowFilter(IFilterChangeListener listener) {
             super("low", listener);
         }
+        public LowFilter(IFilterChangeListener listener, VulnerabilityFilterState filterState) {
+            super("low", listener, filterState);
+        }
     }
 }
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterState.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterState.java
index 9e2b7d21..8c32ca33 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterState.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/actions/VulnerabilityFilterState.java
@@ -5,8 +5,12 @@
 import java.util.Set;
 
 /**
- * Holds filter state (set of severity levels) for the Findings view.
- * Singleton pattern for managing active filters across the application.
+ * Holds filter state (set of severity levels) for a findings view.
+ *
+ * {@link #getInstance()} exposes the shared singleton used by the main
+ * Findings view. Other views (e.g. the Ignored Findings window) that want
+ * their own, independent severity filter - not one that toggles in lockstep
+ * with the main view - can instead construct their own instance directly.
  */
 public class VulnerabilityFilterState {
 
@@ -14,7 +18,7 @@ public class VulnerabilityFilterState {
 
     private final Set<String> selectedFilters = Collections.synchronizedSet(new HashSet<>());
 
-    private VulnerabilityFilterState() {
+    public VulnerabilityFilterState() {
         // Initialize with default filters (all severities)
         selectedFilters.add("malicious");
         selectedFilters.add("critical");
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxAnnotationHover.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxAnnotationHover.java
index 815a020a..a7cfcd70 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxAnnotationHover.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxAnnotationHover.java
@@ -540,8 +540,7 @@ public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
 					CxLogger.error("[HOVER] Error formatting FindingsAnnotation: " + e.getMessage(), e);
 				}
 			}
-			
-//
+
 //				// Collect other linter/annotation messages (JDT, etc.) that aren't handled
 //				// above
 //				String message = annotation.getText();
@@ -632,7 +631,7 @@ private boolean isOnLine(IDocument document, Position position, int lineNumber)
 			return false;
 		}
 	}
-	
+
 	/**
 	 * Holds all theme-dependent colors needed to render a hover popup, resolved
 	 * together via {@link #getHoverColors()} in a single UI-thread round trip.
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxProblemDescriptionFormatter.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxProblemDescriptionFormatter.java
index c5b4b411..806b1856 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxProblemDescriptionFormatter.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/hover/CheckmarxProblemDescriptionFormatter.java
@@ -356,7 +356,7 @@ private void buildRemediationActionsSection(StringBuilder descBuilder, String sc
 				.append(buttonStyle).append(TITLE_FONT_FAMILY).append("'>")
 				.append(DevAssistUtils.getAssistQuickFixName()).append("</a></td>")
 				.append("<td style='padding:0 10px 0 0;margin:0;'>").append("<a href=\"#cxonedevassist/viewdetails")
-				.append(SEPERATOR).append(scanIssueId).append(SEPERATOR).append("\" style='").append(buttonStyle)
+				.append(SEPERATOR).append(scanIssueId).append(SEPERATOR).append(engineName).append("\" style='").append(buttonStyle)
 				.append(TITLE_FONT_FAMILY).append("'>").append(DevAssistConstants.VIEW_DETAILS_FIX_NAME)
 				.append("</a></td>").append("<td style='padding:0 10px 0 0;margin:0;'>")
 				.append("<a href=\"#cxonedevassist/ignorethis").append(SEPERATOR).append(scanIssueId).append(SEPERATOR)
@@ -367,10 +367,10 @@ private void buildRemediationActionsSection(StringBuilder descBuilder, String sc
 			descBuilder.append("<td style='padding:0 5px 0 0;margin:0;'>")
 					.append("<a href=\"#cxonedevassist/ignoreallofthis").append(SEPERATOR).append(scanIssueId)
 					.append(SEPERATOR).append("\" style='").append(buttonStyle).append(TITLE_FONT_FAMILY).append("'>")
-
-					.append(DevAssistConstants.IGNORE_ALL_OF_THIS_TYPE_FIX_NAME);
+					.append(DevAssistConstants.IGNORE_ALL_OF_THIS_TYPE_FIX_NAME)
+					.append("</a></td>");
 		}
-		descBuilder.append("</a></td>").append("</tr></table><br>");
+		descBuilder.append("</tr></table><br>");
 	}
 
 
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/icons/IconRegistry.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/icons/IconRegistry.java
index b5138d10..c477bd9d 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/icons/IconRegistry.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/icons/IconRegistry.java
@@ -95,6 +95,55 @@ private static void initializeRegistry() {
 
         registerIcon("star_action", "icons/start-action.svg");
         registerIcon("devassistBadge", "icons/devassist_badge.svg");
+
+        // Register card icons for ignored findings (package, secret, containers, vulnerability)
+        // Package icons (OSS)
+        registerIcon("card_package_critical", "icons/ignored_card/card-package-critical.svg");
+        registerIcon("card_package_critical_dark", "icons/ignored_card/card-package-critical_dark.svg");
+        registerIcon("card_package_high", "icons/ignored_card/card-package-high.svg");
+        registerIcon("card_package_high_dark", "icons/ignored_card/card-package-high_dark.svg");
+        registerIcon("card_package_medium", "icons/ignored_card/card-package-medium.svg");
+        registerIcon("card_package_medium_dark", "icons/ignored_card/card-package-medium_dark.svg");
+        registerIcon("card_package_low", "icons/ignored_card/card-package-low.svg");
+        registerIcon("card_package_low_dark", "icons/ignored_card/card-package-low_dark.svg");
+        registerIcon("card_package_malicious", "icons/ignored_card/card-package-malicious.svg");
+        registerIcon("card_package_malicious_dark", "icons/ignored_card/card-package-malicious_dark.svg");
+
+        // Secret icons (SECRETS)
+        registerIcon("card_secret_critical", "icons/ignored_card/card-secret-critical.svg");
+        registerIcon("card_secret_critical_dark", "icons/ignored_card/card-secret-critical_dark.svg");
+        registerIcon("card_secret_high", "icons/ignored_card/card-secret-high.svg");
+        registerIcon("card_secret_high_dark", "icons/ignored_card/card-secret-high_dark.svg");
+        registerIcon("card_secret_medium", "icons/ignored_card/card-secret-medium.svg");
+        registerIcon("card_secret_medium_dark", "icons/ignored_card/card-secret-medium_dark.svg");
+        registerIcon("card_secret_low", "icons/ignored_card/card-secret-low.svg");
+        registerIcon("card_secret_low_dark", "icons/ignored_card/card-secret-low_dark.svg");
+        registerIcon("card_secret_malicious", "icons/ignored_card/card-secret-malicious.svg");
+        registerIcon("card_secret_malicious_dark", "icons/ignored_card/card-secret-malicious_dark.svg");
+
+        // Container icons (CONTAINERS)
+        registerIcon("card_containers_critical", "icons/ignored_card/card-containers-critical.svg");
+        registerIcon("card_containers_critical_dark", "icons/ignored_card/card-containers-critical_dark.svg");
+        registerIcon("card_containers_high", "icons/ignored_card/card-containers-high.svg");
+        registerIcon("card_containers_high_dark", "icons/ignored_card/card-containers-high_dark.svg");
+        registerIcon("card_containers_medium", "icons/ignored_card/card-containers-medium.svg");
+        registerIcon("card_containers_medium_dark", "icons/ignored_card/card-containers-medium_dark.svg");
+        registerIcon("card_containers_low", "icons/ignored_card/card-containers-low.svg");
+        registerIcon("card_containers_low_dark", "icons/ignored_card/card-containers-low_dark.svg");
+        registerIcon("card_containers_malicious", "icons/ignored_card/card-containers-malicious.svg");
+        registerIcon("card_containers_malicious_dark", "icons/ignored_card/card-containers-malicious_dark.svg");
+
+        // Vulnerability icons (IAC/ASCA)
+        registerIcon("card_vulnerability_critical", "icons/ignored_card/card-vulnerability-critical.svg");
+        registerIcon("card_vulnerability_critical_dark", "icons/ignored_card/card-vulnerability-critical_dark.svg");
+        registerIcon("card_vulnerability_high", "icons/ignored_card/card-vulnerability-high.svg");
+        registerIcon("card_vulnerability_high_dark", "icons/ignored_card/card-vulnerability-high_dark.svg");
+        registerIcon("card_vulnerability_medium", "icons/ignored_card/card-vulnerability-medium.svg");
+        registerIcon("card_vulnerability_medium_dark", "icons/ignored_card/card-vulnerability-medium_dark.svg");
+        registerIcon("card_vulnerability_low", "icons/ignored_card/card-vulnerability-low.svg");
+        registerIcon("card_vulnerability_low_dark", "icons/ignored_card/card-vulnerability-low_dark.svg");
+        registerIcon("card_vulnerability_malicious", "icons/ignored_card/card-vulnerability-malicious.svg");
+        registerIcon("card_vulnerability_malicious_dark", "icons/ignored_card/card-vulnerability-malicious_dark.svg");
     }
 
     private static void registerIcon(String key, String path) {
@@ -159,4 +208,34 @@ public static Image getIcon(String severity) {
     public static ImageRegistry getRegistry() {
         return imageRegistry;
     }
+
+    /**
+     * Get card icon for a given type and severity (theme-aware).
+     *
+     * @param type     Type of scan (OSS, SECRETS, CONTAINERS, ASCA, IAC)
+     * @param severity Severity level
+     * @return Image instance or null if not found
+     */
+    public static Image getCardIcon(String type, String severity) {
+        if (type == null || severity == null) {
+            return null;
+        }
+
+        String prefix = switch (type.toUpperCase()) {
+            case "OSS" -> "card_package";
+            case "SECRETS" -> "card_secret";
+            case "CONTAINERS" -> "card_containers";
+            case "ASCA", "IAC" -> "card_vulnerability";
+            default -> "card_vulnerability";
+        };
+
+        String key = prefix + "_" + severity.toLowerCase();
+
+        // Append _dark suffix if dark theme is active
+        if (DevAssistUtils.isDarkTheme()) {
+            key += "_dark";
+        }
+
+        return imageRegistry.get(key);
+    }
 }
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignore/DevAssistIgnoredFindings.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignore/DevAssistIgnoredFindings.java
new file mode 100644
index 00000000..c598068a
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignore/DevAssistIgnoredFindings.java
@@ -0,0 +1,899 @@
+package com.checkmarx.eclipse.devassist.ui.findings.ignore;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+import com.checkmarx.eclipse.common.events.SettingsTopics;
+import com.checkmarx.eclipse.common.preferences.Preferences;
+import com.checkmarx.eclipse.common.utils.CxLogger;
+import com.checkmarx.eclipse.devassist.backend.Constants;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreEntry;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager;
+import com.checkmarx.eclipse.devassist.ignore.IgnoreManager;
+import com.checkmarx.eclipse.devassist.ui.findings.actions.VulnerabilityFilterAction;
+import com.checkmarx.eclipse.devassist.ui.findings.actions.VulnerabilityFilterState;
+import com.checkmarx.eclipse.devassist.ui.findings.icons.IconRegistry;
+import com.checkmarx.eclipse.devassist.utils.DateFormatUtil;
+
+/**
+ * Tool window panel for viewing ignored vulnerability findings. Features strict
+ * column alignment, rounded badge styling, dynamic dates, and centered empty
+ * state.
+ */
+public class DevAssistIgnoredFindings extends ViewPart {
+
+	public static final String ID = "com.checkmarx.eclipse.devassist.ui.findings.ignore.DevAssistIgnoredFindings";
+
+	private Composite parentComposite;
+	private Composite container;
+	private Composite openSettingsComposite;
+	private Shell shell;
+	private static final Image CHECKMARX_OPEN_SETTINGS_LOGO = AbstractUIPlugin
+			.imageDescriptorFromPlugin(Constants.MAIN_PLUGIN_ID, "/icons/checkmarx-80.png").createImage();
+	private org.osgi.service.event.EventHandler settingsEventHandler;
+
+	// Top selection action bar
+	private Composite selectionActionBar;
+	private Label selectionCountLabel;
+	private Button clearSelectionButton;
+	private Button reviveSelectedButton;
+
+	// Header row components
+	private Composite headerComposite;
+	private Button selectAllButton;
+	private Label riskHeaderLabel;
+	private Label lastUpdatedHeaderLabel;
+
+	private ScrolledComposite scrolledContainer;
+	private Composite cardsContainer;
+	private Label emptyLabel;
+
+	private IProject currentProject;
+	private IgnoreFileManager ignoreFileManager;
+	private final IgnoreFileManager.IgnoreListener ignoreListener = this::onIgnoreDataUpdated;
+
+	// Independent from VulnerabilityFilterState.getInstance() (used by the main
+	// Findings view) so toggling a severity here doesn't also filter that view.
+	private final VulnerabilityFilterState filterState = new VulnerabilityFilterState();
+
+	private List<IgnoreEntryCard> cards = new ArrayList<>();
+	private Set<IgnoreEntry> selectedEntries = new HashSet<>();
+	private boolean isProgrammaticSelectionChange = false;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		this.parentComposite = parent;
+		this.shell = parent.getShell();
+
+		GridLayout parentLayout = new GridLayout(1, true);
+		parentLayout.marginWidth = 0;
+		parentLayout.marginHeight = 0;
+		parent.setLayout(parentLayout);
+
+		subscribeToSettingsEvents();
+
+		ensureProjectAndIgnoreManager();
+		if (ignoreFileManager != null) {
+			ignoreFileManager.addListener(ignoreListener);
+		}
+
+		refreshViewMode();
+	}
+
+	/**
+	 * Determines which panel to draw based on current credentials status,
+	 * mirroring {@code CxFindingsView#refreshViewMode} - so the Ignored Findings
+	 * window also gates on authentication instead of always showing the ignored
+	 * entries list (or an empty state) while logged out.
+	 */
+	private void refreshViewMode() {
+		if (parentComposite == null || parentComposite.isDisposed()) {
+			return;
+		}
+		if (!Preferences.isAuthenticated()) {
+			drawMissingCredentialsPanel(parentComposite);
+		} else {
+			drawIgnoredFindingsPanel(parentComposite);
+		}
+	}
+
+	/**
+	 * Subscribes to the settings-applied event topic so logging in/out toggles
+	 * between the missing-credentials panel and the ignored-findings list live,
+	 * without requiring the view to be closed and reopened.
+	 */
+	private void subscribeToSettingsEvents() {
+		try {
+			org.eclipse.e4.core.services.events.IEventBroker eventBroker = getSite()
+					.getService(org.eclipse.e4.core.services.events.IEventBroker.class);
+			if (eventBroker == null) {
+				eventBroker = PlatformUI.getWorkbench()
+						.getService(org.eclipse.e4.core.services.events.IEventBroker.class);
+			}
+			if (eventBroker != null) {
+				settingsEventHandler = event -> Display.getDefault().asyncExec(this::refreshViewMode);
+				eventBroker.subscribe(SettingsTopics.TOPIC_APPLY_SETTINGS, settingsEventHandler);
+			}
+		} catch (Exception e) {
+			System.err.println("[IGNORED-FINDINGS] Error subscribing to IEventBroker: " + e.getMessage());
+		}
+	}
+
+	/**
+	 * Renders the missing credentials panel, matching {@code CxFindingsView}'s
+	 * look (logo + Open Settings button) so both views behave consistently while
+	 * logged out.
+	 */
+	private void drawMissingCredentialsPanel(Composite parent) {
+		for (Control child : parent.getChildren()) {
+			child.dispose();
+		}
+		clearToolbarContributions();
+
+		openSettingsComposite = new Composite(parent, SWT.NONE);
+		openSettingsComposite.setLayout(new GridLayout(1, true));
+		openSettingsComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
+
+		Label cxLogo = new Label(openSettingsComposite, SWT.NONE);
+		cxLogo.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));
+		cxLogo.setImage(CHECKMARX_OPEN_SETTINGS_LOGO);
+
+		Button btn = new Button(openSettingsComposite, SWT.NONE);
+		btn.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));
+		btn.setText(Constants.BTN_OPEN_SETTINGS);
+		btn.addListener(SWT.Selection, event -> {
+			PreferenceDialog pref = PreferencesUtil.createPreferenceDialogOn(
+					shell, "com.checkmarx.eclipse.properties.preferencespage", null, null);
+			if (pref != null) {
+				pref.open();
+			}
+		});
+
+		setPartName("Ignored Findings");
+		parent.layout(true, true);
+	}
+
+	/**
+	 * Removes every contribution from the view toolbar - used while the missing
+	 * credentials panel is showing, since the severity filter actions operate on
+	 * an ignored-entries list that isn't rendered in that state.
+	 */
+	private void clearToolbarContributions() {
+		IToolBarManager toolbar = getViewSite().getActionBars().getToolBarManager();
+		toolbar.removeAll();
+		toolbar.update(true);
+		getViewSite().getActionBars().updateActionBars();
+	}
+
+	private void drawIgnoredFindingsPanel(Composite parent) {
+		// Clear out the missing-credentials panel if it was showing
+		for (Control child : parent.getChildren()) {
+			child.dispose();
+		}
+
+		container = new Composite(parent, SWT.NONE);
+		container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		GridLayout containerLayout = new GridLayout(1, false);
+		containerLayout.marginWidth = 12;
+		containerLayout.marginHeight = 10;
+		container.setLayout(containerLayout);
+
+		// -----------------------------------------------------------------
+		// 1. TOP SELECTION ACTION BAR (Visible only when items are selected)
+		// -----------------------------------------------------------------
+		selectionActionBar = new Composite(container, SWT.NONE);
+		GridLayout actionBarLayout = new GridLayout(3, false);
+		actionBarLayout.marginWidth = 0;
+		actionBarLayout.marginHeight = 0;
+		selectionActionBar.setLayout(actionBarLayout);
+
+		GridData actionBarData = new GridData(SWT.FILL, SWT.TOP, true, false);
+		actionBarData.exclude = true;
+		selectionActionBar.setLayoutData(actionBarData);
+		selectionActionBar.setVisible(false);
+
+		selectionCountLabel = new Label(selectionActionBar, SWT.NONE);
+		selectionCountLabel.setText("0 Risk selected  |");
+		selectionCountLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+
+		clearSelectionButton = new Button(selectionActionBar, SWT.PUSH | SWT.FLAT);
+		clearSelectionButton.setText("✕ Clear Selections");
+		clearSelectionButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false));
+		clearSelectionButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				clearAllSelections();
+			}
+		});
+
+		reviveSelectedButton = new Button(selectionActionBar, SWT.PUSH);
+		reviveSelectedButton.setText("« Revive Selected");
+		reviveSelectedButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
+		reviveSelectedButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				reviveSelected();
+			}
+		});
+
+		// -----------------------------------------------------------------
+		// 2. COLUMN HEADERS ROW (Strict Grid Alignment)
+		// -----------------------------------------------------------------
+		headerComposite = new Composite(container, SWT.NONE);
+		GridLayout headerLayout = new GridLayout(4, false);
+		headerLayout.marginWidth = 0;
+		headerLayout.marginHeight = 4;
+		headerLayout.horizontalSpacing = 16;
+		headerComposite.setLayout(headerLayout);
+		headerComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+		// Col 1 Header: Checkbox
+		selectAllButton = new Button(headerComposite, SWT.CHECK);
+		GridData col1HeaderData = new GridData(SWT.LEFT, SWT.CENTER, false, false);
+		selectAllButton.setLayoutData(col1HeaderData);
+		selectAllButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				onSelectAllToggled(selectAllButton.getSelection());
+			}
+		});
+
+		// Col 2 Header: Risk
+		riskHeaderLabel = new Label(headerComposite, SWT.NONE);
+		riskHeaderLabel.setText("Risk");
+		riskHeaderLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+		GridData col2HeaderData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		riskHeaderLabel.setLayoutData(col2HeaderData);
+
+		// Col 3 Header: Last Updated
+		lastUpdatedHeaderLabel = new Label(headerComposite, SWT.NONE);
+		lastUpdatedHeaderLabel.setText("Last Updated");
+		lastUpdatedHeaderLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+		GridData col3HeaderData = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
+		col3HeaderData.widthHint = 110;
+		lastUpdatedHeaderLabel.setLayoutData(col3HeaderData);
+
+		// Col 4 Header: Action Spacer
+		Label reviveHeaderPlaceholder = new Label(headerComposite, SWT.NONE);
+		GridData col4HeaderData = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
+		col4HeaderData.widthHint = 95;
+		reviveHeaderPlaceholder.setLayoutData(col4HeaderData);
+
+		// -----------------------------------------------------------------
+		// 3. EMPTY STATE & SCROLLED CARDS CONTAINER
+		// -----------------------------------------------------------------
+		emptyLabel = new Label(container, SWT.CENTER | SWT.WRAP);
+		emptyLabel.setText("No ignored Findings");
+		emptyLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+		GridData emptyData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
+		emptyLabel.setLayoutData(emptyData);
+
+		scrolledContainer = new ScrolledComposite(container, SWT.V_SCROLL | SWT.H_SCROLL);
+		scrolledContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		scrolledContainer.setExpandHorizontal(true);
+		scrolledContainer.setExpandVertical(true);
+
+		cardsContainer = new Composite(scrolledContainer, SWT.NONE);
+		GridLayout cardLayout = new GridLayout(1, true);
+		cardLayout.marginWidth = 0;
+		cardLayout.marginHeight = 0;
+		cardLayout.verticalSpacing = 16;
+		cardsContainer.setLayout(cardLayout);
+
+		scrolledContainer.setContent(cardsContainer);
+
+		setupToolbar();
+		refreshTable();
+
+		parent.layout(true, true);
+	}
+
+	/**
+	 * Adds severity toggle-filter buttons to the view's toolbar, mirroring
+	 * CxFindingsView's filter UX so ignored entries can be narrowed down by
+	 * severity the same way active findings can.
+	 */
+	private void setupToolbar() {
+		IToolBarManager toolbar = getViewSite().getActionBars().getToolBarManager();
+		toolbar.removeAll();
+
+		VulnerabilityFilterAction.IFilterChangeListener filterListener = this::refreshTable;
+
+		toolbar.add(new VulnerabilityFilterAction.MaliciousFilter(filterListener, filterState));
+		toolbar.add(new VulnerabilityFilterAction.CriticalFilter(filterListener, filterState));
+		toolbar.add(new VulnerabilityFilterAction.HighFilter(filterListener, filterState));
+		toolbar.add(new VulnerabilityFilterAction.MediumFilter(filterListener, filterState));
+		toolbar.add(new VulnerabilityFilterAction.LowFilter(filterListener, filterState));
+
+		toolbar.update(true);
+		getViewSite().getActionBars().updateActionBars();
+	}
+
+	private static int activeFileCount(IgnoreEntry entry) {
+		if (entry.getFiles() == null) {
+			return 0;
+		}
+		return (int) entry.getFiles().stream().filter(IgnoreEntry.FileReference::isActive).count();
+	}
+
+	private void ensureProjectAndIgnoreManager() {
+		if (currentProject == null) {
+			IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+			if (projects.length > 0) {
+				currentProject = projects[0];
+			}
+		}
+		if (currentProject != null && ignoreFileManager == null) {
+			ignoreFileManager = IgnoreFileManager.getInstance(currentProject);
+		}
+	}
+
+	public void refreshTable() {
+		ensureProjectAndIgnoreManager();
+		if (ignoreFileManager == null) {
+			return;
+		}
+
+		ignoreFileManager.refreshFromDisk();
+		List<IgnoreEntry> entries = ignoreFileManager.getAllIgnoreEntries().stream()
+				.filter(entry -> activeFileCount(entry) > 0)
+				.filter(entry -> entry.getSeverity() == null || filterState.hasFilter(entry.getSeverity()))
+				.collect(Collectors.toList());
+
+		if (container == null || container.isDisposed()) {
+			return;
+		}
+
+		reconstructCards(entries);
+
+		boolean hasEntries = !entries.isEmpty();
+		int entryCount = entries.size();
+
+		// Update tab title with count
+		if (hasEntries) {
+			setPartName("Ignored Findings " + entryCount);
+		} else {
+			setPartName("Ignored Findings");
+		}
+
+		emptyLabel.setVisible(!hasEntries);
+		((GridData) emptyLabel.getLayoutData()).exclude = hasEntries;
+
+		scrolledContainer.setVisible(hasEntries);
+		((GridData) scrolledContainer.getLayoutData()).exclude = !hasEntries;
+
+		headerComposite.setVisible(hasEntries);
+		((GridData) headerComposite.getLayoutData()).exclude = !hasEntries;
+
+		if (!hasEntries) {
+			selectAllButton.setSelection(false);
+			selectAllButton.setEnabled(false);
+		} else {
+			selectAllButton.setEnabled(true);
+		}
+
+		container.layout(true, true);
+	}
+
+	private void reconstructCards(List<IgnoreEntry> entries) {
+		for (IgnoreEntryCard card : cards) {
+			card.dispose();
+		}
+		cards.clear();
+		selectedEntries.clear();
+
+		for (Control child : cardsContainer.getChildren()) {
+			child.dispose();
+		}
+
+		for (IgnoreEntry entry : entries) {
+			IgnoreEntryCard card = new IgnoreEntryCard(cardsContainer, entry, this);
+			cards.add(card);
+		}
+
+		cardsContainer.layout(true, true);
+		scrolledContainer.setMinHeight(cardsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
+		updateSelectionStateUI();
+	}
+
+	/**
+	 * Recomputes the scroll area's min height after a card's content changes
+	 * size (e.g. expanding/collapsing the "N more files" link), so the
+	 * ScrolledComposite's scrollbar stays in sync with the actual content height.
+	 */
+	public void relayoutCards() {
+		if (cardsContainer == null || cardsContainer.isDisposed()) {
+			return;
+		}
+		cardsContainer.layout(true, true);
+		scrolledContainer.setMinHeight(cardsContainer.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
+	}
+
+	private void onSelectAllToggled(boolean selectAll) {
+		isProgrammaticSelectionChange = true;
+		try {
+			selectedEntries.clear();
+			for (IgnoreEntryCard card : cards) {
+				card.setSelected(selectAll);
+				if (selectAll) {
+					selectedEntries.add(card.getEntry());
+				}
+			}
+			updateSelectionStateUI();
+		} finally {
+			isProgrammaticSelectionChange = false;
+		}
+	}
+
+	public void onCardSelectionChanged(IgnoreEntry entry, boolean selected) {
+		if (isProgrammaticSelectionChange) {
+			return;
+		}
+
+		if (selected) {
+			selectedEntries.add(entry);
+		} else {
+			selectedEntries.remove(entry);
+		}
+
+		if (selectedEntries.size() == cards.size() && !cards.isEmpty()) {
+			selectAllButton.setSelection(true);
+		} else {
+			selectAllButton.setSelection(false);
+		}
+
+		updateSelectionStateUI();
+	}
+
+	private void clearAllSelections() {
+		onSelectAllToggled(false);
+		selectAllButton.setSelection(false);
+	}
+
+	private void updateSelectionStateUI() {
+		boolean hasSelection = !selectedEntries.isEmpty();
+
+		selectionActionBar.setVisible(hasSelection);
+		((GridData) selectionActionBar.getLayoutData()).exclude = !hasSelection;
+
+		if (hasSelection) {
+			int count = selectedEntries.size();
+			selectionCountLabel.setText(count + (count == 1 ? " Risk selected  |" : " Risks selected  |"));
+		}
+
+		container.layout(true, true);
+	}
+
+	public void onCardRevive(IgnoreEntry entry) {
+		ensureProjectAndIgnoreManager();
+		if (currentProject == null) {
+			return;
+		}
+		IgnoreManager.getInstance(currentProject).reviveSingleEntry(entry);
+		refreshTable();
+	}
+
+	/**
+	 * Navigates to the file (and line, if known) referenced by a file badge on an
+	 * ignore entry card, mirroring the file-badge navigation already implemented
+	 * in the JetBrains plugin's DevAssistIgnoredFindings.
+	 */
+	public void navigateToFile(IgnoreEntry.FileReference file) {
+		ensureProjectAndIgnoreManager();
+		if (file == null || file.getPath() == null || currentProject == null) {
+			return;
+		}
+
+		try {
+			java.nio.file.Path absolutePath = Paths.get(currentProject.getLocation().toOSString(), file.getPath());
+			IFile ifile = ResourcesPlugin.getWorkspace().getRoot()
+					.getFileForLocation(new org.eclipse.core.runtime.Path(absolutePath.toString()));
+
+			if (ifile == null || !ifile.exists()) {
+				showErrorMessage("Could not find file: " + file.getPath());
+				return;
+			}
+
+			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+			IEditorPart editor = IDE.openEditor(page, ifile);
+
+			Integer line = file.getLine();
+			if (line != null && line > 0) {
+				scrollToLine(editor, line);
+			}
+		} catch (Exception e) {
+			showErrorMessage("Failed to open file: " + e.getMessage());
+		}
+	}
+
+	private boolean scrollToLine(IEditorPart editor, int lineNumber) {
+		if (editor == null || lineNumber <= 0) {
+			return false;
+		}
+		try {
+			org.eclipse.ui.texteditor.ITextEditor textEditor = editor
+					.getAdapter(org.eclipse.ui.texteditor.ITextEditor.class);
+			if (textEditor == null && editor instanceof org.eclipse.ui.texteditor.ITextEditor) {
+				textEditor = (org.eclipse.ui.texteditor.ITextEditor) editor;
+			}
+
+			if (textEditor != null) {
+				org.eclipse.ui.texteditor.IDocumentProvider provider = textEditor.getDocumentProvider();
+				if (provider != null) {
+					org.eclipse.jface.text.IDocument document = provider.getDocument(textEditor.getEditorInput());
+					if (document != null && lineNumber <= document.getNumberOfLines()) {
+						int lineOffset = document.getLineOffset(lineNumber - 1);
+						textEditor.selectAndReveal(lineOffset, 0);
+						return true;
+					}
+				}
+			}
+		} catch (Exception e) {
+			CxLogger.error("Failed to scroll to line " + lineNumber, e);
+		}
+		return false;
+	}
+
+	private void showErrorMessage(String message) {
+		if (shell == null || shell.isDisposed()) {
+			return;
+		}
+		MessageBox msgBox = new MessageBox(shell, SWT.ICON_ERROR);
+		msgBox.setMessage(message);
+		msgBox.setText("Checkmarx AI Assist");
+		msgBox.open();
+	}
+
+	private void reviveSelected() {
+		ensureProjectAndIgnoreManager();
+		if (currentProject == null || selectedEntries.isEmpty()) {
+			return;
+		}
+
+		List<IgnoreEntry> entriesToRevive = new ArrayList<>(selectedEntries);
+		IgnoreManager.getInstance(currentProject).reviveMultipleEntries(entriesToRevive);
+		refreshTable();
+	}
+
+	private void onIgnoreDataUpdated() {
+		Display display = container != null && !container.isDisposed() ? container.getDisplay() : Display.getDefault();
+		display.asyncExec(() -> {
+			if (container != null && !container.isDisposed()) {
+				refreshTable();
+			}
+		});
+	}
+
+	@Override
+	public void setFocus() {
+		refreshTable();
+		if (cardsContainer != null && !cardsContainer.isDisposed()) {
+			cardsContainer.setFocus();
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (settingsEventHandler != null) {
+			try {
+				org.eclipse.e4.core.services.events.IEventBroker eventBroker = PlatformUI.getWorkbench()
+						.getService(org.eclipse.e4.core.services.events.IEventBroker.class);
+				if (eventBroker != null) {
+					eventBroker.unsubscribe(settingsEventHandler);
+				}
+			} catch (Exception e) {
+				System.err.println("[IGNORED-FINDINGS] Error unsubscribing from IEventBroker: " + e.getMessage());
+			}
+		}
+		if (ignoreFileManager != null) {
+			ignoreFileManager.removeListener(ignoreListener);
+		}
+		for (IgnoreEntryCard card : cards) {
+			card.dispose();
+		}
+		if (container != null && !container.isDisposed()) {
+			container.dispose();
+		}
+		super.dispose();
+	}
+
+	/**
+	 * Inner class representing a single row card with strict column alignment.
+	 */
+	private static class IgnoreEntryCard {
+		private final Composite cardComposite;
+		private final Button checkboxButton;
+		private final IgnoreEntry entry;
+		private final Font boldFont;
+		private boolean isSelected = false;
+
+		public IgnoreEntryCard(Composite parent, IgnoreEntry entry, DevAssistIgnoredFindings parentView) {
+			this.entry = entry;
+
+			// Row Container
+			cardComposite = new Composite(parent, SWT.NONE);
+			cardComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+			GridLayout layout = new GridLayout(4, false);
+			layout.marginWidth = 0;
+			layout.marginHeight = 4;
+			layout.horizontalSpacing = 16;
+			cardComposite.setLayout(layout);
+
+			// Column 1: Checkbox
+			checkboxButton = new Button(cardComposite, SWT.CHECK);
+			GridData col1Data = new GridData(SWT.LEFT, SWT.TOP, false, false);
+			checkboxButton.setLayoutData(col1Data);
+			checkboxButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					isSelected = checkboxButton.getSelection();
+					parentView.onCardSelectionChanged(entry, isSelected);
+				}
+			});
+
+			// Column 2: Content Container
+			Composite contentComposite = new Composite(cardComposite, SWT.NONE);
+			GridData col2Data = new GridData(SWT.FILL, SWT.FILL, true, false);
+			contentComposite.setLayoutData(col2Data);
+
+			GridLayout contentLayout = new GridLayout(1, false);
+			contentLayout.marginWidth = 0;
+			contentLayout.marginHeight = 0;
+			contentLayout.verticalSpacing = 4;
+			contentComposite.setLayout(contentLayout);
+
+			// Title Line: Icons + Name
+			Composite titleComposite = new Composite(contentComposite, SWT.NONE);
+			titleComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+			GridLayout titleLayout = new GridLayout(3, false);
+			titleLayout.marginWidth = 0;
+			titleLayout.marginHeight = 0;
+			titleLayout.horizontalSpacing = 6;
+			titleComposite.setLayout(titleLayout);
+
+			Image cardIcon = IconRegistry.getCardIcon(
+					entry.getType() != null ? entry.getType().toString() : "VULNERABILITY",
+					entry.getSeverity() != null ? entry.getSeverity() : "MEDIUM");
+			if (cardIcon != null) {
+				Label cardIconLabel = new Label(titleComposite, SWT.NONE);
+				cardIconLabel.setImage(cardIcon);
+			}
+
+			Image severityIcon = IconRegistry.getThemeAwareIcon(
+					entry.getSeverity() != null ? entry.getSeverity() : "MEDIUM", IconRegistry.Size.MEDIUM);
+			if (severityIcon != null) {
+				Label severityIconLabel = new Label(titleComposite, SWT.NONE);
+				severityIconLabel.setImage(severityIcon);
+			}
+
+			Label nameLabel = new Label(titleComposite, SWT.NONE);
+			nameLabel.setText(entry.getPackageName() != null ? entry.getPackageName() : "Unknown Risk");
+			nameLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+			this.boldFont = new Font(parent.getDisplay(), nameLabel.getFont().getFontData()[0].getName(),
+					nameLabel.getFont().getFontData()[0].getHeight(), SWT.BOLD);
+			nameLabel.setFont(boldFont);
+
+			// Description Label
+			Label descLabel = new Label(contentComposite, SWT.WRAP);
+			String desc = entry.getDescription() != null && !entry.getDescription().isEmpty() ? entry.getDescription()
+					: "Description not available";
+			descLabel.setText(desc);
+			descLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+			descLabel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+
+			// Tags Line with Configurable Rounded Badges
+			if (entry.getFiles() != null && !entry.getFiles().isEmpty()) {
+				List<IgnoreEntry.FileReference> activeFiles = entry.getFiles().stream()
+						.filter(IgnoreEntry.FileReference::isActive).collect(Collectors.toList());
+
+				Composite tagsComposite = new Composite(contentComposite, SWT.NONE);
+				tagsComposite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+				// +2 reserves columns for the type badge and the expand/collapse link, in
+				// addition to one column per active file badge.
+				GridLayout tagsLayout = new GridLayout(activeFiles.size() + 2, false);
+				tagsLayout.marginWidth = 0;
+				tagsLayout.marginHeight = 2;
+				tagsLayout.horizontalSpacing = 6;
+				tagsComposite.setLayout(tagsLayout);
+
+				Color tagBorderColor = parent.getDisplay().getSystemColor(SWT.COLOR_GRAY);
+				Color tagTextColor = parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY);
+
+				// Type Badge (Slight rounding: 4px)
+				createFlatBadge(tagsComposite, entry.getType() != null ? entry.getType().toString() : "VULNERABILITY",
+						tagBorderColor, tagTextColor, 4, null);
+
+				// File Badges (Pill style rounding: 10px) - clickable, navigates to the
+				// file (and line, if known), matching the JetBrains plugin's behavior.
+				int visibleCount = Math.min(2, activeFiles.size());
+				for (IgnoreEntry.FileReference file : activeFiles.subList(0, visibleCount)) {
+					createFileBadge(tagsComposite, file, parentView, tagBorderColor, tagTextColor);
+				}
+
+				// "N more" / "see less" expand-collapse link for remaining files, matching
+				// the JetBrains plugin's behavior.
+				if (activeFiles.size() > visibleCount) {
+					List<IgnoreEntry.FileReference> hidden = activeFiles.subList(visibleCount, activeFiles.size());
+					List<Control> expandedControls = new ArrayList<>();
+
+					Link expandLink = new Link(tagsComposite, SWT.NONE);
+					expandLink.setText("<a>+" + hidden.size() + (hidden.size() == 1 ? " more file</a>" : " more files</a>"));
+					expandLink.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+
+					expandLink.addListener(SWT.Selection, e -> {
+						((GridData) expandLink.getLayoutData()).exclude = true;
+						expandLink.setVisible(false);
+
+						for (IgnoreEntry.FileReference file : hidden) {
+							expandedControls
+									.add(createFileBadge(tagsComposite, file, parentView, tagBorderColor, tagTextColor));
+						}
+
+						Link collapseLink = new Link(tagsComposite, SWT.NONE);
+						collapseLink.setText("<a>see less</a>");
+						collapseLink.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+						collapseLink.addListener(SWT.Selection, e2 -> {
+							for (Control c : expandedControls) {
+								c.dispose();
+							}
+							expandedControls.clear();
+							((GridData) expandLink.getLayoutData()).exclude = false;
+							expandLink.setVisible(true);
+							refreshTagsLayout(tagsComposite, parentView);
+						});
+						expandedControls.add(collapseLink);
+
+						refreshTagsLayout(tagsComposite, parentView);
+					});
+				}
+			}
+
+			// Column 3: Dynamic Last Updated Date
+			Label lastUpdatedLabel = new Label(cardComposite, SWT.NONE);
+			String relativeDate = DateFormatUtil.formatRelativeDate(entry.getDateAdded());
+			lastUpdatedLabel.setText(relativeDate);
+			lastUpdatedLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
+			GridData col3Data = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
+			col3Data.widthHint = 110;
+			lastUpdatedLabel.setLayoutData(col3Data);
+
+			// Column 4: Single Revive Button
+			Button reviveButton = new Button(cardComposite, SWT.PUSH);
+			reviveButton.setText("« Revive");
+			GridData col4Data = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
+			col4Data.widthHint = 95;
+			reviveButton.setLayoutData(col4Data);
+
+			reviveButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					parentView.onCardRevive(entry);
+				}
+			});
+		}
+
+		public void setSelected(boolean selected) {
+			this.isSelected = selected;
+			if (checkboxButton != null && !checkboxButton.isDisposed()) {
+				checkboxButton.setSelection(selected);
+			}
+		}
+
+		public IgnoreEntry getEntry() {
+			return entry;
+		}
+
+		public void dispose() {
+			if (boldFont != null && !boldFont.isDisposed()) {
+				boldFont.dispose();
+			}
+			if (cardComposite != null && !cardComposite.isDisposed()) {
+				cardComposite.dispose();
+			}
+		}
+	}
+
+	/**
+	 * Creates a clickable file badge that navigates to the referenced file (and
+	 * line, if known) when clicked.
+	 */
+	private static Composite createFileBadge(Composite parent, IgnoreEntry.FileReference file,
+			DevAssistIgnoredFindings parentView, Color borderColor, Color textColor) {
+		String fileName = file.getPath() != null ? Paths.get(file.getPath()).getFileName().toString() : "unknown";
+		return createFlatBadge(parent, "📄 " + fileName, borderColor, textColor, 10,
+				() -> parentView.navigateToFile(file));
+	}
+
+	/**
+	 * Re-flows the tags row and its ancestors after an expand/collapse toggle,
+	 * and recomputes the scroll area's min height so the ScrolledComposite
+	 * accounts for the new card height.
+	 */
+	private static void refreshTagsLayout(Composite tagsComposite, DevAssistIgnoredFindings parentView) {
+		for (Composite c = tagsComposite; c != null && !c.isDisposed(); c = c.getParent()) {
+			c.layout(true, true);
+		}
+		parentView.relayoutCards();
+	}
+
+	private static Composite createFlatBadge(Composite parent, String text, Color borderColor, Color textColor,
+			int cornerRadius, Runnable onClick) {
+		Composite badgeContainer = new Composite(parent, SWT.NONE);
+		GridLayout containerLayout = new GridLayout(1, false);
+		containerLayout.marginWidth = 6;
+		containerLayout.marginHeight = 2;
+		badgeContainer.setLayout(containerLayout);
+
+		Label label = new Label(badgeContainer, SWT.NONE);
+		label.setText(text);
+		label.setForeground(textColor);
+		label.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+
+		badgeContainer.addPaintListener(e -> {
+			e.gc.setAntialias(SWT.ON);
+			e.gc.setForeground(borderColor);
+
+			int width = badgeContainer.getBounds().width - 1;
+			int height = badgeContainer.getBounds().height - 1;
+
+			e.gc.drawRoundRectangle(0, 0, width, height, cornerRadius, cornerRadius);
+		});
+
+		label.setBackground(badgeContainer.getBackground());
+
+		if (onClick != null) {
+			Cursor handCursor = parent.getDisplay().getSystemCursor(SWT.CURSOR_HAND);
+			badgeContainer.setCursor(handCursor);
+			label.setCursor(handCursor);
+
+			MouseAdapter clickListener = new MouseAdapter() {
+				@Override
+				public void mouseUp(MouseEvent e) {
+					onClick.run();
+				}
+			};
+			badgeContainer.addMouseListener(clickListener);
+			label.addMouseListener(clickListener);
+		}
+
+		return badgeContainer;
+	}
+}
\ No newline at end of file
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignored/IgnoredProblemsStore.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignored/IgnoredProblemsStore.java
deleted file mode 100644
index 94bd402d..00000000
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/ignored/IgnoredProblemsStore.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.checkmarx.eclipse.devassist.ui.findings.ignored;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.osgi.service.prefs.BackingStoreException;
-
-import com.checkmarx.eclipse.devassist.model.ScanIssue;
-
-/**
- * Persistent storage for ignored problems. Uses Eclipse preferences to store
- * ignored problem IDs. Provides thread-safe access to ignored problems list.
- */
-public class IgnoredProblemsStore {
-
-	private static final String PLUGIN_ID = "com.checkmarx.ast.eclipse";
-	private static final String PREF_IGNORED_PROBLEMS = "ignoredProblems";
-	private static final String SEPARATOR = ",";
-
-	private static final IgnoredProblemsStore INSTANCE = new IgnoredProblemsStore();
-	private final Set<String> ignoredProblemIds = Collections.synchronizedSet(new HashSet<>());
-	private final Map<String, ScanIssue> ignoredProblemsCache = Collections.synchronizedMap(new HashMap<>());
-	private final List<IgnoredProblemsListener> listeners = Collections.synchronizedList(new ArrayList<>());
-
-	private IgnoredProblemsStore() {
-		loadFromPreferences();
-	}
-
-	public static IgnoredProblemsStore getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Add a problem to the ignored list (by ID only).
-	 */
-	public void ignoreProblem(String problemId) {
-		if (problemId != null && ignoredProblemIds.add(problemId)) {
-			
-			saveToPreferences();
-			notifyListeners();
-		}
-	}
-
-	/**
-	 * Add a finding to the ignored list with full finding details.
-	 * This allows findings from the Findings View to be properly displayed in the Ignored Problems View.
-	 */
-	public void ignoreProblem(ScanIssue issue) {
-		if (issue != null && issue.getScanIssueId() != null) {
-			
-			ignoreProblem(issue.getScanIssueId());
-			// Cache the full issue details for later retrieval
-			ignoredProblemsCache.put(issue.getScanIssueId(), issue);
-			
-		} else {
-			
-		}
-	}
-
-	/**
-	 * Remove a problem from the ignored list (restore it).
-	 */
-	public void restoreProblem(String problemId) {
-		if (problemId != null && ignoredProblemIds.remove(problemId)) {
-			
-			ignoredProblemsCache.remove(problemId);
-			saveToPreferences();
-			notifyListeners();
-		}
-	}
-
-	/**
-	 * Check if a problem is ignored.
-	 */
-	public boolean isIgnored(String problemId) {
-		return problemId != null && ignoredProblemIds.contains(problemId);
-	}
-
-	/**
-	 * Get all ignored problem IDs.
-	 */
-	public Set<String> getIgnoredProblemIds() {
-		return new HashSet<>(ignoredProblemIds);
-	}
-
-	/**
-	 * Filter a list of issues, returning only non-ignored ones.
-	 */
-	public List<ScanIssue> filterActiveProblems(List<ScanIssue> issues) {
-		List<ScanIssue> active = new ArrayList<>();
-		for (ScanIssue issue : issues) {
-			if (!isIgnored(issue.getScanIssueId())) {
-				active.add(issue);
-			}
-		}
-		return active;
-	}
-
-	/**
-	 * Get only ignored issues from a list.
-	 */
-	public List<ScanIssue> getIgnoredProblems(List<ScanIssue> allIssues) {
-		List<ScanIssue> ignored = new ArrayList<>();
-		for (ScanIssue issue : allIssues) {
-			if (isIgnored(issue.getScanIssueId())) {
-				ignored.add(issue);
-			}
-		}
-		return ignored;
-	}
-
-	/**
-	 * Get all ignored issues including cached findings from the Findings View.
-	 * Combines issues from the provided list with cached issue details.
-	 */
-	public List<ScanIssue> getAllIgnoredProblems(List<ScanIssue> allIssues) {
-		List<ScanIssue> result = new ArrayList<>();
-
-		// First add ignored issues from the provided list
-		if (allIssues != null) {
-			for (ScanIssue issue : allIssues) {
-				if (isIgnored(issue.getScanIssueId())) {
-					result.add(issue);
-				}
-			}
-		}
-
-		// Then add any cached issues not yet in the result (e.g., findings from Findings View)
-		for (Map.Entry<String, ScanIssue> entry : ignoredProblemsCache.entrySet()) {
-			if (isIgnored(entry.getKey()) && !result.stream().anyMatch(i -> i.getScanIssueId().equals(entry.getKey()))) {
-				result.add(entry.getValue());
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Clear all ignored problems.
-	 */
-	public void clearAll() {
-		ignoredProblemIds.clear();
-		ignoredProblemsCache.clear();
-		saveToPreferences();
-		notifyListeners();
-		
-	}
-
-	/**
-	 * Register listener for ignore/restore events.
-	 */
-	public void addListener(IgnoredProblemsListener listener) {
-		if (listener != null) {
-			listeners.add(listener);
-		}
-	}
-
-	/**
-	 * Unregister listener.
-	 */
-	public void removeListener(IgnoredProblemsListener listener) {
-		listeners.remove(listener);
-	}
-
-	private void notifyListeners() {
-		for (IgnoredProblemsListener listener : listeners) {
-			listener.onIgnoredProblemsChanged();
-		}
-	}
-
-	private void loadFromPreferences() {
-		try {
-			IEclipsePreferences prefs = ConfigurationScope.INSTANCE.getNode(PLUGIN_ID);
-			String ignored = prefs.get(PREF_IGNORED_PROBLEMS, "");
-			if (!ignored.isEmpty()) {
-				String[] ids = ignored.split(SEPARATOR);
-				for (String id : ids) {
-					if (!id.trim().isEmpty()) {
-						ignoredProblemIds.add(id.trim());
-					}
-				}
-				
-			}
-		} catch (Exception e) {
-			System.err.println("[IGNORED-STORE] Error loading preferences: " + e.getMessage());
-		}
-	}
-
-	private void saveToPreferences() {
-		try {
-			IEclipsePreferences prefs = ConfigurationScope.INSTANCE.getNode(PLUGIN_ID);
-			String ignored = String.join(SEPARATOR, ignoredProblemIds);
-			prefs.put(PREF_IGNORED_PROBLEMS, ignored);
-			prefs.flush();
-			
-		} catch (BackingStoreException e) {
-			System.err.println("[IGNORED-STORE] Error saving preferences: " + e.getMessage());
-		}
-	}
-
-	public interface IgnoredProblemsListener {
-		void onIgnoredProblemsChanged();
-	}
-}
-
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/marker/MarkerIssueMapper.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/marker/MarkerIssueMapper.java
index d32d5f74..801c7b62 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/marker/MarkerIssueMapper.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/marker/MarkerIssueMapper.java
@@ -230,6 +230,26 @@ public static void ensureMarker(IFile file, ScanIssue issue) {
         }
     }
 
+    /**
+     * Deletes every {@value #MARKER_TYPE} marker on the given file.
+     * Called before re-creating markers for the current (post-filter) issue list so
+     * that findings which were ignored/resolved/filtered out don't leave a stale
+     * gutter icon and Problems-view entry behind - ensureMarker() only ever adds,
+     * it never removes markers for issues no longer present.
+     *
+     * @param file the file to clear markers from
+     */
+    public static void clearAllMarkers(IFile file) {
+        if (file == null || !file.exists()) {
+            return;
+        }
+        try {
+            file.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);
+        } catch (Exception e) {
+            // best-effort
+        }
+    }
+
     /**
      * Finds the existing {@value #MARKER_TYPE} marker for a ScanIssue, matching by
      * the stable
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/provider/FindingsContentProvider.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/provider/FindingsContentProvider.java
index 525d6c0c..e55605da 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/provider/FindingsContentProvider.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/provider/FindingsContentProvider.java
@@ -1,21 +1,22 @@
 package com.checkmarx.eclipse.devassist.ui.findings.provider;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.PlatformUI;
 
-import com.checkmarx.eclipse.devassist.ui.findings.model.FileNodeLabel;
 import com.checkmarx.eclipse.common.utils.CxLogger;
+import com.checkmarx.eclipse.devassist.backend.SeverityLevel;
 import com.checkmarx.eclipse.devassist.model.ScanIssue;
+import com.checkmarx.eclipse.devassist.ui.findings.model.FileNodeLabel;
 import com.checkmarx.eclipse.devassist.ui.findings.model.ScanDetailWithPath;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Content provider for the Findings tree viewer. Implements
  * {@link ITreeContentProvider} to provide hierarchical content structure.
@@ -67,12 +68,28 @@ private Image getFileIcon(String fileName) {
     public Object[] getChildren(Object parentElement) {
         if (parentElement instanceof FileNodeLabel) {
             FileNodeLabel fileNode = (FileNodeLabel) parentElement;
-            return fileNode.getIssues().stream()
+            // Sort issues for this file by severity (most severe first)
+            java.util.List<ScanIssue> sorted = new java.util.ArrayList<>();
+            if (fileNode.getIssues() != null) {
+                sorted.addAll(fileNode.getIssues());
+                sorted.sort((a, b) -> Integer.compare(getSeverityRank(a == null ? null : a.getSeverity()),
+                        getSeverityRank(b == null ? null : b.getSeverity())));
+            }
+
+            return sorted.stream()
                     .map(issue -> new ScanDetailWithPath(issue, fileNode.getFilePath(), fileNode)).toArray();
         }
         return new Object[0];
     }
 
+    /**
+     * Map severity string to an integer rank where lower = more severe.
+     * Unknown/null severities are given a low priority (higher numeric rank).
+     */
+    private int getSeverityRank(String severity) {
+        return SeverityLevel.fromValue(severity).getPrecedence();
+    }
+
     @Override
     public Object getParent(Object element) {
         if (element instanceof ScanDetailWithPath) {
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/CheckmarxMarkerResolutionGenerator.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/CheckmarxMarkerResolutionGenerator.java
index 340d05fe..8cc6d6e2 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/CheckmarxMarkerResolutionGenerator.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/CheckmarxMarkerResolutionGenerator.java
@@ -17,7 +17,6 @@ public IMarkerResolution[] getResolutions(IMarker marker) {
         return new IMarkerResolution[] {
                 new QuickFixRemediationResolution(marker),
                 new ViewFindingDetailsResolution(marker),
-                new IgnoreVulnerabilityResolution(marker),
                 new CopyDetailsResolution(marker)
         };
     }
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/IgnoreVulnerabilityResolution.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/IgnoreVulnerabilityResolution.java
deleted file mode 100644
index 7c8f6818..00000000
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/findings/resolution/IgnoreVulnerabilityResolution.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.checkmarx.eclipse.devassist.ui.findings.resolution;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution2;
-
-import com.checkmarx.eclipse.common.utils.CxLogger;
-import com.checkmarx.eclipse.devassist.model.ScanIssue;
-import com.checkmarx.eclipse.devassist.ui.findings.ignored.IgnoredProblemsStore;
-import com.checkmarx.eclipse.devassist.ui.findings.marker.MarkerIssueMapper;
-import com.checkmarx.eclipse.devassist.utils.DevAssistConstants;
-
-/**
- * Marker resolution that marks a Checkmarx finding as ignored.
- * Mirrors the JetBrains plugin's IgnoreVulnerabilityFix (LocalQuickFix) behavior.
- * Deletes the marker after ignoring so the underline/gutter icon disappears immediately.
- * Implements IMarkerResolution2 for efficient hasResolutions() checks.
- */
-public class IgnoreVulnerabilityResolution implements IMarkerResolution2 {
-
-    private final Image icon;
-
-    public IgnoreVulnerabilityResolution(IMarker marker) {
-        this.icon = ResolutionIconHelper.severityIconForMarker(marker);
-    }
-
-    @Override
-    public String getLabel() {
-        return DevAssistConstants.IGNORE_THIS_VULNERABILITY_FIX_NAME;
-    }
-
-    @Override
-    public String getDescription() {
-        return "Mark this Checkmarx finding as ignored";
-    }
-
-    @Override
-    public Image getImage() {
-        return icon;
-    }
-
-    @Override
-    public void run(IMarker marker) {
-        try {
-            ScanIssue issue = MarkerIssueMapper.fromMarker(marker);
-            if (issue == null) {
-                CxLogger.warning("IgnoreVulnerabilityResolution: could not reconstruct ScanIssue from marker");
-                return;
-            }
-            IgnoredProblemsStore.getInstance().ignoreProblem(issue);
-            if (marker.exists()) {
-                marker.delete();
-            }
-        } catch (Exception e) {
-            CxLogger.error("IgnoreVulnerabilityResolution: failed to ignore finding", e);
-        }
-    }
-}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/preferences/WelcomeDialog.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/preferences/WelcomeDialog.java
index e562d817..8f8c473b 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/preferences/WelcomeDialog.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/ui/preferences/WelcomeDialog.java
@@ -33,7 +33,7 @@
 public class WelcomeDialog extends TitleAreaDialog {
 
 	private static final int DIALOG_WIDTH = 800;
-	private static final int DIALOG_HEIGHT = 530;
+	private static final int DIALOG_HEIGHT = 620;
 	private static final int WRAP_WIDTH = 250;
 	private static final int BULLET_INDENT = 20;
 	private static final int CONTENT_MARGIN = 20;
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DateFormatUtil.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DateFormatUtil.java
new file mode 100644
index 00000000..3e746ab1
--- /dev/null
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DateFormatUtil.java
@@ -0,0 +1,73 @@
+package com.checkmarx.eclipse.devassist.utils;
+
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+import com.checkmarx.eclipse.common.utils.CxLogger;
+
+/**
+ * Utility class for formatting dates as relative time strings.
+ * Formats dates as "Today", "Yesterday", "X days ago", "X weeks ago", etc.
+ */
+public final class DateFormatUtil {
+
+	private DateFormatUtil() {
+		// Private constructor to prevent instantiation
+	}
+
+	/**
+	 * Formats an ISO 8601 date string as a relative date string.
+	 * Supports both Instant format (e.g., "2026-06-24T17:46:28.459238500Z")
+	 * and ZonedDateTime format (e.g., "2022-08-25T12:35:24.722784400+05:30[Asia/Calcutta]")
+	 * Examples: "Today", "1 day ago", "2 weeks ago", "3 months ago"
+	 *
+	 * @param isoDateString ISO 8601 date format string
+	 */
+	public static String formatRelativeDate(String isoDateString) {
+		if (isoDateString == null || isoDateString.isEmpty()) {
+			return "Unknown";
+		}
+
+		try {
+			long days = 0;
+
+			// Try parsing as Instant first (new format: "2026-06-24T17:46:28.459238500Z")
+			if (isoDateString.endsWith("Z")) {
+				java.time.Instant instant = java.time.Instant.parse(isoDateString);
+				days = ChronoUnit.DAYS.between(instant.atZone(java.time.ZoneId.systemDefault()).toLocalDate(),
+						java.time.ZonedDateTime.now().toLocalDate());
+			} else {
+				// Parse as ZonedDateTime (old format: "2022-08-25T12:35:24.722784400+05:30[Asia/Calcutta]")
+				// Remove the zone ID part in brackets if present
+				String dateString = isoDateString;
+				int bracketIndex = isoDateString.indexOf('[');
+				if (bracketIndex > 0) {
+					dateString = isoDateString.substring(0, bracketIndex);
+				}
+
+				ZonedDateTime dateTime = ZonedDateTime.parse(dateString);
+				days = ChronoUnit.DAYS.between(dateTime.toLocalDate(), ZonedDateTime.now().toLocalDate());
+			}
+
+			if (days == 0) {
+				return "Today";
+			} else if (days == 1) {
+				return "Yesterday";
+			} else if (days < 7) {
+				return days + " days ago";
+			} else if (days < 30) {
+				long weeks = days / 7;
+				return weeks + (weeks == 1 ? " week ago" : " weeks ago");
+			} else if (days < 365) {
+				long months = days / 30;
+				return months + (months == 1 ? " month ago" : " months ago");
+			} else {
+				long years = days / 365;
+				return years + (years == 1 ? " year ago" : " years ago");
+			}
+		} catch (Exception e) {
+			CxLogger.warning("DateFormatUtil: Failed to parse date: " + isoDateString + " - " + e.getMessage());
+			return isoDateString;
+		}
+	}
+}
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistConstants.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistConstants.java
index dab7236b..602c3091 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistConstants.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistConstants.java
@@ -81,13 +81,16 @@ private DevAssistConstants() {
             "**/pom.xml",
             // npm
             "**/package.json",
+            "**/yarn.lock",
             // Bower
             "**/bower.json",
             // Python
             "**/requirement*.txt",
+            "**/requirements.txt",
             "**/constraints.txt",
             "**/constraints-*.txt",
             "**/pyproject.toml",
+            "**/poetry.lock",
             "**/setup.cfg",
             "**/setup.py",
             // Go
@@ -100,20 +103,29 @@ private DevAssistConstants() {
             "**/*.sbt",
             // iOS CocoaPods
             "**/Podfile",
+            "**/Podfile.lock",
             "**/*.podspec",
             "**/*.podspec.json",
             // iOS Carthage
             "**/Cartfile",
             "**/Cartfile.private",
+            "**/Cartfile.resolved",
             // Swift Package Manager
             "**/Package.swift",
             "**/Package@swift-*.swift",
+            "**/Package.resolved",
             // Dart/Flutter
             "**/pubspec.yaml",
+            "**/pubspec.lock",
             // Ruby
             "**/Gemfile",
+            "**/Gemfile.lock",
+            // Perl
+            "**/cpanfile",
+            "**/cpanfile.snapshot",
             // PHP Composer
-            "**/composer.json"
+            "**/composer.json",
+            "**/composer.lock"
 	);
 
 	// Container file patterns
diff --git a/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistUtils.java b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistUtils.java
index 7b843f29..9b783f5e 100644
--- a/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistUtils.java
+++ b/devassist-lib/src/com/checkmarx/eclipse/devassist/utils/DevAssistUtils.java
@@ -5,7 +5,6 @@
 import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.Objects;
-
 import org.eclipse.core.resources.IFile;
 import org.eclipse.e4.ui.css.swt.theme.ITheme;
 import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
@@ -24,7 +23,6 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.texteditor.ITextEditor;
-
 import com.checkmarx.eclipse.common.preferences.Preferences;
 import com.checkmarx.eclipse.common.utils.CxLogger;
 import com.checkmarx.eclipse.devassist.backend.SeverityLevel;
@@ -411,6 +409,28 @@ public static boolean isDarkTheme() {
 		return isDarkByBackgroundLuminance();
 	}
 
+	/**
+	 * Returns the CLI-facing ignore file path (the flattened
+	 * ".checkmarxIgnoredTempList.json") for the given project, so realtime
+	 * scanners can pass it to the CxWrapper scan methods and exclude
+	 * already-ignored findings from scan results.
+	 *
+	 * @param project Project whose ignore file path should be resolved
+	 * @return Absolute path to the temp ignore list, or "" if unavailable
+	 */
+	public static String getIgnoreFilePath(org.eclipse.core.resources.IProject project) {
+		if (project == null) {
+			return "";
+		}
+		try {
+			return com.checkmarx.eclipse.devassist.ignore.IgnoreFileManager.getInstance(project)
+					.getTempListPath().toString();
+		} catch (Exception e) {
+			CxLogger.warning(LOG_TAG + " Failed to resolve ignore file path: " + e.getMessage());
+			return "";
+		}
+	}
+
 	private static ITheme getActiveTheme() {
 		try {
 			Display display = Display.getCurrent();
@@ -443,7 +463,7 @@ private static boolean isDarkByBackgroundLuminance() {
 				/ 255.0;
 		return luminance < 0.5;
 	}
-	
+
 	/**
 	 * Returns the container tool configured in the global settings.
 	 * @return