diff --git a/src/main/kotlin/asset/MixinAssets.kt b/src/main/kotlin/asset/MixinAssets.kt
index d2f7e2070..bc1763610 100644
--- a/src/main/kotlin/asset/MixinAssets.kt
+++ b/src/main/kotlin/asset/MixinAssets.kt
@@ -22,11 +22,11 @@ package com.demonwav.mcdev.asset
 
 @Suppress("unused")
 object MixinAssets : Assets() {
-    val SHADOW = loadIcon("/assets/icons/mixin/shadow.png")
-    val SHADOW_DARK = loadIcon("/assets/icons/mixin/shadow_dark.png")
+    val MIXIN_ELEMENT_ICON = loadIcon("/assets/icons/mixin/mixin_element.svg")
+    val MIXIN_ELEMENT_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_element_dark.svg")
 
-    val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.png")
-    val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.png")
+    val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.svg")
+    val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.svg")
 
     val MIXIN_MARK = loadIcon("/assets/icons/mixin/mixin_mark.svg")
 }
diff --git a/src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt b/src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt
similarity index 96%
rename from src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt
rename to src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt
index 10775da10..ed4d1d257 100644
--- a/src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt
+++ b/src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt
@@ -43,10 +43,10 @@ import com.intellij.ui.awt.RelativePoint
 import com.intellij.util.PsiNavigateUtil
 import java.awt.event.MouseEvent
 
-class MixinTargetLineMarkerProvider : LineMarkerProviderDescriptor() {
+class MixinElementLineMarkerProvider : LineMarkerProviderDescriptor() {
 
-    override fun getName() = "Mixin target line marker"
-    override fun getIcon() = MixinAssets.SHADOW
+    override fun getName() = "Mixin element line marker"
+    override fun getIcon() = MixinAssets.MIXIN_ELEMENT_ICON
 
     override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<PsiIdentifier>? {
         if (element !is PsiMember) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 1ccef2c3a..2a63ecc5b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -740,7 +740,7 @@
         <codeInsight.lineMarkerProvider language="JAVA"
                                         implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="JAVA"
-                                        implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinTargetLineMarkerProvider"/>
+                                        implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinElementLineMarkerProvider"/>
 
 
         <customJavadocTagProvider implementation="com.demonwav.mcdev.platform.mixin.MixinCustomJavaDocTagProvider"/>
diff --git a/src/main/resources/assets/icons/mixin/mixin_class_gutter.png b/src/main/resources/assets/icons/mixin/mixin_class_gutter.png
deleted file mode 100644
index 854b10b13..000000000
Binary files a/src/main/resources/assets/icons/mixin/mixin_class_gutter.png and /dev/null differ
diff --git a/src/main/resources/assets/icons/mixin/mixin_class_gutter.svg b/src/main/resources/assets/icons/mixin/mixin_class_gutter.svg
new file mode 100644
index 000000000..7def4d790
--- /dev/null
+++ b/src/main/resources/assets/icons/mixin/mixin_class_gutter.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg3"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3" /><path
+     id="path3"
+     style="fill:#353535;fill-opacity:1;stroke:none;stroke-width:0.291062"
+     d="M 8.4570312,0.1015625 C 8.0667821,0.1076125 7.7699879,0.09739922 7.4337262,0.09891419 L 4.3219676,0.11293365 C 3.5245406,0.11652632 2.4640081,0.16426228 1.9296875,0.78320312 1.2529807,1.5670557 1.3178793,2.6373345 1.3178793,3.568707 c 0,1.1146452 -0.2036883,2.8146071 0.3696207,3.9449649 0.3710517,0.552022 0.7978251,0.7947431 1.353516,1.0507812 0.3024599,0.075347 0.5812026,0.097656 0.8945313,0.097656 v 3.7929689 c -0.8926515,0.0211 -1.0566407,0.810617 -1.0566407,1.458984 0,0.295148 -0.065313,0.664165 0.027344,0.949219 0.2042095,0.628238 0.8095258,0.936762 1.5175781,0.875 1.1314874,-0.09871 1.0566407,-1.059649 1.0566407,-1.824219 0,-0.652393 -0.03473,-1.436795 -0.9746094,-1.458984 V 8.6621094 h 6.990235 c 1.058706,0 2.280589,0.1566394 3.171875,-0.4628906 0.445045,-0.3093531 0.600444,-0.741017 0.703125,-1.2148438 0.09523,-0.4394655 0.12888,-1.2627236 0.109053,-1.7795556 C 15.386815,2.2899824 13.915028,2.04222 11.416016,1.9511719 11.409219,1.7252925 11.355973,1.5102101 11.279297,1.2949219 10.883979,0.18449052 9.6277812,0.08281621 8.4570312,0.1015625 Z M 9.6269531,1.0273438 C 10.711147,1.2570511 10.785392,2.9445819 9.7070311,3.2402344 9.2584469,3.3632282 8.6037931,3.3477887 8.1360236,3.3477887 H 4.8020392 c -0.5274254,0 -1.2736018,0.044055 -1.7610236,-0.1563828 C 2.051214,2.7843342 2.3141643,1.1711551 3.3671875,1.0136719 3.781643,0.95171314 4.2754849,0.93626914 4.6960077,0.93185577 l 2.6716598,-0.0280389 c 0.7103282,-0.007455 1.7086866,0.006937 2.2592856,0.12352693 z" /></svg>
diff --git a/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.png b/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.png
deleted file mode 100644
index be892c518..000000000
Binary files a/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.png and /dev/null differ
diff --git a/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg b/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg
new file mode 100644
index 000000000..1c718e0bb
--- /dev/null
+++ b/src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg3"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3" /><path
+     id="path3"
+     style="fill:#e5a822;stroke:none;stroke-width:0.291062"
+     d="M 8.4570312,0.1015625 C 8.0667821,0.1076125 7.7699879,0.09739922 7.4337262,0.09891419 L 4.3219676,0.11293365 C 3.5245406,0.11652632 2.4640081,0.16426228 1.9296875,0.78320312 1.2529807,1.5670557 1.3178793,2.6373345 1.3178793,3.568707 c 0,1.1146452 -0.2036883,2.8146071 0.3696207,3.9449649 0.3710517,0.552022 0.7978251,0.7947431 1.353516,1.0507812 0.3024599,0.075347 0.5812026,0.097656 0.8945313,0.097656 v 3.7929689 c -0.8926515,0.0211 -1.0566407,0.810617 -1.0566407,1.458984 0,0.295148 -0.065313,0.664165 0.027344,0.949219 0.2042095,0.628238 0.8095258,0.936762 1.5175781,0.875 1.1314874,-0.09871 1.0566407,-1.059649 1.0566407,-1.824219 0,-0.652393 -0.03473,-1.436795 -0.9746094,-1.458984 V 8.6621094 h 6.990235 c 1.058706,0 2.280589,0.1566394 3.171875,-0.4628906 0.445045,-0.3093531 0.600444,-0.741017 0.703125,-1.2148438 0.09523,-0.4394655 0.12888,-1.2627236 0.109053,-1.7795556 C 15.386815,2.2899824 13.915028,2.04222 11.416016,1.9511719 11.409219,1.7252925 11.355973,1.5102101 11.279297,1.2949219 10.883979,0.18449052 9.6277812,0.08281621 8.4570312,0.1015625 Z M 9.6269531,1.0273438 C 10.711147,1.2570511 10.785392,2.9445819 9.7070311,3.2402344 9.2584469,3.3632282 8.6037931,3.3477887 8.1360236,3.3477887 H 4.8020392 c -0.5274254,0 -1.2736018,0.044055 -1.7610236,-0.1563828 C 2.051214,2.7843342 2.3141643,1.1711551 3.3671875,1.0136719 3.781643,0.95171314 4.2754849,0.93626914 4.6960077,0.93185577 l 2.6716598,-0.0280389 c 0.7103282,-0.007455 1.7086866,0.006937 2.2592856,0.12352693 z" /></svg>
diff --git a/src/main/resources/assets/icons/mixin/mixin_element.svg b/src/main/resources/assets/icons/mixin/mixin_element.svg
new file mode 100644
index 000000000..428e0c7d1
--- /dev/null
+++ b/src/main/resources/assets/icons/mixin/mixin_element.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="14"
+   height="14"
+   viewBox="0 0 3.7041666 3.7041666"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><ellipse
+       style="fill:none;fill-opacity:0.996078;stroke:#353535;stroke-width:0.483435;stroke-dasharray:none;stroke-opacity:0.996078"
+       id="path4"
+       cx="1.8463329"
+       cy="1.8578337"
+       rx="1.6043483"
+       ry="1.6043482" /><path
+       style="fill:#e9b034;fill-opacity:0.996078;stroke:#353535;stroke-width:10;stroke-dasharray:none;stroke-opacity:0.996078"
+       id="path6"
+       d="m 39.295686,227.70678 13.927649,-23.65531 13.522277,23.88935 z"
+       transform="matrix(2.1339238e-4,0.03229412,-0.02716674,2.5366751e-4,7.8929403,0.17833826)" /><path
+       style="fill:none;fill-opacity:0.996078;stroke:#353535;stroke-width:0.43464;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.996078"
+       d="M 0.83960891,0.68172505 V 1.4816175 A 0.37980878,0.37980878 45.038145 0 0 1.218912,1.8614259 l 0.3617306,4.817e-4"
+       id="path1"
+       transform="matrix(0.96417853,0,0,1.1895165,0.34077866,-0.22952933)" /></g></svg>
diff --git a/src/main/resources/assets/icons/mixin/mixin_element_dark.svg b/src/main/resources/assets/icons/mixin/mixin_element_dark.svg
new file mode 100644
index 000000000..5605e250f
--- /dev/null
+++ b/src/main/resources/assets/icons/mixin/mixin_element_dark.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="14"
+   height="14"
+   viewBox="0 0 3.7041666 3.7041666"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><ellipse
+       style="fill:none;fill-opacity:0.996078;stroke:#e9b034;stroke-width:0.483435;stroke-dasharray:none;stroke-opacity:0.996078"
+       id="path4"
+       cx="1.8463329"
+       cy="1.8578337"
+       rx="1.6043483"
+       ry="1.6043482" /><path
+       style="fill:#e9b034;fill-opacity:0.996078;stroke:#e9b034;stroke-width:10;stroke-dasharray:none;stroke-opacity:0.996078"
+       id="path6"
+       d="m 39.295686,227.70678 13.927649,-23.65531 13.522277,23.88935 z"
+       transform="matrix(2.1339238e-4,0.03229412,-0.02716674,2.5366751e-4,7.8929403,0.17833826)" /><path
+       style="fill:none;fill-opacity:0.996078;stroke:#e9b034;stroke-width:0.43464;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.996078"
+       d="M 0.83960891,0.68172505 V 1.4816175 A 0.37980878,0.37980878 45.038145 0 0 1.218912,1.8614259 l 0.3617306,4.817e-4"
+       id="path1"
+       transform="matrix(0.96417853,0,0,1.1895165,0.34077866,-0.22952933)" /></g></svg>
diff --git a/src/main/resources/assets/icons/mixin/mixin_mark.svg b/src/main/resources/assets/icons/mixin/mixin_mark.svg
index fa2610055..e4b193bd0 100644
--- a/src/main/resources/assets/icons/mixin/mixin_mark.svg
+++ b/src/main/resources/assets/icons/mixin/mixin_mark.svg
@@ -1,3 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(1.2403 0 0 1.2403 -3.8451 -.7659)"><path d="m10.533 7.9223c-0.45453 0.014209-0.78588 0.30122-0.86381 0.74812-0.018532 0.10626-0.019253 2.3972-6.547e-4 2.5106 0.075712 0.46543 0.41995 0.75567 0.93448 0.78791 0.06438 0.0039 0.11917 0.0095 0.1218 0.01211 0.0071 0.0071 6e-3 1.7167-0.0013 1.7421-0.0033 0.01185-0.0098 0.02161-0.01435 0.02161-0.01441 0-0.18474 0.08355-0.22054 0.10818-0.0995 0.06845-0.17415 0.187-0.19845 0.31513-0.02016 0.10606-0.01781 0.67064 0.0033 0.76533 0.04722 0.21356 0.19749 0.36284 0.39764 0.39504 0.34788 0.05599 0.61744-0.07661 0.67157-0.33033 0.01303-0.06122 0.01446-0.82456 0.0013-0.89635-0.0256-0.14353-0.11211-0.23668-0.29821-0.32122-0.04989-0.02266-0.09463-0.04794-0.09935-0.05619-0.01237-0.02161-0.01231-1.7358 8e-5 -1.7482 0.0065-0.0065 0.50625-0.0085 1.8936-0.0079 2.0632 0.0013 1.9753 0.0033 2.1166-0.04393 0.31937-0.1061 0.53602-0.33444 0.61397-0.64707l0.01864-0.07463v-1.6894l-0.02269-0.090368c-0.071473-0.2854-0.26592-0.50594-0.53421-0.60587-0.12168-0.045315-0.16822-0.049047-0.67288-0.053828l-0.45962-0.00458-0.0094-0.047148c-0.0053-0.025932-0.01487-0.080741-0.02148-0.1218-0.05205-0.32139-0.33695-0.60275-0.66862-0.66035-0.0611-0.010608-2.3807-0.016895-2.6874-0.00727m2.5381 0.41624c0.28228 0.031105 0.41221 0.177 0.42494 0.4771 0.01466 0.34556-0.09494 0.52409-0.35373 0.57611-0.11035 0.0222-2.5583 0.02541-2.6846 0.0033-0.17091-0.0296-0.29418-0.13913-0.34502-0.30652-0.01617-0.053238-0.01958-0.33487-0.0046-0.40455 0.03464-0.16439 0.14702-0.28631 0.30585-0.33173 0.02456-0.00701 0.32528-0.010542 1.1841-0.013817 0.63316-0.00262 1.2078-0.00523 1.2769-0.00589 0.06915-0.00131 0.15755 0.00196 0.19645 0.00589" fill="#ebac24" fill-rule="evenodd" stroke="#ebac24" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.8" stroke-width=".40312" style="paint-order:stroke fill markers"/></g></svg>
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg3"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs3" /><path
+     id="path3"
+     style="fill:#e5a822;stroke:none;stroke-width:0.199102"
+     d="m 11.192379,9.1067325 c -0.266951,0.0041 -0.469974,-0.00287 -0.699995,-0.00178 l -2.128607,0.00958 C 7.8182955,9.1169933 7.0928348,9.1496363 6.7273313,9.5730294 6.2644281,10.109227 6.3088222,10.841354 6.3088222,11.478461 c 0,0.762477 -0.1393337,1.925341 0.25284,2.698565 0.253819,0.377613 0.5457546,0.543646 0.9258764,0.718789 0.2068986,0.05154 0.3975738,0.06681 0.6119067,0.06681 V 17.55721 H 8.4895689 V 14.96262 H 13.27126 c 0.72421,0 1.560044,0.10715 2.16973,-0.316642 0.304434,-0.211614 0.410736,-0.506895 0.480974,-0.831017 0.06515,-0.300618 0.08816,-0.86377 0.0746,-1.21731 -0.06385,-1.993909 -1.070626,-2.163391 -2.780083,-2.225673 -0.0047,-0.154512 -0.04107,-0.301641 -0.09352,-0.4489092 C 12.852538,9.163476 11.993233,9.0939243 11.192378,9.1067489 Z m 0.800289,0.6332824 c 0.741646,0.1571324 0.792432,1.3114921 0.05478,1.5137341 -0.306856,0.08414 -0.754673,0.07358 -1.074653,0.07358 H 8.692173 c -0.3607872,0 -0.871211,0.03014 -1.2046333,-0.106972 C 6.8104631,10.941893 6.9903351,9.838394 7.7106586,9.7306666 7.9941682,9.6882827 8.3319823,9.677721 8.6196415,9.6746974 l 1.8275565,-0.019181 c 0.485902,-0.00506 1.168832,0.00479 1.545471,0.084494 z" /></svg>
diff --git a/src/main/resources/assets/icons/mixin/shadow.png b/src/main/resources/assets/icons/mixin/shadow.png
deleted file mode 100644
index d09a4861e..000000000
Binary files a/src/main/resources/assets/icons/mixin/shadow.png and /dev/null differ
diff --git a/src/main/resources/assets/icons/mixin/shadow_dark.png b/src/main/resources/assets/icons/mixin/shadow_dark.png
deleted file mode 100644
index 22afb52bb..000000000
Binary files a/src/main/resources/assets/icons/mixin/shadow_dark.png and /dev/null differ