diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt
index 3c5c07e..8c1695f 100644
--- a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt
+++ b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeAction.kt
@@ -41,12 +41,18 @@ abstract class AnalyzeAction : AbstractAction() {
     }
 
     private fun analyze(context: DataContext, project: Project) {
-        // try to get the file/folder from context, otherwise check if they can be retrieved from the opened editor
-        val file: VirtualFile? = PlatformDataKeys.VIRTUAL_FILE.getData(context).let {
-            it ?: project.let { it1 ->
-                FileEditorManager.getInstance(it1).selectedEditor?.file
+        // If analyzeFileOpenedInEditor is true, use the file opened in the editor. Else it will try to
+        // get the file/folder from context, otherwise check if they can be retrieved from the opened editor.
+        val file: VirtualFile? = analyzeFileOpenedInEditor().let {
+            if (it) {
+                FileEditorManager.getInstance(project).selectedEditor?.file
+            } else {
+                PlatformDataKeys.VIRTUAL_FILE.getData(context).let {virtualFile ->
+                    virtualFile ?: FileEditorManager.getInstance(project).selectedEditor?.file
+                }
             }
         }
+
         if (isFileRequired() && file == null) {
             showErrorMessageDialog(
                 ErrorMessages.NO_ACTIVE_FILE
@@ -88,4 +94,6 @@ abstract class AnalyzeAction : AbstractAction() {
     protected abstract fun getTicsCommand(file: VirtualFile?, project: Project?): GeneralCommandLine
 
     protected abstract fun isFileRequired(): Boolean
+
+    protected abstract fun analyzeFileOpenedInEditor(): Boolean
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt
index 079709a..9878db2 100644
--- a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt
+++ b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFile.kt
@@ -23,4 +23,8 @@ open class AnalyzeFile : AnalyzeAction() {
     override fun isFileRequired(): Boolean {
         return true
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return true
+    }
 }
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt
index 2623d2d..45f3ffb 100644
--- a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt
+++ b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeFileOrFolder.kt
@@ -18,4 +18,8 @@ class AnalyzeFileOrFolder : AnalyzeFile() {
 
         super.update(e)
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return false
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt
index d084f07..6d978f7 100644
--- a/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt
+++ b/src/main/kotlin/com/tiobe/plugins/intellij/actions/AnalyzeProject.kt
@@ -24,4 +24,8 @@ class AnalyzeProject : AnalyzeAction() {
     override fun isFileRequired(): Boolean {
         return false
     }
+
+    override fun analyzeFileOpenedInEditor(): Boolean {
+        return false
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/icons/filter-outline.png b/src/main/resources/icons/filter-outline.png
deleted file mode 100644
index 9c68672..0000000
Binary files a/src/main/resources/icons/filter-outline.png and /dev/null differ
diff --git a/src/main/resources/icons/filter.png b/src/main/resources/icons/filter.png
deleted file mode 100644
index 04b56e9..0000000
Binary files a/src/main/resources/icons/filter.png and /dev/null differ
diff --git a/src/main/resources/icons/tics-config-solid_dark.svg b/src/main/resources/icons/tics-config-solid_dark.svg
new file mode 100644
index 0000000..62f45e6
--- /dev/null
+++ b/src/main/resources/icons/tics-config-solid_dark.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333333"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="tics-config-solid_dark.svg"
+   inkscape:export-filename="tics-gear.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     shape-rendering="auto"
+     showgrid="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-2.9389126"
+     inkscape:cy="13.545514"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2"><inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0"
+       originy="0"
+       spacingx="0.26458332"
+       spacingy="0.26458333"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true"
+       enabled="true" /></sodipodi:namedview><defs
+     id="defs1"><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect4"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1"
+       radius="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1"
+       radius="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><g
+       style="fill:none"
+       id="g1"
+       transform="scale(0.26458333)"><g
+         id="g2"
+         transform="translate(-1.0278386)"><path
+           id="rect1"
+           style="fill:#287ac8;stroke-width:2.43967;stroke-linejoin:round;fill-opacity:1"
+           d="M 11.027839 10 L 11.027839 11 L 13.027839 11 L 13.027839 15 L 14.027839 15 L 14.027839 11 L 16.027839 11 L 16.027839 10 L 14.027839 10 L 13.027839 10 L 11.027839 10 z " /></g><path
+         style="fill:#afb1b3;stroke-width:0.0678654;stroke-linecap:square;paint-order:stroke fill markers"
+         d="M 2.3970539,14.905407 C 2.3144435,14.883192 2.1829049,14.830784 2.104746,14.788946 1.9084127,14.683849 1.5352718,14.304316 1.441459,14.114297 1.2233596,13.672533 1.2287132,13.177607 1.4559758,12.772263 1.5683216,12.571883 3.0822995,11.010315 5.7849932,8.3071666 L 7.7361149,6.3557169 7.6426755,6.0661392 C 7.4934515,5.6036799 7.4512099,5.2802932 7.4690646,4.7370395 7.4778706,4.4691148 7.5033421,4.1880513 7.5293814,4.0714808 7.7163953,3.234272 8.1308604,2.5425211 8.7970766,1.9556709 9.5316024,1.3086486 10.276142,1.0202487 11.205137,1.0228999 c 0.432824,0.00124 0.638842,0.027374 1.075353,0.1364388 l 0.295866,0.073923 0.1768,0.7802983 -2.069723,2.1693493 1.231531,1.2315312 2.103282,-2.1027364 0.765726,0.178826 0.04127,0.1419612 c 0.132033,0.4541767 0.184871,1.1492877 0.125839,1.6554701 -0.197527,1.6937382 -1.429328,3.03572 -3.084221,3.3600947 -0.163174,0.031984 -0.382635,0.048073 -0.661727,0.048513 -0.473344,7.469e-4 -0.75339,-0.043868 -1.186978,-0.1891009 L 9.7467124,8.4165457 9.2649347,8.9193741 C 8.4545627,9.7651545 5.299134,12.931144 4.3860913,13.814547 3.9122489,14.273007 3.4688583,14.686434 3.4007789,14.733274 3.114833,14.93001 2.7324194,14.995592 2.3970539,14.905407 Z"
+         id="path5"
+         sodipodi:nodetypes="ssssscsssscsccccccssssscssss" /></g></g></svg>
diff --git a/src/main/resources/icons/tics-file-solid_dark.svg b/src/main/resources/icons/tics-file-solid_dark.svg
new file mode 100644
index 0000000..bf44957
--- /dev/null
+++ b/src/main/resources/icons/tics-file-solid_dark.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333333"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="tics-file-solid_dark.svg"
+   inkscape:export-filename="tics-file.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     shape-rendering="auto"
+     showgrid="true"
+     inkscape:zoom="25.4"
+     inkscape:cx="4.9409449"
+     inkscape:cy="15.334646"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"><inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0"
+       originy="0"
+       spacingx="0.26458332"
+       spacingy="0.26458333"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true"
+       enabled="true" /></sodipodi:namedview><defs
+     id="defs1"><inkscape:path-effect
+       effect="powerclip"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialogue if no flatten result after convert clip to paths." /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1"
+       radius="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect1"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1 @ F,0,0,1,0,0.26458333,0,1"
+       radius="1"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" /><filter
+       id="mask-powermask-path-effect3_inverse"
+       inkscape:label="filtermask-powermask-path-effect3"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50"><feColorMatrix
+         id="mask-powermask-path-effect3_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" /><feColorMatrix
+         id="mask-powermask-path-effect3_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" /></filter></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><path
+       id="path3"
+       style="clip-rule:evenodd;display:inline;fill:#afb1b3;fill-rule:evenodd"
+       d="M 1.0583333,0.26458333 0.79375,0.52916667 V 3.7041667 L 1.0583333,3.96875 H 2.9104167 V 3.175 H 2.38125 V 2.38125 H 3.7041667 V 1.3229167 L 3.6276857,1.1348145 2.8339357,0.34106445 2.6458335,0.26458335 Z m 1.5875,0.26458334 0.79375,0.79375003 h -0.79375 z"
+       sodipodi:nodetypes="cccccccccccccccccc" /><path
+       id="rect1"
+       style="display:inline;fill:#287ac8;fill-opacity:1;stroke-width:2.43967;stroke-linejoin:round"
+       d="m 11,10 v 1 h 2 v 4 h 1 v -4 h 2 v -1 h -2 -1 z"
+       transform="matrix(0.26458333,0,0,0.26458333,-0.26458329,0)" /></g></svg>