diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt
index 5784a2f..4bb3a09 100644
--- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt
@@ -68,6 +68,7 @@ class AsmViewerHostUi(private val project: Project) : LifetimedService() {
         }
 
         val content = contentManager.factory.createContent(wrapper, "", false)
+        content.preferredFocusableComponent = contentContainer
         contentManager.addContent(content)
 
         val newPanel = AsmContentPanelFactory.create(project, null, null)
diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt
new file mode 100644
index 0000000..d8e10a4
--- /dev/null
+++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt
@@ -0,0 +1,9 @@
+package com.jetbrains.rider.plugins.dotnetdisassembler
+
+import com.intellij.openapi.util.IconLoader
+import javax.swing.Icon
+
+object AsmViewerIcons {
+    @JvmField
+    val ToolWindow: Icon = IconLoader.getIcon("/icons/disassemblerToolWindow.svg", AsmViewerIcons::class.java)
+}
diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
index 8ce2bc4..5ba9dc9 100644
--- a/src/rider/main/resources/META-INF/plugin.xml
+++ b/src/rider/main/resources/META-INF/plugin.xml
@@ -24,7 +24,7 @@
 
     <toolWindow id="AsmViewer"
                 canCloseContents="false"
-                icon="AllIcons.Debugger.Db_primitive"
+                icon="com.jetbrains.rider.plugins.dotnetdisassembler.AsmViewerIcons.ToolWindow"
                 anchor="right"
                 factoryClass="com.jetbrains.rider.plugins.dotnetdisassembler.AsmViewerToolWindowFactory"/>
 
@@ -34,6 +34,8 @@
     <statistics.counterUsagesCollector
         implementationClass="com.jetbrains.rider.plugins.dotnetdisassembler.statistics.AsmViewerStatisticsCollector"/>
 
+    <iconMapper mappingFile="disassemblerIconMappings.json"/>
+
   </extensions>
     <actions resource-bundle="messages.AsmViewerBundle">
         <!-- Show ASM Viewer Action -->
diff --git a/src/rider/main/resources/META-INF/pluginIcon.svg b/src/rider/main/resources/META-INF/pluginIcon.svg
new file mode 100644
index 0000000..df88f5e
--- /dev/null
+++ b/src/rider/main/resources/META-INF/pluginIcon.svg
@@ -0,0 +1,17 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="40" height="40" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg">
+  <path fill="url(#a)" d="M13.9 9.86h2v.99h-2zm2-1.79h-2v.99h2zm-4.55-.31v7.22H8.27v3.75h10.25v-3.75h-2.63v-3.33h-2v4.33h2.63v.75H9.27v-.75h3.08V5.26L8.86 6.28l-.24-.86 4.04-1.3h1.23v3.15h2V3.13h-2.85L7.28 4.94l1.04 3.71 3.03-.88zM20 10.93c0-4.67 2.94-8.03 6.99-8.03s6.95 3.34 6.95 7.95-2.94 8.03-6.99 8.03S20 15.54 20 10.93m2-.04c0 3.84 2.24 6.49 5.45 6.49s5.49-2.73 5.49-6.49-2.29-6.49-5.45-6.49S22 7.13 22 10.89m1.17 0c0-3.08 1.56-5.21 3.79-5.21s3.83 2.19 3.83 5.21v.04c0 3.04-1.56 5.17-3.79 5.17s-3.83-2.14-3.83-5.21m1-.04c0 2.22.96 3.75 2.33 3.75s2.29-1.51 2.29-3.67v-.04c0-2.15-.98-3.71-2.33-3.71s-2.29 1.51-2.29 3.67m-7.38 18.16v.04c0 3.04-1.56 5.17-3.79 5.17s-3.83-2.14-3.83-5.21 1.56-5.21 3.79-5.21 3.83 2.19 3.83 5.21m-2-.5c0-2.15-.98-3.71-2.33-3.71s-2.29 1.51-2.29 3.67.96 3.75 2.33 3.75 2.29-1.51 2.29-3.67zm15.12 4.59h2.63v3.75H22.29V33.1h3.08v-7.22l-3.03.88-1.04-3.71 5.76-1.81h2.85v.7h-3.09l-4.04 1.3.25.76 3.85-1.26h3.03zm-1.5 2V23.25h-1.23l-4.04 1.3.24.86 3.49-1.02v10.72h-3.08v.75h7.25v-.75h-2.63zm-8.47-6.13c0 4.67-2.94 8.03-6.99 8.03S6 33.66 6 29.05s2.94-8.03 6.99-8.03 6.95 3.34 6.95 7.95m-1.5-.46c0-3.78-2.29-6.49-5.45-6.49S7.5 24.75 7.5 28.51 9.74 35 12.95 35s5.49-2.73 5.49-6.49"/>
+  <defs>
+    <linearGradient id="a" x1="5.82" x2="35" y1="6.48" y2="34.27" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#283F7A"/>
+      <stop offset=".12" stop-color="#88526F"/>
+      <stop offset=".25" stop-color="#ED6F5F"/>
+      <stop offset=".31" stop-color="#ED8051"/>
+      <stop offset=".36" stop-color="#EE874C"/>
+      <stop offset=".51" stop-color="#84C6D6"/>
+      <stop offset=".67" stop-color="#009EB3"/>
+      <stop offset=".83" stop-color="#60B9E6"/>
+      <stop offset="1" stop-color="#2A5EA6"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/src/rider/main/resources/disassemblerIconMappings.json b/src/rider/main/resources/disassemblerIconMappings.json
new file mode 100644
index 0000000..f738c51
--- /dev/null
+++ b/src/rider/main/resources/disassemblerIconMappings.json
@@ -0,0 +1,7 @@
+{
+  "icons": {
+    "expui": {
+      "disassemblerToolWindow.svg": "icons/disassemblerToolWindow.svg"
+    }
+  }
+}
diff --git a/src/rider/main/resources/icons/disassemblerToolWindow.svg b/src/rider/main/resources/icons/disassemblerToolWindow.svg
new file mode 100644
index 0000000..dea7d77
--- /dev/null
+++ b/src/rider/main/resources/icons/disassemblerToolWindow.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#6e6e6e" fill-rule="evenodd" d="M10.98 7.06c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M11 5.95c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78m-6.02 8.76c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M5 13.6c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78"/>
+  <path fill="#6e6e6e" d="M6.91 6.09H5.86V1.35h-.84l-1.94.62.26.91 1.3-.38v3.59H3.41v.9h3.5zm4.95 7.65h1.05v.9h-3.5v-.9h1.23v-3.59l-1.3.38-.26-.91L11.02 9h.84z"/>
+</svg>
diff --git a/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg b/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg
new file mode 100644
index 0000000..7cd4354
--- /dev/null
+++ b/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#afb1b3" fill-rule="evenodd" d="M10.98 7.06c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M11 5.95c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78m-6.02 8.76c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M5 13.6c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78"/>
+  <path fill="#afb1b3" d="M6.91 6.09H5.86V1.35h-.84l-1.94.62.26.91 1.3-.38v3.59H3.41v.9h3.5zm4.95 7.65h1.05v.9h-3.5v-.9h1.23v-3.59l-1.3.38-.26-.91L11.02 9h.84z"/>
+</svg>
diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg
new file mode 100644
index 0000000..33dfb05
--- /dev/null
+++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#6C707E" fill-rule="evenodd" d="M10.98 7.06c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M11 5.95c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78m-6.02 8.76c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M5 13.6c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78" clip-rule="evenodd"/>
+  <path fill="#6C707E" d="M6.91 6.09H5.86V1.35h-.84l-1.94.62.26.91 1.3-.38v3.59H3.41v.9h3.5zm4.95 7.65h1.05v.9h-3.5v-.9h1.23v-3.59l-1.3.38-.26-.91L11.02 9h.84z"/>
+</svg>
diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg
new file mode 100644
index 0000000..dabb9a0
--- /dev/null
+++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#6C707E" fill-rule="evenodd" d="M13.72 8.83c-1.87 0-3.1-1.57-3.1-3.6v-.02c0-2.03 1.26-3.62 3.12-3.62s3.1 1.57 3.1 3.6v.02c0 2.03-1.25 3.62-3.12 3.62m.03-1.39c.93 0 1.52-.94 1.52-2.21v-.02c0-1.27-.62-2.23-1.54-2.23s-1.52.93-1.52 2.21v.02c0 1.28.61 2.23 1.54 2.23M6.23 18.39c-1.87 0-3.1-1.57-3.1-3.6v-.02c0-2.03 1.26-3.62 3.12-3.62s3.1 1.57 3.1 3.6v.02c0 2.03-1.25 3.62-3.12 3.62M6.25 17c.93 0 1.52-.94 1.52-2.21v-.02c0-1.27-.62-2.23-1.54-2.23s-1.52.93-1.52 2.21v.02c0 1.28.61 2.23 1.54 2.23" clip-rule="evenodd"/>
+  <path fill="#6C707E" d="M8.64 7.61H7.32V1.69H6.27l-2.42.78.32 1.14 1.63-.48v4.48H4.26v1.13h4.37V7.61zm6.19 9.57h1.32v1.13h-4.38v-1.13h1.54V12.7l-1.63.48-.32-1.14 2.42-.78h1.05v5.93z"/>
+</svg>
diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg
new file mode 100644
index 0000000..c86ee18
--- /dev/null
+++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#CED0D6" fill-rule="evenodd" d="M13.72 8.83c-1.87 0-3.1-1.57-3.1-3.6v-.02c0-2.03 1.26-3.62 3.12-3.62s3.1 1.57 3.1 3.6v.02c0 2.03-1.25 3.62-3.12 3.62m.03-1.39c.93 0 1.52-.94 1.52-2.21v-.02c0-1.27-.62-2.23-1.54-2.23s-1.52.93-1.52 2.21v.02c0 1.28.61 2.23 1.54 2.23M6.23 18.39c-1.87 0-3.1-1.57-3.1-3.6v-.02c0-2.03 1.26-3.62 3.12-3.62s3.1 1.57 3.1 3.6v.02c0 2.03-1.25 3.62-3.12 3.62M6.25 17c.93 0 1.52-.94 1.52-2.21v-.02c0-1.27-.62-2.23-1.54-2.23s-1.52.93-1.52 2.21v.02c0 1.28.61 2.23 1.54 2.23" clip-rule="evenodd"/>
+  <path fill="#CED0D6" d="M8.64 7.61H7.32V1.69H6.27l-2.42.78.32 1.14 1.63-.48v4.48H4.26v1.13h4.37V7.61zm6.19 9.57h1.32v1.13h-4.38v-1.13h1.54V12.7l-1.63.48-.32-1.14 2.42-.78h1.05v5.93z"/>
+</svg>
diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg
new file mode 100644
index 0000000..0978329
--- /dev/null
+++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg
@@ -0,0 +1,5 @@
+<!-- Copyright © 2000–2024 JetBrains s.r.o. -->
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#CED0D6" fill-rule="evenodd" d="M10.98 7.06c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M11 5.95c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78m-6.02 8.76c-1.5 0-2.48-1.26-2.48-2.88v-.02c0-1.62 1.01-2.9 2.5-2.9s2.48 1.26 2.48 2.88v.02c0 1.62-1 2.9-2.5 2.9M5 13.6c.74 0 1.22-.75 1.22-1.77v-.02c0-1.02-.5-1.78-1.23-1.78s-1.22.74-1.22 1.77v.02c0 1.02.49 1.78 1.23 1.78" clip-rule="evenodd"/>
+  <path fill="#CED0D6" d="M6.91 6.09H5.86V1.35h-.84l-1.94.62.26.91 1.3-.38v3.59H3.41v.9h3.5zm4.95 7.65h1.05v.9h-3.5v-.9h1.23v-3.59l-1.3.38-.26-.91L11.02 9h.84z"/>
+</svg>