diff --git a/intellij/src/main/kotlin/motif/intellij/MotifService.kt b/intellij/src/main/kotlin/motif/intellij/MotifService.kt
index cfb1adf7..cea7ec95 100644
--- a/intellij/src/main/kotlin/motif/intellij/MotifService.kt
+++ b/intellij/src/main/kotlin/motif/intellij/MotifService.kt
@@ -37,7 +37,6 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.ui.content.Content
 import com.intellij.ui.content.ContentFactory
-import javax.swing.Icon
 import motif.core.ResolvedGraph
 import motif.intellij.analytics.AnalyticsService
 import motif.intellij.analytics.MotifAnalyticsActions
@@ -169,7 +168,7 @@ class MotifService(val project: Project) : Disposable {
       if (toolWindowManager.getToolWindow(TOOL_WINDOW_ID) == null) {
         val toolWindow: ToolWindow =
             toolWindowManager.registerToolWindow(TOOL_WINDOW_ID, true, ToolWindowAnchor.RIGHT)
-        toolWindow.setIcon(IconLoader.getIcon("/icons/icon.svg", Icon::class.java))
+        toolWindow.setIcon(IconLoader.getIcon("/icons/icon.svg", this::class.java))
         toolWindow.title = TOOL_WINDOW_TITLE
 
         scopePanel = MotifScopePanel(project, graph)
diff --git a/intellij/src/main/resources/META-INF/plugin.xml b/intellij/src/main/resources/META-INF/plugin.xml
index e49bd34a..f1b5da87 100644
--- a/intellij/src/main/resources/META-INF/plugin.xml
+++ b/intellij/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin>
     <id>com.uber.motif</id>
-    <name>Motif</name>
+    <name>Uber Motif</name>
     <version>0.0.5</version>
     <vendor email="jetbrains-plugins@uber.com" url="https://www.uber.com/">Uber</vendor>