User: joe
Date: 19 Feb 25 23:09
Revision: e7c276d995bdbf0ba977af6dfe5a9454f834e28e
Summary:
Add more mixin icons for different types of annotations and accessor mixins

Co-authored-by: Voided Aries <githubvoidedaries@gmail.com>


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9831&personal=false

Index: src/main/kotlin/asset/MixinAssets.kt
===================================================================
--- src/main/kotlin/asset/MixinAssets.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/asset/MixinAssets.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -22,14 +22,30 @@
 
 @Suppress("unused")
 object MixinAssets : Assets() {
-    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_ACCESSOR_ICON = loadIcon("/assets/icons/mixin/mixin_accessor.svg")
+    val MIXIN_ACCESSOR_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_accessor_dark.svg")
 
+    val MIXIN_ACCESSOR_MIXIN_ICON = loadIcon("/assets/icons/mixin/mixin_accessor_mixin.svg")
+    val MIXIN_ACCESSOR_MIXIN_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_accessor_mixin_dark.svg")
+
     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_CLASS_TARGET_ICON = loadIcon("/assets/icons/mixin/mixin_class_target_gutter.svg")
-    val MIXIN_CLASS_TARGET_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_target_gutter_dark.svg")
+    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_INJECTOR_ICON = loadIcon("/assets/icons/mixin/mixin_injector.svg")
+    val MIXIN_INJECTOR_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_injector_dark.svg")
+
+    val MIXIN_SHADOW_ICON = loadIcon("/assets/icons/mixin/mixin_shadow.svg")
+    val MIXIN_SHADOW_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_shadow_dark_alt.svg")
+
+    val MIXIN_TARGET_ACCESSOR_MIXIN_ICON = loadIcon("/assets/icons/mixin/mixin_target_accessor_mixin.svg")
+    val MIXIN_TARGET_ACCESSOR_MIXIN_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_target_accessor_mixin_dark.svg")
+
+    val MIXIN_TARGET_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_target_class_gutter.svg")
+    val MIXIN_TARGET_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_target_class_gutter_dark.svg")
+
     val MIXIN_MARK = loadIcon("/assets/icons/mixin/mixin_mark.svg")
+    val ACCESSOR_MARK = loadIcon("/assets/icons/mixin/accessor_mark.svg")
 }
Index: src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -22,6 +22,7 @@
 
 import com.demonwav.mcdev.MinecraftSettings
 import com.demonwav.mcdev.asset.MixinAssets
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.intellij.ide.IconLayerProvider
 import com.intellij.openapi.util.Iconable
@@ -29,11 +30,18 @@
 import javax.swing.Icon
 
 class MixinIconProvider : IconLayerProvider {
-    override fun getLayerIcon(element: Iconable, isLocked: Boolean): Icon? =
-        MixinAssets.MIXIN_MARK.takeIf {
-            MinecraftSettings.instance.mixinClassIcon && element is PsiClass && element.isMixin
+    override fun getLayerIcon(element: Iconable, isLocked: Boolean): Icon? {
+        if (!MinecraftSettings.instance.mixinClassIcon || element !is PsiClass || !element.isMixin) {
+            return null
         }
 
+        return if (element.isAccessorMixin) {
+            MixinAssets.ACCESSOR_MARK
+        } else {
+            MixinAssets.MIXIN_MARK
+        }
+    }
+
     override fun getLayerDescription(): String =
         "Mixin class"
 }
Index: src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.FieldTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.ACCESSOR
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -108,6 +109,8 @@
 
     override val isEntryPoint = false
 
+    override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
+
     data class AccessorInfo(val name: String, val type: AccessorType)
 
     enum class AccessorType(val allowGetters: Boolean, val allowSetters: Boolean) {
Index: src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.AtResolver
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.CollectVisitor
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
@@ -174,6 +175,8 @@
 
     override val isEntryPoint = true
 
+    override val icon = MixinAssets.MIXIN_INJECTOR_ICON
+
     abstract val mixinExtrasExpressionContextType: ExpressionContext.Type
 
     data class InsnResult(val method: ClassAndMethodNode, val result: CollectVisitor.Result<*>)
Index: src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.INVOKER
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -108,4 +109,6 @@
     }
 
     override val isEntryPoint = false
+
+    override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
 }
Index: src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -43,6 +44,7 @@
 import com.intellij.serviceContainer.BaseKeyedLazyInstance
 import com.intellij.util.KeyedLazyInstance
 import com.intellij.util.xmlb.annotations.Attribute
+import javax.swing.Icon
 import org.objectweb.asm.tree.ClassNode
 
 interface MixinAnnotationHandler {
@@ -83,6 +85,8 @@
      */
     val isEntryPoint: Boolean
 
+    val icon: Icon get() = MixinAssets.MIXIN_ELEMENT_ICON
+
     companion object {
         private val EP_NAME = ExtensionPointName<KeyedLazyInstance<MixinAnnotationHandler>>(
             "com.demonwav.minecraft-dev.mixinAnnotationHandler",
Index: src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt
===================================================================
--- src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
 import com.demonwav.mcdev.platform.mixin.util.FieldTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
@@ -102,6 +103,8 @@
 
     override val isEntryPoint = false
 
+    override val icon = MixinAssets.MIXIN_SHADOW_ICON
+
     companion object {
         fun getInstance(): ShadowHandler? {
             return MixinAnnotationHandler.forMixinAnnotation(SHADOW) as? ShadowHandler
Index: src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -76,7 +76,7 @@
         return LineMarkerInfo(
             identifier,
             identifier.textRange,
-            icon,
+            handler.icon,
             { "Go to the $simpleName target" },
             MixinGutterIconNavigationHandler(identifier.createSmartPointer(), annotation.createSmartPointer(), handler),
             GutterIconRenderer.Alignment.LEFT,
Index: src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -22,6 +22,7 @@
 
 import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.findSourceClass
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.demonwav.mcdev.platform.mixin.util.mixinTargets
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
@@ -50,6 +51,12 @@
             return null
         }
 
+        val icon = if (element.isAccessorMixin) {
+            MixinAssets.MIXIN_ACCESSOR_MIXIN_ICON
+        } else {
+            icon
+        }
+
         return LineMarkerInfo(
             identifier,
             identifier.textRange,
Index: src/main/kotlin/platform/mixin/insight/target/MixinAccessorTargetLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/target/MixinAccessorTargetLineMarkerProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/kotlin/platform/mixin/insight/target/MixinAccessorTargetLineMarkerProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,80 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2025 minecraft-dev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, version 3.0 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.demonwav.mcdev.platform.mixin.insight.target
+
+import com.demonwav.mcdev.asset.MixinAssets
+import com.demonwav.mcdev.platform.mixin.action.FindMixinsAction
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
+import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
+import com.intellij.codeInsight.daemon.LineMarkerInfo
+import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
+import com.intellij.openapi.editor.markup.GutterIconRenderer
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import com.intellij.ui.awt.RelativePoint
+import java.awt.event.MouseEvent
+
+class MixinAccessorTargetLineMarkerProvider : LineMarkerProviderDescriptor(), GutterIconNavigationHandler<PsiIdentifier> {
+    override fun getName() = "Accessor mixin target line marker"
+    override fun getIcon() = MixinAssets.MIXIN_TARGET_ACCESSOR_MIXIN_ICON
+
+    override fun getLineMarkerInfo(element: PsiElement) = null
+
+    override fun collectSlowLineMarkers(
+        elements: List<PsiElement>,
+        result: MutableCollection<in LineMarkerInfo<*>>
+    ) {
+        for (element in elements) {
+            if (element !is PsiClass) {
+                continue
+            }
+
+            val identifier = element.nameIdentifier ?: continue
+
+            val mixins = FindMixinsAction.findMixins(element, element.project) ?: continue
+            if (mixins.none { it.isAccessorMixin }) {
+                continue
+            }
+
+            result += LineMarkerInfo(
+                identifier,
+                identifier.textRange,
+                icon,
+                { "Go to accessor mixins" },
+                this,
+                GutterIconRenderer.Alignment.LEFT,
+                { "accessor mixin target class indicator" },
+            )
+        }
+    }
+
+    override fun navigate(e: MouseEvent, elt: PsiIdentifier) {
+        val targetClass = elt.parent as? PsiClass ?: return
+        FindMixinsAction.openFindMixinsUI(
+            targetClass.project,
+            targetClass,
+            { show(RelativePoint(e)) }
+        ) {
+            it.isAccessorMixin
+        }
+    }
+}
Index: src/main/kotlin/platform/mixin/insight/target/MixinTargetLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/target/MixinTargetLineMarkerProvider.kt	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/kotlin/platform/mixin/insight/target/MixinTargetLineMarkerProvider.kt	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -22,6 +22,7 @@
 
 import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.action.FindMixinsAction
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
 import com.intellij.codeInsight.daemon.LineMarkerInfo
 import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
@@ -34,7 +35,7 @@
 
 class MixinTargetLineMarkerProvider : LineMarkerProviderDescriptor(), GutterIconNavigationHandler<PsiIdentifier> {
     override fun getName() = "Mixin target line marker"
-    override fun getIcon() = MixinAssets.MIXIN_CLASS_TARGET_ICON
+    override fun getIcon() = MixinAssets.MIXIN_TARGET_CLASS_ICON
 
     override fun getLineMarkerInfo(element: PsiElement) = null
 
@@ -50,7 +51,7 @@
             val identifier = element.nameIdentifier ?: continue
 
             val mixins = FindMixinsAction.findMixins(element, element.project) ?: continue
-            if (mixins.isEmpty()) {
+            if (mixins.all { it.isAccessorMixin }) {
                 continue
             }
 
@@ -68,6 +69,12 @@
 
     override fun navigate(e: MouseEvent, elt: PsiIdentifier) {
         val targetClass = elt.parent as? PsiClass ?: return
-        FindMixinsAction.openFindMixinsUI(targetClass.project, targetClass, { show(RelativePoint(e)) })
+        FindMixinsAction.openFindMixinsUI(
+            targetClass.project,
+            targetClass,
+            { show(RelativePoint(e)) }
+        ) {
+            !it.isAccessorMixin
-    }
-}
+        }
+    }
+}
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/META-INF/plugin.xml	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -738,6 +738,8 @@
                                         implementationClass="com.demonwav.mcdev.platform.mixin.insight.MixinElementLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="JAVA"
                                         implementationClass="com.demonwav.mcdev.platform.mixin.insight.target.MixinTargetLineMarkerProvider"/>
+        <codeInsight.lineMarkerProvider language="JAVA"
+                                        implementationClass="com.demonwav.mcdev.platform.mixin.insight.target.MixinAccessorTargetLineMarkerProvider"/>
 
         <!-- Mixin Code Vision Providers -->
         <codeInsight.daemonBoundCodeVisionProvider implementation="com.demonwav.mcdev.platform.mixin.insight.target.MixinTargetCodeVisionProvider"/>
Index: src/main/resources/assets/icons/mixin/accessor_mark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/accessor_mark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/accessor_mark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,22 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1"
+     transform="matrix(0.58359575,0,0,0.58359575,1.754896,1.7639515)">
+    <path
+       id="rect1"
+       style="fill:#e5a822;stroke-width:1.06254;stroke-linejoin:round"
+       d="m 1.8536336,0.28835449 c -0.5570683,0 -1.01389158,0.45475619 -1.01389158,1.01182451 V 1.5818156 H 0.75344238 A 0.21166666,0.21166666 0 0 0 0.54156901,1.793689 V 3.0396077 A 0.21166666,0.21166666 0 0 0 0.75344238,3.2514811 H 2.9507243 A 0.21166666,0.21166666 0 0 0 3.1625977,3.0396077 V 1.793689 A 0.21166666,0.21166666 0 0 0 2.9507243,1.5818156 H 1.1968262 V 1.300179 c 0,-0.36501475 0.2917927,-0.65680742 0.6568074,-0.65680742 0.3643697,5.107e-4 0.6557679,0.29243786 0.6552572,0.65680742 V 1.321366 H 2.8639079 V 1.300179 C 2.8646878,0.74375607 2.4100567,0.28913438 1.8536336,0.28835449 Z m -0.00155,1.70170491 a 0.2537441,0.2537441 0 0 1 0.2537313,0.2537313 0.2537441,0.2537441 0 0 1 -0.109554,0.208256 V 2.813265 A 0.14217615,0.17969784 0 0 1 1.8541504,2.993099 h -0.00413 A 0.14217615,0.17969784 0 0 1 1.7079061,2.813265 V 2.4520467 A 0.2537441,0.2537441 0 0 1 1.5983521,2.2437907 0.2537441,0.2537441 0 0 1 1.8520836,1.9900594 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_accessor.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_accessor.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_accessor.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,21 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#353535;fill-opacity:1;stroke-width:1.1281;stroke-linejoin:round"
+       d="M 0.96583252,1.0495483 A 0.80262381,0.80262381 0 0 0 0.16329753,1.8520833 0.80262381,0.80262381 0 0 0 0.96583252,2.6546183 0.80262381,0.80262381 0 0 0 1.6986043,2.1791951 H 1.9688721 L 2.1342367,2.0138306 2.2996012,2.1791951 h 0.08785 L 2.552299,2.0138306 2.7176636,2.1791951 h 0.08785 L 2.9708781,2.0138306 3.1357259,2.1791951 H 3.22771 L 3.4571533,1.9497518 V 1.7626831 L 3.2194417,1.5249715 H 1.6986043 A 0.80262381,0.80262381 0 0 0 0.96583252,1.0495483 Z M 0.72657064,1.6040365 A 0.24808373,0.24808373 0 0 1 0.97461751,1.8520833 0.24808373,0.24808373 0 0 1 0.72657064,2.1001302 0.24808373,0.24808373 0 0 1 0.47852376,1.8520833 0.24808373,0.24808373 0 0 1 0.72657064,1.6040365 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_accessor_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_accessor_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_accessor_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,21 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#e5a822;fill-opacity:1;stroke-width:1.1281;stroke-linejoin:round"
+       d="M 0.96583252,1.0495483 A 0.80262381,0.80262381 0 0 0 0.16329753,1.8520833 0.80262381,0.80262381 0 0 0 0.96583252,2.6546183 0.80262381,0.80262381 0 0 0 1.6986043,2.1791951 H 1.9688721 L 2.1342367,2.0138306 2.2996012,2.1791951 h 0.08785 L 2.552299,2.0138306 2.7176636,2.1791951 h 0.08785 L 2.9708781,2.0138306 3.1357259,2.1791951 H 3.22771 L 3.4571533,1.9497518 V 1.7626831 L 3.2194417,1.5249715 H 1.6986043 A 0.80262381,0.80262381 0 0 0 0.96583252,1.0495483 Z M 0.72657064,1.6040365 A 0.24808373,0.24808373 0 0 1 0.97461751,1.8520833 0.24808373,0.24808373 0 0 1 0.72657064,2.1001302 0.24808373,0.24808373 0 0 1 0.47852376,1.8520833 0.24808373,0.24808373 0 0 1 0.72657064,1.6040365 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_accessor_mixin.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_accessor_mixin.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_accessor_mixin.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,21 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#353535;fill-opacity:1;stroke-width:1.06254;stroke-linejoin:round"
+       d="m 1.8536336,0.28835449 c -0.5570683,0 -1.01389158,0.45475619 -1.01389158,1.01182451 V 1.5818156 H 0.75344238 A 0.21166666,0.21166666 0 0 0 0.54156901,1.793689 V 3.0396077 A 0.21166666,0.21166666 0 0 0 0.75344238,3.2514811 H 2.9507243 A 0.21166666,0.21166666 0 0 0 3.1625977,3.0396077 V 1.793689 A 0.21166666,0.21166666 0 0 0 2.9507243,1.5818156 H 1.1968262 V 1.300179 c 0,-0.36501475 0.2917927,-0.65680742 0.6568074,-0.65680742 0.3643697,5.107e-4 0.6557679,0.29243786 0.6552572,0.65680742 V 1.321366 H 2.8639079 V 1.300179 C 2.8646878,0.74375607 2.4100567,0.28913438 1.8536336,0.28835449 Z m -0.00155,1.70170491 a 0.2537441,0.2537441 0 0 1 0.2537313,0.2537313 0.2537441,0.2537441 0 0 1 -0.109554,0.208256 V 2.813265 A 0.14217615,0.17969784 0 0 1 1.8541504,2.993099 h -0.00413 A 0.14217615,0.17969784 0 0 1 1.7079061,2.813265 V 2.4520467 A 0.2537441,0.2537441 0 0 1 1.5983521,2.2437907 0.2537441,0.2537441 0 0 1 1.8520836,1.9900594 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_accessor_mixin_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_accessor_mixin_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_accessor_mixin_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,21 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#e5a822;stroke-width:1.06254;stroke-linejoin:round"
+       d="m 1.8536336,0.28835449 c -0.5570683,0 -1.01389158,0.45475619 -1.01389158,1.01182451 V 1.5818156 H 0.75344238 A 0.21166666,0.21166666 0 0 0 0.54156901,1.793689 V 3.0396077 A 0.21166666,0.21166666 0 0 0 0.75344238,3.2514811 H 2.9507243 A 0.21166666,0.21166666 0 0 0 3.1625977,3.0396077 V 1.793689 A 0.21166666,0.21166666 0 0 0 2.9507243,1.5818156 H 1.1968262 V 1.300179 c 0,-0.36501475 0.2917927,-0.65680742 0.6568074,-0.65680742 0.3643697,5.107e-4 0.6557679,0.29243786 0.6552572,0.65680742 V 1.321366 H 2.8639079 V 1.300179 C 2.8646878,0.74375607 2.4100567,0.28913438 1.8536336,0.28835449 Z m -0.00155,1.70170491 a 0.2537441,0.2537441 0 0 1 0.2537313,0.2537313 0.2537441,0.2537441 0 0 1 -0.109554,0.208256 V 2.813265 A 0.14217615,0.17969784 0 0 1 1.8541504,2.993099 h -0.00413 A 0.14217615,0.17969784 0 0 1 1.7079061,2.813265 V 2.4520467 A 0.2537441,0.2537441 0 0 1 1.5983521,2.2437907 0.2537441,0.2537441 0 0 1 1.8520836,1.9900594 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_class_gutter.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_class_gutter.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_class_gutter.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -2,9 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
    fill="none"
    version="1.1"
    id="svg3"
@@ -13,5 +13,5 @@
    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>
+     style="fill:#353535;fill-opacity:1;stroke:none;stroke-width:0.254679"
+     d="m 6.9678914,0.19683995 c -0.341468,0.00529 -0.6011629,-0.00364 -0.8953919,-0.00232 l -2.7227888,0.01227 c -0.6977486,0.00314 -1.6257145,0.044913 -2.0932451,0.5864858 C 0.66434719,1.4791467 0.72113349,2.4156406 0.72113349,3.2305916 c 0,0.9753145 -0.1782273,2.4627812 0.32341811,3.4518442 0.3246702,0.4830193 0.6980969,0.6954003 1.1843265,0.9194336 0.2646524,0.065929 0.5085523,0.085449 0.7827149,0.085449 v 3.3188476 c -0.7810701,0.01846 -0.9245606,0.70929 -0.9245606,1.276611 0,0.258254 -0.057149,0.581144 0.023926,0.830567 0.1786833,0.549708 0.708335,0.819666 1.3278808,0.765625 0.9900515,-0.08637 0.9245606,-0.927193 0.9245606,-1.596192 0,-0.570844 -0.030389,-1.257196 -0.8527832,-1.276611 V 7.6873185 h 6.1164561 c 0.9263673,0 1.9955153,0.1370594 2.7753903,-0.4050293 0.389415,-0.270684 0.525389,-0.6483899 0.615235,-1.0629883 0.08333,-0.3845324 0.11277,-1.1048832 0.09542,-1.5571112 C 13.031453,2.1117073 11.743639,1.8949152 9.5570027,1.8152481 9.5510557,1.6176037 9.5044657,1.4294066 9.4373737,1.2410294 9.0914707,0.26940195 7.9922976,0.18043695 6.9678914,0.19683995 Z M 7.991573,1.0068986 c 0.9486697,0.2009938 1.0136337,1.6775833 0.070068,1.9362792 -0.3925112,0.1076196 -0.9653333,0.09411 -1.3746316,0.09411 h -2.917236 c -0.4614972,0 -1.1144016,0.038548 -1.5408957,-0.1368349 C 1.3628013,2.5442652 1.5928828,1.1327334 2.5142781,0.99493565 2.8769267,0.94072175 3.3090384,0.92720825 3.6769958,0.92334655 l 2.3377023,-0.024534 c 0.6215372,-0.00652 1.4951008,0.00607 1.9768749,0.10808605 z" /></svg>
Index: src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_class_gutter_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -2,9 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
    fill="none"
    version="1.1"
    id="svg3"
@@ -13,5 +13,5 @@
    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>
+     style="fill:#e5a822;stroke:none;stroke-width:0.254679"
+     d="m 6.9678914,0.19683995 c -0.341468,0.00529 -0.6011629,-0.00364 -0.8953919,-0.00232 l -2.7227888,0.01227 c -0.6977486,0.00314 -1.6257145,0.044913 -2.0932451,0.5864858 C 0.66434719,1.4791467 0.72113349,2.4156406 0.72113349,3.2305916 c 0,0.9753145 -0.1782273,2.4627812 0.32341811,3.4518442 0.3246702,0.4830193 0.6980969,0.6954003 1.1843265,0.9194336 0.2646524,0.065929 0.5085523,0.085449 0.7827149,0.085449 v 3.3188476 c -0.7810701,0.01846 -0.9245606,0.70929 -0.9245606,1.276611 0,0.258254 -0.057149,0.581144 0.023926,0.830567 0.1786833,0.549708 0.708335,0.819666 1.3278808,0.765625 0.9900515,-0.08637 0.9245606,-0.927193 0.9245606,-1.596192 0,-0.570844 -0.030389,-1.257196 -0.8527832,-1.276611 V 7.6873185 h 6.1164561 c 0.9263673,0 1.9955153,0.1370594 2.7753903,-0.4050293 0.389415,-0.270684 0.525389,-0.6483899 0.615235,-1.0629883 0.08333,-0.3845324 0.11277,-1.1048832 0.09542,-1.5571112 C 13.031453,2.1117073 11.743639,1.8949152 9.5570027,1.8152481 9.5510557,1.6176037 9.5044657,1.4294066 9.4373737,1.2410294 9.0914707,0.26940195 7.9922976,0.18043695 6.9678914,0.19683995 Z M 7.991573,1.0068986 c 0.9486697,0.2009938 1.0136337,1.6775833 0.070068,1.9362792 -0.3925112,0.1076196 -0.9653333,0.09411 -1.3746316,0.09411 h -2.917236 c -0.4614972,0 -1.1144016,0.038548 -1.5408957,-0.1368349 C 1.3628013,2.5442652 1.5928828,1.1327334 2.5142781,0.99493565 2.8769267,0.94072175 3.3090384,0.92720825 3.6769958,0.92334655 l 2.3377023,-0.024534 c 0.6215372,-0.00652 1.4951008,0.00607 1.9768749,0.10808605 z" /></svg>
Index: src/main/resources/assets/icons/mixin/mixin_class_target_gutter.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_class_target_gutter.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_class_target_gutter.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
@@ -1,23 +0,0 @@
-<?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" /><path
-     d="m 9.241925,15.31264 6.037458,-5.8680942 m 0,0 -2.847364,-0.020406 m 2.866921,0.020406 -0.0099,2.9092792"
-     stroke="#208a3c"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     id="path1"
-     style="fill:none;fill-opacity:0.992157;stroke:#476acf;stroke-width:1.28842;stroke-dasharray:none;stroke-opacity:0.996078" /></svg>
Index: src/main/resources/assets/icons/mixin/mixin_class_target_gutter_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_class_target_gutter_dark.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_class_target_gutter_dark.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
@@ -1,23 +0,0 @@
-<?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" /><path
-     d="m 9.241925,15.31264 6.037458,-5.8680942 m 0,0 -2.847364,-0.020406 m 2.866921,0.020406 -0.0099,2.9092792"
-     stroke="#208a3c"
-     stroke-linecap="round"
-     stroke-linejoin="round"
-     id="path1"
-     style="fill:none;fill-opacity:0.992157;stroke:#82a2ff;stroke-width:1.28842;stroke-dasharray:none;stroke-opacity:0.996078" /></svg>
Index: src/main/resources/assets/icons/mixin/mixin_element.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_element.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_element.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -12,17 +12,17 @@
    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"
+       style="fill:none;fill-opacity:0.996078;stroke:#353535;stroke-width:0.483435;stroke-dasharray:none;stroke-opacity:1"
        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"
+       style="fill:#e9b034;fill-opacity:0.996078;stroke:#353535;stroke-width:10;stroke-dasharray:none;stroke-opacity:1"
        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"
+       style="fill:none;fill-opacity:0.996078;stroke:#353535;stroke-width:0.43464;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
        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>
Index: src/main/resources/assets/icons/mixin/mixin_element_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_element_dark.svg	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/assets/icons/mixin/mixin_element_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -12,17 +12,17 @@
    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"
+       style="fill:none;fill-opacity:0.996078;stroke:#e5a822;stroke-width:0.483435;stroke-dasharray:none;stroke-opacity:1"
        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"
+       style="fill:#e9b034;fill-opacity:0.996078;stroke:#e5a822;stroke-width:10;stroke-dasharray:none;stroke-opacity:1"
        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"
+       style="fill:none;fill-opacity:0.996078;stroke:#e5a822;stroke-width:0.43464;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
        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>
Index: src/main/resources/assets/icons/mixin/mixin_injector.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_injector.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_injector.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,18 @@
+<?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.7041667 3.7041666"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     id="rect2"
+     style="fill:#353535;fill-opacity:1;stroke:#6db3ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.996078"
+     d="m 2.9317958,0.05736088 a 0.04337783,0.04337783 0 0 0 -0.043284,0.04328411 0.04337783,0.04337783 0 0 0 0.014238,0.0318935 l -5.697e-4,0.001139 0.1600373,0.16003723 -0.362789,0.362789 -0.2836248,-0.28362468 a 0.06036992,0.06036992 0 0 0 -0.00399,-0.004557 0.06036992,0.06036992 0 0 0 -0.044424,-0.0199335 0.06036992,0.06036992 0 0 0 -0.06037,0.0603699 0.06036992,0.06036992 0 0 0 0.019933,0.0444231 l -5.695e-4,0.00114 0.08372,0.0837206 -1.70288357,1.70345616 c -0.001399,8.525e-4 -0.00273,0.00181 -0.003986,0.00284 l -5.695e-4,0.00114 c -0.006999,0.00625 -0.0111148,0.015112 -0.0113906,0.02449 2.7354e-4,0.00882 0.003949,0.017183 0.010252,0.02335 0.001057,0.00122 0.002206,0.00237 0.003418,0.00342 l 0.21528137,0.2158509 -0.10479303,0.1053622 -0.002848,0.00228 5.6945e-4,5.696e-4 a 0.03986692,0.03986692 0 0 0 -0.0113905,0.027337 0.03986692,0.03986692 0 0 0 0.005126,0.019364 l -5.6946e-4,5.694e-4 0.001708,0.00171 a 0.03986692,0.03986692 0 0 0 0.01196,0.01196 l 0.0558137,0.055814 -0.80531182,0.8053119 -0.0011396,0.080873 0.08315102,0.00114 0.80531187,-0.8053119 0.0848598,0.084859 a 0.03986692,0.03986692 0 0 0 0.00399,0.00399 l 0.00455,0.00455 5.696e-4,-5.695e-4 a 0.03986692,0.03986692 0 0 0 0.021072,0.00569 0.03986692,0.03986692 0 0 0 0.026768,-0.010822 l 0.00342,-0.00284 a 0.03986692,0.03986692 0 0 0 0.00342,-0.00455 L 1.2072685,2.7996376 1.427106,3.0189058 c 3.625e-4,5.808e-4 7.443e-4,0.00115 0.00114,0.00171 0.00265,0.00411 0.00614,0.00761 0.010252,0.010252 5.581e-4,3.967e-4 0.00113,7.806e-4 0.00171,0.00114 l 0.00284,0.00284 5.695e-4,-5.695e-4 c 0.00418,0.00161 0.00862,0.00238 0.013099,0.00228 0.00967,-2.578e-4 0.018777,-0.00461 0.02506,-0.01196 l 0.00228,-0.00171 c 4.079e-4,-7.449e-4 7.959e-4,-0.00151 0.00114,-0.00228 l 1.7040262,-1.7034567 0.063217,0.063218 a 0.06036992,0.06036992 0 0 0 0.045562,0.021072 0.06036992,0.06036992 0 0 0 0.06037,-0.06037 0.06036992,0.06036992 0 0 0 -0.018794,-0.044424 L 3.0434232,1.0004984 3.4062122,0.63770939 3.5673885,0.79888566 a 0.04337783,0.04337783 0 0 0 0.033033,0.0153773 0.04337783,0.04337783 0 0 0 0.043284,-0.0432841 0.04337783,0.04337783 0 0 0 -0.013669,-0.0318936 L 2.9665369,0.07501623 A 0.04337783,0.04337783 0 0 0 2.9636949,0.07159865 0.04337783,0.04337783 0 0 0 2.931801,0.05736047 Z" />
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_injector_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_injector_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_injector_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,18 @@
+<?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.7041667 3.7041666"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <path
+     id="rect2"
+     style="fill:#e9b034;fill-opacity:1;stroke:#6db3ff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.996078"
+     d="m 2.9317958,0.05736088 a 0.04337783,0.04337783 0 0 0 -0.043284,0.04328411 0.04337783,0.04337783 0 0 0 0.014238,0.0318935 l -5.697e-4,0.001139 0.1600373,0.16003723 -0.362789,0.362789 -0.2836248,-0.28362468 a 0.06036992,0.06036992 0 0 0 -0.00399,-0.004557 0.06036992,0.06036992 0 0 0 -0.044424,-0.0199335 0.06036992,0.06036992 0 0 0 -0.06037,0.0603699 0.06036992,0.06036992 0 0 0 0.019933,0.0444231 l -5.695e-4,0.00114 0.08372,0.0837206 -1.70288357,1.70345616 c -0.001399,8.525e-4 -0.00273,0.00181 -0.003986,0.00284 l -5.695e-4,0.00114 c -0.006999,0.00625 -0.0111148,0.015112 -0.0113906,0.02449 2.7354e-4,0.00882 0.003949,0.017183 0.010252,0.02335 0.001057,0.00122 0.002206,0.00237 0.003418,0.00342 l 0.21528137,0.2158509 -0.10479303,0.1053622 -0.002848,0.00228 5.6945e-4,5.696e-4 a 0.03986692,0.03986692 0 0 0 -0.0113905,0.027337 0.03986692,0.03986692 0 0 0 0.005126,0.019364 l -5.6946e-4,5.694e-4 0.001708,0.00171 a 0.03986692,0.03986692 0 0 0 0.01196,0.01196 l 0.0558137,0.055814 -0.80531182,0.8053119 -0.0011396,0.080873 0.08315102,0.00114 0.80531187,-0.8053119 0.0848598,0.084859 a 0.03986692,0.03986692 0 0 0 0.00399,0.00399 l 0.00455,0.00455 5.696e-4,-5.695e-4 a 0.03986692,0.03986692 0 0 0 0.021072,0.00569 0.03986692,0.03986692 0 0 0 0.026768,-0.010822 l 0.00342,-0.00284 a 0.03986692,0.03986692 0 0 0 0.00342,-0.00455 L 1.2072685,2.7996376 1.427106,3.0189058 c 3.625e-4,5.808e-4 7.443e-4,0.00115 0.00114,0.00171 0.00265,0.00411 0.00614,0.00761 0.010252,0.010252 5.581e-4,3.967e-4 0.00113,7.806e-4 0.00171,0.00114 l 0.00284,0.00284 5.695e-4,-5.695e-4 c 0.00418,0.00161 0.00862,0.00238 0.013099,0.00228 0.00967,-2.578e-4 0.018777,-0.00461 0.02506,-0.01196 l 0.00228,-0.00171 c 4.079e-4,-7.449e-4 7.959e-4,-0.00151 0.00114,-0.00228 l 1.7040262,-1.7034567 0.063217,0.063218 a 0.06036992,0.06036992 0 0 0 0.045562,0.021072 0.06036992,0.06036992 0 0 0 0.06037,-0.06037 0.06036992,0.06036992 0 0 0 -0.018794,-0.044424 L 3.0434232,1.0004984 3.4062122,0.63770939 3.5673885,0.79888566 a 0.04337783,0.04337783 0 0 0 0.033033,0.0153773 0.04337783,0.04337783 0 0 0 0.043284,-0.0432841 0.04337783,0.04337783 0 0 0 -0.013669,-0.0318936 L 2.9665369,0.07501623 A 0.04337783,0.04337783 0 0 0 2.9636949,0.07159865 0.04337783,0.04337783 0 0 0 2.931801,0.05736047 Z" />
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_shadow.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_shadow.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_shadow.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,25 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="path1"
+       style="fill:#353535;fill-opacity:1;stroke:none;stroke-width:1.51226;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 1.8520833,0.23202718 A 1.6198409,1.6198409 0 0 0 0.23202718,1.8520833 1.6198409,1.6198409 0 0 0 1.8520833,3.4721395 1.6198409,1.6198409 0 0 0 3.4721395,1.8520833 1.6198409,1.6198409 0 0 0 1.8520833,0.23202718 Z m 0,0.12867432 A 1.4914211,1.4914211 0 0 1 3.3434652,1.8520833 1.4914211,1.4914211 0 0 1 1.8520833,3.3434652 1.4914211,1.4914211 0 0 1 0.3607015,1.8520833 1.4914211,1.4914211 0 0 1 1.8520833,0.3607015 Z" />
+    <path
+       id="path1-5-2"
+       style="fill:#353535;fill-opacity:1;stroke:none;stroke-width:1.392;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 1.8520833,0.3607015 A 1.4914211,1.4914211 0 0 0 1.379244,0.44079997 L 0.44079997,1.379244 A 1.4914211,1.4914211 0 0 0 0.3607015,1.8520833 1.4914211,1.4914211 0 0 0 0.38809001,2.1208008 L 2.1233846,0.38550618 A 1.4914211,1.4914211 0 0 0 1.8520833,0.3607015 Z M 2.3859009,0.46043701 0.46250407,2.3838338 A 1.4914211,1.4914211 0 0 0 0.71726888,2.8184326 L 2.8189494,0.71675212 A 1.4914211,1.4914211 0 0 0 2.3859009,0.46043701 Z M 2.9874146,0.88573405 0.88625081,2.9868978 A 1.4914211,1.4914211 0 0 0 1.3203328,3.2416626 L 3.2437297,1.3182658 A 1.4914211,1.4914211 0 0 0 2.9874146,0.88573405 Z M 3.3186605,1.5812988 1.5838826,3.3160767 a 1.4914211,1.4914211 0 0 0 0.2682007,0.027388 1.4914211,1.4914211 0 0 0 0.4728394,-0.080098 l 0.938444,-0.938444 A 1.4914211,1.4914211 0 0 0 3.3434652,1.8520833 1.4914211,1.4914211 0 0 0 3.3186605,1.5812988 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_shadow_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_shadow_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_shadow_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,25 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="path1"
+       style="fill:#e5a822;fill-opacity:1;stroke:none;stroke-width:1.51226;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 1.8520833,0.23202718 A 1.6198409,1.6198409 0 0 0 0.23202718,1.8520833 1.6198409,1.6198409 0 0 0 1.8520833,3.4721395 1.6198409,1.6198409 0 0 0 3.4721395,1.8520833 1.6198409,1.6198409 0 0 0 1.8520833,0.23202718 Z m 0,0.12867432 A 1.4914211,1.4914211 0 0 1 3.3434652,1.8520833 1.4914211,1.4914211 0 0 1 1.8520833,3.3434652 1.4914211,1.4914211 0 0 1 0.3607015,1.8520833 1.4914211,1.4914211 0 0 1 1.8520833,0.3607015 Z" />
+    <path
+       id="path1-5-2"
+       style="fill:#e5a822;fill-opacity:1;stroke:none;stroke-width:1.392;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 1.8520833,0.3607015 A 1.4914211,1.4914211 0 0 0 1.379244,0.44079997 L 0.44079997,1.379244 A 1.4914211,1.4914211 0 0 0 0.3607015,1.8520833 1.4914211,1.4914211 0 0 0 0.38809001,2.1208008 L 2.1233846,0.38550618 A 1.4914211,1.4914211 0 0 0 1.8520833,0.3607015 Z M 2.3859009,0.46043701 0.46250407,2.3838338 A 1.4914211,1.4914211 0 0 0 0.71726888,2.8184326 L 2.8189494,0.71675212 A 1.4914211,1.4914211 0 0 0 2.3859009,0.46043701 Z M 2.9874146,0.88573405 0.88625081,2.9868978 A 1.4914211,1.4914211 0 0 0 1.3203328,3.2416626 L 3.2437297,1.3182658 A 1.4914211,1.4914211 0 0 0 2.9874146,0.88573405 Z M 3.3186605,1.5812988 1.5838826,3.3160767 a 1.4914211,1.4914211 0 0 0 0.2682007,0.027388 1.4914211,1.4914211 0 0 0 0.4728394,-0.080098 l 0.938444,-0.938444 A 1.4914211,1.4914211 0 0 0 3.3434652,1.8520833 1.4914211,1.4914211 0 0 0 3.3186605,1.5812988 Z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_shadow_dark_alt.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_shadow_dark_alt.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_shadow_dark_alt.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,25 @@
+<?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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#e9b034;stroke-width:1.34369;stroke-linejoin:round;stroke-opacity:0.996078"
+       d="M 1.0293945,0.50022786 A 0.52916666,0.52916666 0 0 0 0.50022786,1.0293945 V 2.0727417 A 0.52916666,0.52916666 0 0 0 1.0293945,2.6019084 h 0.073381 V 1.631425 A 0.52916666,0.52916666 0 0 1 1.6319417,1.1022583 H 2.6013916 V 1.0293945 A 0.52916666,0.52916666 0 0 0 2.0722249,0.50022786 Z M 2.6013916,1.1022583 V 2.0727417 A 0.52916666,0.52916666 0 0 1 2.0722249,2.6019084 H 1.1027751 v 0.072864 A 0.52916666,0.52916666 0 0 0 1.6319417,3.2039388 H 2.6747721 A 0.52916666,0.52916666 0 0 0 3.2039388,2.6747721 V 1.631425 A 0.52916666,0.52916666 0 0 0 2.6747721,1.1022583 Z" />
+    <path
+       id="rect1-6"
+       style="fill:#e9b034;stroke-width:1.21034;stroke-linejoin:round;stroke-opacity:0.996078"
+       d="m 1.6563917,1.1785165 a 0.47665116,0.47665116 0 0 0 -0.075964,0.00672 L 1.186653,1.5790088 a 0.47665116,0.47665116 0 0 0 -0.00672,0.075964 v 0.141077 L 1.7974684,1.1785165 Z m 0.2682007,0 -0.7446574,0.7446574 v 0.210323 L 2.1349155,1.1785165 Z m 0.3374471,0 L 1.179935,2.260621 V 2.470944 L 2.4723626,1.1785165 Z M 2.5297234,1.2482797 1.2486647,2.5293384 H 1.4589878 L 2.5297234,1.4586027 Z m 0,0.3374471 -0.9436116,0.9436116 H 1.7964349 L 2.5297234,1.7960498 Z m 0,0.3374471 -0.6061645,0.6061645 h 0.1297078 a 0.47665116,0.47665116 0 0 0 0.0894,-0.00879 L 2.5209385,2.1422819 a 0.47665116,0.47665116 0 0 0 0.00878,-0.0894 z" />
+  </g>
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#353535;fill-opacity:1;stroke-width:1.06254;stroke-linejoin:round"
+       d="m 1.8536336,0.28835449 c -0.5570683,0 -1.01389158,0.45475619 -1.01389158,1.01182451 V 1.5818156 H 0.75344238 A 0.21166666,0.21166666 0 0 0 0.54156901,1.793689 V 3.0396077 A 0.21166666,0.21166666 0 0 0 0.75344238,3.2514811 H 2.9507243 A 0.21166666,0.21166666 0 0 0 3.1625977,3.0396077 V 1.793689 A 0.21166666,0.21166666 0 0 0 2.9507243,1.5818156 H 1.1968262 V 1.300179 c 0,-0.36501475 0.2917927,-0.65680742 0.6568074,-0.65680742 0.3643697,5.107e-4 0.6557679,0.29243786 0.6552572,0.65680742 V 1.321366 H 2.8639079 V 1.300179 C 2.8646878,0.74375607 2.4100567,0.28913438 1.8536336,0.28835449 Z m -0.00155,1.70170491 a 0.2537441,0.2537441 0 0 1 0.2537313,0.2537313 0.2537441,0.2537441 0 0 1 -0.109554,0.208256 V 2.813265 A 0.14217615,0.17969784 0 0 1 1.8541504,2.993099 h -0.00413 A 0.14217615,0.17969784 0 0 1 1.7079061,2.813265 V 2.4520467 A 0.2537441,0.2537441 0 0 1 1.5983521,2.2437907 0.2537441,0.2537441 0 0 1 1.8520836,1.9900594 Z" />
+  </g>
+  <path
+     d="M 2.1558226,3.537478 3.5298174,2.2020268 m 0,0 -0.6479985,-0.00464 m 0.6524493,0.00464 -0.00225,0.662089"
+     stroke="#208a3c"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path1-5"
+     style="fill:none;fill-opacity:0.992157;stroke:#476acf;stroke-width:0.293217;stroke-dasharray:none;stroke-opacity:0.996078" />
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_target_accessor_mixin_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -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"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       id="rect1"
+       style="fill:#e5a822;stroke-width:1.06254;stroke-linejoin:round"
+       d="m 1.8536336,0.28835449 c -0.5570683,0 -1.01389158,0.45475619 -1.01389158,1.01182451 V 1.5818156 H 0.75344238 A 0.21166666,0.21166666 0 0 0 0.54156901,1.793689 V 3.0396077 A 0.21166666,0.21166666 0 0 0 0.75344238,3.2514811 H 2.9507243 A 0.21166666,0.21166666 0 0 0 3.1625977,3.0396077 V 1.793689 A 0.21166666,0.21166666 0 0 0 2.9507243,1.5818156 H 1.1968262 V 1.300179 c 0,-0.36501475 0.2917927,-0.65680742 0.6568074,-0.65680742 0.3643697,5.107e-4 0.6557679,0.29243786 0.6552572,0.65680742 V 1.321366 H 2.8639079 V 1.300179 C 2.8646878,0.74375607 2.4100567,0.28913438 1.8536336,0.28835449 Z m -0.00155,1.70170491 a 0.2537441,0.2537441 0 0 1 0.2537313,0.2537313 0.2537441,0.2537441 0 0 1 -0.109554,0.208256 V 2.813265 A 0.14217615,0.17969784 0 0 1 1.8541504,2.993099 h -0.00413 A 0.14217615,0.17969784 0 0 1 1.7079061,2.813265 V 2.4520467 A 0.2537441,0.2537441 0 0 1 1.5983521,2.2437907 0.2537441,0.2537441 0 0 1 1.8520836,1.9900594 Z" />
+  </g>
+  <path
+     d="M 2.1558226,3.537478 3.5298174,2.2020268 m 0,0 -0.6479985,-0.00464 m 0.6524493,0.00464 -0.00225,0.662089"
+     stroke="#208a3c"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path1-5"
+     style="fill:none;fill-opacity:0.992157;stroke:#82a2ff;stroke-width:0.293217;stroke-dasharray:none;stroke-opacity:0.996078" />
+</svg>
Index: src/main/resources/assets/icons/mixin/mixin_target_class_gutter.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_target_class_gutter.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_target_class_gutter.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   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.254679"
+     d="m 6.9678914,0.19683995 c -0.341468,0.00529 -0.6011629,-0.00364 -0.8953919,-0.00232 l -2.7227888,0.01227 c -0.6977486,0.00314 -1.6257145,0.044913 -2.0932451,0.5864858 C 0.66434719,1.4791467 0.72113349,2.4156406 0.72113349,3.2305916 c 0,0.9753145 -0.1782273,2.4627812 0.32341811,3.4518442 0.3246702,0.4830193 0.6980969,0.6954003 1.1843265,0.9194336 0.2646524,0.065929 0.5085523,0.085449 0.7827149,0.085449 v 3.3188476 c -0.7810701,0.01846 -0.9245606,0.70929 -0.9245606,1.276611 0,0.258254 -0.057149,0.581144 0.023926,0.830567 0.1786833,0.549708 0.708335,0.819666 1.3278808,0.765625 0.9900515,-0.08637 0.9245606,-0.927193 0.9245606,-1.596192 0,-0.570844 -0.030389,-1.257196 -0.8527832,-1.276611 V 7.6873185 h 6.1164561 c 0.9263673,0 1.9955153,0.1370594 2.7753903,-0.4050293 0.389415,-0.270684 0.525389,-0.6483899 0.615235,-1.0629883 0.08333,-0.3845324 0.11277,-1.1048832 0.09542,-1.5571112 C 13.031453,2.1117073 11.743639,1.8949152 9.5570027,1.8152481 9.5510557,1.6176037 9.5044657,1.4294066 9.4373737,1.2410294 9.0914707,0.26940195 7.9922976,0.18043695 6.9678914,0.19683995 Z M 7.991573,1.0068986 c 0.9486697,0.2009938 1.0136337,1.6775833 0.070068,1.9362792 -0.3925112,0.1076196 -0.9653333,0.09411 -1.3746316,0.09411 h -2.917236 c -0.4614972,0 -1.1144016,0.038548 -1.5408957,-0.1368349 C 1.3628013,2.5442652 1.5928828,1.1327334 2.5142781,0.99493565 2.8769267,0.94072175 3.3090384,0.92720825 3.6769958,0.92334655 l 2.3377023,-0.024534 c 0.6215372,-0.00652 1.4951008,0.00607 1.9768749,0.10808605 z" /><path
+     d="M 8.2116398,13.401429 13.404691,8.3540541 m 0,0 -2.449128,-0.017555 m 2.46595,0.017555 -0.0085,2.5023839"
+     stroke="#208a3c"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path1-5"
+     style="fill:none;fill-opacity:0.992157;stroke:#476acf;stroke-width:1.108;stroke-dasharray:none;stroke-opacity:0.996078" /></svg>
Index: src/main/resources/assets/icons/mixin/mixin_target_class_gutter_dark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_target_class_gutter_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
+++ src/main/resources/assets/icons/mixin/mixin_target_class_gutter_dark.svg	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   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.254679"
+     d="m 6.9678914,0.19683995 c -0.341468,0.00529 -0.6011629,-0.00364 -0.8953919,-0.00232 l -2.7227888,0.01227 c -0.6977486,0.00314 -1.6257145,0.044913 -2.0932451,0.5864858 C 0.66434719,1.4791467 0.72113349,2.4156406 0.72113349,3.2305916 c 0,0.9753145 -0.1782273,2.4627812 0.32341811,3.4518442 0.3246702,0.4830193 0.6980969,0.6954003 1.1843265,0.9194336 0.2646524,0.065929 0.5085523,0.085449 0.7827149,0.085449 v 3.3188476 c -0.7810701,0.01846 -0.9245606,0.70929 -0.9245606,1.276611 0,0.258254 -0.057149,0.581144 0.023926,0.830567 0.1786833,0.549708 0.708335,0.819666 1.3278808,0.765625 0.9900515,-0.08637 0.9245606,-0.927193 0.9245606,-1.596192 0,-0.570844 -0.030389,-1.257196 -0.8527832,-1.276611 V 7.6873185 h 6.1164561 c 0.9263673,0 1.9955153,0.1370594 2.7753903,-0.4050293 0.389415,-0.270684 0.525389,-0.6483899 0.615235,-1.0629883 0.08333,-0.3845324 0.11277,-1.1048832 0.09542,-1.5571112 C 13.031453,2.1117073 11.743639,1.8949152 9.5570027,1.8152481 9.5510557,1.6176037 9.5044657,1.4294066 9.4373737,1.2410294 9.0914707,0.26940195 7.9922976,0.18043695 6.9678914,0.19683995 Z M 7.991573,1.0068986 c 0.9486697,0.2009938 1.0136337,1.6775833 0.070068,1.9362792 -0.3925112,0.1076196 -0.9653333,0.09411 -1.3746316,0.09411 h -2.917236 c -0.4614972,0 -1.1144016,0.038548 -1.5408957,-0.1368349 C 1.3628013,2.5442652 1.5928828,1.1327334 2.5142781,0.99493565 2.8769267,0.94072175 3.3090384,0.92720825 3.6769958,0.92334655 l 2.3377023,-0.024534 c 0.6215372,-0.00652 1.4951008,0.00607 1.9768749,0.10808605 z" /><path
+     d="M 8.2116398,13.401429 13.404691,8.3540541 m 0,0 -2.449128,-0.017555 m 2.46595,0.017555 -0.0085,2.5023839"
+     stroke="#208a3c"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path1-5"
+     style="fill:none;fill-opacity:0.992157;stroke:#82a2ff;stroke-width:1.10822;stroke-dasharray:none;stroke-opacity:0.996078" /></svg>
Index: src/main/resources/messages/MinecraftDevelopment.properties
===================================================================
--- src/main/resources/messages/MinecraftDevelopment.properties	(revision 62a893ebb8ff30b55612490b7f5b38414c662a70)
+++ src/main/resources/messages/MinecraftDevelopment.properties	(revision e7c276d995bdbf0ba977af6dfe5a9454f834e28e)
@@ -318,7 +318,7 @@
 minecraft.before=Before
 minecraft.after=After
 
-mixin.codeVision.target.accessor.hint={0,choice, 0#no accessors|1#1 accessor|2#{0,number} accessors}
+mixin.codeVision.target.accessor.hint={0,choice, 0#no accessor mixins|1#1 accessor mixin|2#{0,number} accessor mixins}
 mixin.codeVision.target.accessor.name=Accessor Mixins
 mixin.codeVision.target.hint={0,choice, 0#no mixins|1#1 mixin|2#{0,number} mixins}
 mixin.codeVision.target.name=Mixins