diff --git a/src/blenderbim/blenderbim/bim/module/model/__init__.py b/src/blenderbim/blenderbim/bim/module/model/__init__.py
index 7c99e0903a..1e80ecb859 100644
--- a/src/blenderbim/blenderbim/bim/module/model/__init__.py
+++ b/src/blenderbim/blenderbim/bim/module/model/__init__.py
@@ -35,7 +35,7 @@ addon_keymaps = []
 
 
 def register():
-    bpy.utils.register_tool(workspace.WallTool, after={"builtin.scale_cage"}, separator=True, group=True)
+    bpy.utils.register_tool(workspace.BimTool, after={"builtin.scale_cage"}, separator=True, group=True)
     bpy.types.Scene.BIMModelProperties = bpy.props.PointerProperty(type=prop.BIMModelProperties)
     bpy.types.VIEW3D_MT_mesh_add.append(grid.add_object_button)
     bpy.types.VIEW3D_MT_mesh_add.append(stair.add_object_button)
@@ -52,7 +52,7 @@ def register():
 
 
 def unregister():
-    bpy.utils.unregister_tool(workspace.WallTool)
+    bpy.utils.unregister_tool(workspace.BimTool)
     del bpy.types.Scene.BIMModelProperties
     bpy.app.handlers.load_post.remove(handler.load_post)
     bpy.types.VIEW3D_MT_mesh_add.remove(grid.add_object_button)
diff --git a/src/blenderbim/blenderbim/bim/module/model/ops.authoring.bim.dat b/src/blenderbim/blenderbim/bim/module/model/ops.authoring.bim.dat
new file mode 100644
index 0000000000..cde9c94df7
Binary files /dev/null and b/src/blenderbim/blenderbim/bim/module/model/ops.authoring.bim.dat differ
diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py
index a29fa7fceb..741276a526 100644
--- a/src/blenderbim/blenderbim/bim/module/model/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py
@@ -1,15 +1,16 @@
+import os
 import bpy
 from bpy.types import WorkSpaceTool
 
 
-class WallTool(WorkSpaceTool):
+class BimTool(WorkSpaceTool):
     bl_space_type = "VIEW_3D"
     bl_context_mode = "OBJECT"
 
-    bl_idname = "bim.wall_tool"
-    bl_label = "Wall Tool"
-    bl_description = "Gives you wall related superpowers"
-    bl_icon = "ops.generic.select_circle"
+    bl_idname = "bim.bim_tool"
+    bl_label = "BIM Tool"
+    bl_description = "Gives you BIM authoring related superpowers"
+    bl_icon = os.path.join(os.path.dirname(__file__), "ops.authoring.bim")
     bl_widget = None
     # https://docs.blender.org/api/current/bpy.types.KeyMapItems.html
     bl_keymap = (
diff --git a/src/blenderbim/icon.blend b/src/blenderbim/icon.blend
new file mode 100644
index 0000000000..b804c2ab9b
Binary files /dev/null and b/src/blenderbim/icon.blend differ