diff --git a/plugin/openstudio.rb b/plugin/openstudio.rb
index 621e671..bc1cba3 100644
--- a/plugin/openstudio.rb
+++ b/plugin/openstudio.rb
@@ -32,7 +32,7 @@
 
 module OpenStudio
   SKETCHUPPLUGIN_NAME = "OpenStudio"
-  SKETCHUPPLUGIN_VERSION = "1.2.1"
+  SKETCHUPPLUGIN_VERSION = "1.3.0"
   SKETCHUPPLUGIN_LAUNCH_GETTING_STARTED_ON_START = false
 end
 
diff --git a/plugin/openstudio/lib/MenuManager.rb b/plugin/openstudio/lib/MenuManager.rb
index 80f2e47..0a255e7 100644
--- a/plugin/openstudio/lib/MenuManager.rb
+++ b/plugin/openstudio/lib/MenuManager.rb
@@ -125,8 +125,8 @@ def create_commands
 
       # Create all the commands (They must still be added to menus and toolbars next)
       @new_cmd = UI::Command.new("New OpenStudio Model") { Plugin.command_manager.new_openstudio }
-      @new_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSNew-16.png"
-      @new_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSNew-24.png"
+      @new_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os_new" + Plugin.image_ext
+      @new_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os_new" + Plugin.image_ext
       @new_cmd.tooltip = "New OpenStudio Model"
       @new_cmd.status_bar_text = "Create a new OpenStudio model"
       @new_cmd.set_validation_proc {
@@ -143,29 +143,29 @@ def create_commands
 
       # Create all the commands (They must still be added to menus and toolbars next)
       @new_from_wizard_cmd = UI::Command.new("New OpenStudio Model From Wizard") { Plugin.command_manager.new_openstudio_from_wizard }
-      @new_from_wizard_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSNew-16.png"
-      @new_from_wizard_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSNew-24.png"
+      @new_from_wizard_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os_new" + Plugin.image_ext
+      @new_from_wizard_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os_new" + Plugin.image_ext
       @new_from_wizard_cmd.tooltip = "New OpenStudio Model From Wizard"
       @new_from_wizard_cmd.status_bar_text = "Create a new OpenStudio model from a wizard"
       @new_from_wizard_cmd.set_validation_proc { enable_if_model_interface }
 
       @open_cmd = UI::Command.new("Open OpenStudio Model") { Plugin.command_manager.open_openstudio }
-      @open_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSOpen-16.png"
-      @open_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSOpen-24.png"
+      @open_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os_open" + Plugin.image_ext
+      @open_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os_open" + Plugin.image_ext
       @open_cmd.tooltip = "Open OpenStudio Model"
       @open_cmd.status_bar_text = "Open an existing OpenStudio model"
       @open_cmd.set_validation_proc { enable_if_model_interface }
 
       @save_cmd = UI::Command.new("Save OpenStudio Model") { Plugin.command_manager.save_openstudio }
-      @save_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSSave-16.png"
-      @save_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSSave-24.png"
+      @save_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os_save" + Plugin.image_ext
+      @save_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os_save" + Plugin.image_ext
       @save_cmd.tooltip = "Save OpenStudio Model"
       @save_cmd.status_bar_text = "Save the OpenStudio model"
       @save_cmd.set_validation_proc { enable_if_model_interface }
 
       @save_as_cmd = UI::Command.new("Save OpenStudio Model As") { Plugin.command_manager.save_openstudio_as }
-      @save_as_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSSaveAs-16.png"
-      @save_as_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSSaveAs-24.png"
+      @save_as_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os_save_as" + Plugin.image_ext
+      @save_as_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os_save_as" + Plugin.image_ext
       @save_as_cmd.tooltip = "Save OpenStudio Model As"
       @save_as_cmd.status_bar_text = "Save the OpenStudio model as a new file"
       @save_as_cmd.set_validation_proc { enable_if_model_interface }
@@ -183,8 +183,8 @@ def create_commands
       @import_space_types_cmd.set_validation_proc { enable_if_model_interface }
 
       @import_idf_cmd = UI::Command.new("Import EnergyPlus Idf") { Plugin.command_manager.import_idf }
-      @import_idf_cmd.small_icon = Plugin.dir + "/lib/resources/icons/IDFImport-16.png"
-      @import_idf_cmd.large_icon = Plugin.dir + "/lib/resources/icons/IDFImport-24.png"
+      @import_idf_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_IDFimport" + Plugin.image_ext
+      @import_idf_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_IDFimport" + Plugin.image_ext
       @import_idf_cmd.tooltip = "Import EnergyPlus Idf"
       @import_idf_cmd.status_bar_text = "Import an EnergyPlus Idf to OpenStudio"
       @import_idf_cmd.set_validation_proc { enable_if_model_interface }
@@ -219,8 +219,8 @@ def create_commands
        }
 
       @export_idf_cmd = UI::Command.new("Export EnergyPlus Idf") { Plugin.command_manager.export_idf }
-      @export_idf_cmd.small_icon = Plugin.dir + "/lib/resources/icons/IDFExport-16.png"
-      @export_idf_cmd.large_icon = Plugin.dir + "/lib/resources/icons/IDFExport-24.png"
+      @export_idf_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_IDFexport" + Plugin.image_ext
+      @export_idf_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_IDFexport" + Plugin.image_ext
       @export_idf_cmd.tooltip = "Export EnergyPlus Idf"
       @export_idf_cmd.status_bar_text = "Export an OpenStudio model as an EnergyPlus Idf"
       @export_idf_cmd.set_validation_proc { enable_if_model_interface }
@@ -232,78 +232,78 @@ def create_commands
       @export_sdd_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_space_cmd = UI::Command.new("New Space") { Sketchup.active_model.select_tool(@new_space_tool) }
-      @new_space_cmd.small_icon = Plugin.dir + "/lib/resources/icons/new_space_16.png"
-      @new_space_cmd.large_icon = Plugin.dir + "/lib/resources/icons/new_space.png"
+      @new_space_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_space2" + Plugin.image_ext
+      @new_space_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_space2" + Plugin.image_ext
       @new_space_cmd.tooltip = "New Space"
       @new_space_cmd.status_bar_text = "Create a new space"
       @new_space_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_shading_surface_group_cmd = UI::Command.new("New Shading Surface Group") { Sketchup.active_model.select_tool(@new_shading_surface_group_tool)  }
-      @new_shading_surface_group_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewShading-16.png"
-      @new_shading_surface_group_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewShading-24.png"
+      @new_shading_surface_group_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_shading" + Plugin.image_ext
+      @new_shading_surface_group_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_shading" + Plugin.image_ext
       @new_shading_surface_group_cmd.tooltip = "New Shading Surface Group"
       @new_shading_surface_group_cmd.status_bar_text = "Create a new shading surface group"
       @new_shading_surface_group_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_interior_partition_surface_cmd = UI::Command.new("New Interior Partition Surface Group") { Sketchup.active_model.select_tool(@new_interior_partition_surface_tool)  }
-      @new_interior_partition_surface_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewPartition-16.png"
-      @new_interior_partition_surface_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewPartition-24.png"
+      @new_interior_partition_surface_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_partition" + Plugin.image_ext
+      @new_interior_partition_surface_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_partition" + Plugin.image_ext
       @new_interior_partition_surface_cmd.tooltip = "New Interior Partition Surface Group"
       @new_interior_partition_surface_cmd.status_bar_text = "Create a new interior partition surface group"
       @new_interior_partition_surface_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_daylighting_cmd = UI::Command.new("New Daylighting Control") { Sketchup.active_model.select_tool(@new_daylighting_tool)  }
-      @new_daylighting_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewDaylighting-16.png"
-      @new_daylighting_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewDaylighting-24.png"
+      @new_daylighting_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_daylighting" + Plugin.image_ext
+      @new_daylighting_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_daylighting" + Plugin.image_ext
       @new_daylighting_cmd.tooltip = "New Daylighting Control"
       @new_daylighting_cmd.status_bar_text = "Create a new daylighting control"
       @new_daylighting_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_illuminance_cmd = UI::Command.new("New Illuminance Map") { Sketchup.active_model.select_tool(@new_illuminance_tool)  }
-      @new_illuminance_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewIlluminance-16.png"
-      @new_illuminance_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewIlluminance-24.png"
+      @new_illuminance_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_illuminance" + Plugin.image_ext
+      @new_illuminance_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_illuminance" + Plugin.image_ext
       @new_illuminance_cmd.tooltip = "New Illuminance Map"
       @new_illuminance_cmd.status_bar_text = "Create a new illuminance map"
       @new_illuminance_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_luminaire_cmd = UI::Command.new("New Luminaire") { Sketchup.active_model.select_tool(@new_luminaire_tool)  }
-      @new_luminaire_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewLuminaire-16.png"
-      @new_luminaire_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewLuminaire-24.png"
+      @new_luminaire_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_luminaire" + Plugin.image_ext
+      @new_luminaire_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_luminaire" + Plugin.image_ext
       @new_luminaire_cmd.tooltip = "New Luminaire"
       @new_luminaire_cmd.status_bar_text = "Create a new luminaire"
       @new_luminaire_cmd.set_validation_proc { enable_if_model_interface }
 
       @new_glare_cmd = UI::Command.new("New Glare Sensor") { Sketchup.active_model.select_tool(@new_glare_tool)  }
-      @new_glare_cmd.small_icon = Plugin.dir + "/lib/resources/icons/NewGlare-16.png"
-      @new_glare_cmd.large_icon = Plugin.dir + "/lib/resources/icons/NewGlare-24.png"
+      @new_glare_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_new_glare" + Plugin.image_ext
+      @new_glare_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_new_glare" + Plugin.image_ext
       @new_glare_cmd.tooltip = "New Glare Sensor"
       @new_glare_cmd.status_bar_text = "Create a new glare sensor"
       @new_glare_cmd.set_validation_proc { enable_if_model_interface }
 
       @surface_matching_cmd = UI::Command.new("Surface Matching") { Plugin.dialog_manager.show(SurfaceMatchingInterface) }
-      @surface_matching_cmd.small_icon = Plugin.dir + "/lib/resources/icons/SurfaceMatchingSelected-16.png"
-      @surface_matching_cmd.large_icon = Plugin.dir + "/lib/resources/icons/SurfaceMatchingSelected-24.png"
+      @surface_matching_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_surface_matching_selected" + Plugin.image_ext
+      @surface_matching_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_surface_matching_selected" + Plugin.image_ext
       @surface_matching_cmd.tooltip = "Surface Matching"
       @surface_matching_cmd.status_bar_text = "Match surfaces of selected objects across Spaces"
       @surface_matching_cmd.set_validation_proc { Plugin.dialog_manager.validate(SurfaceMatchingInterface) if (Plugin.dialog_manager) }
 
       @space_attributes_cmd = UI::Command.new("Set Attributes for Selected Spaces") { load Plugin.dir + '/lib/dialogs/SpaceAttributesInterface.rb' }
-      @space_attributes_cmd.small_icon = Plugin.dir + "/lib/resources/icons/edit_spaces_16.png"
-      @space_attributes_cmd.large_icon = Plugin.dir + "/lib/resources/icons/edit_spaces.png"
+      @space_attributes_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_edit_spaces" + Plugin.image_ext
+      @space_attributes_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_edit_spaces" + Plugin.image_ext
       @space_attributes_cmd.tooltip = "Set Attributes for Selected Spaces"
       @space_attributes_cmd.status_bar_text = "Set Attributes for Selected Spaces"
       @space_attributes_cmd.set_validation_proc { enable_if_model_interface }
 
       @space_diagram_cmd = UI::Command.new("Create Spaces From Diagram") { load Plugin.dir + '/lib/dialogs/SpaceDiagramInterface.rb' }
-      @space_diagram_cmd.small_icon = Plugin.dir + "/lib/resources/icons/extrude_16.png"
-      @space_diagram_cmd.large_icon = Plugin.dir + "/lib/resources/icons/extrude.png"
+      @space_diagram_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_extrude" + Plugin.image_ext
+      @space_diagram_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_extrude" + Plugin.image_ext
       @space_diagram_cmd.tooltip = "Create Spaces From Diagram"
       @space_diagram_cmd.status_bar_text = "Create Spaces From Diagram"
       @space_diagram_cmd.set_validation_proc { enable_if_model_interface }
 
       @loose_geometry_cmd = UI::Command.new("Project Loose Geometry") { Plugin.dialog_manager.show(LooseGeometryInterface) }
-      @loose_geometry_cmd.small_icon = Plugin.dir + "/lib/resources/icons/windows_transparent-16.png"
-      @loose_geometry_cmd.large_icon = Plugin.dir + "/lib/resources/icons/windows_transparent.png"
+      @loose_geometry_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_windows_transparent" + Plugin.image_ext
+      @loose_geometry_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_windows_transparent" + Plugin.image_ext
       @loose_geometry_cmd.tooltip = "Project Loose Geometry"
       @loose_geometry_cmd.status_bar_text = "Project loose geometry onto OpenStudio surfaces"
       @loose_geometry_cmd.set_validation_proc { Plugin.dialog_manager.validate(LooseGeometryInterface) if (Plugin.dialog_manager) }
@@ -312,64 +312,39 @@ def create_commands
         Plugin.dialog_manager.inspector_dialog.restoreState
         Plugin.dialog_manager.inspector_dialog.show
       }
-      @inspector_dialog_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Inspector-16.png"
-      @inspector_dialog_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Inspector-24.png"
+      @inspector_dialog_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_inspector" + Plugin.image_ext
+      @inspector_dialog_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_inspector" + Plugin.image_ext
       @inspector_dialog_cmd.tooltip = "Inspector"
       @inspector_dialog_cmd.status_bar_text = "Display and edit the selected object"
       @inspector_dialog_cmd.set_validation_proc { enable_if_model_interface }
 
       @surface_search_cmd = UI::Command.new("Surface Search") { Plugin.dialog_manager.show(SurfaceSearchInterface) }
-      @surface_search_cmd.small_icon = Plugin.dir + "/lib/resources/icons/SurfaceSearch-16.png"
-      @surface_search_cmd.large_icon = Plugin.dir + "/lib/resources/icons/SurfaceSearch-24.png"
+      @surface_search_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_surface search" + Plugin.image_ext
+      @surface_search_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_surface search" + Plugin.image_ext
       @surface_search_cmd.tooltip = "Search Surfaces"
       @surface_search_cmd.status_bar_text = "Search surfaces in the model"
       @surface_search_cmd.set_validation_proc { Plugin.dialog_manager.validate(SurfaceSearchInterface) if (Plugin.dialog_manager) }
 
       @info_tool_cmd = UI::Command.new("Info Tool") { Sketchup.active_model.tools.push_tool(@info_tool) }
-      @info_tool_cmd.small_icon = Plugin.dir + "/lib/resources/icons/InfoTool-16.png"
-      @info_tool_cmd.large_icon = Plugin.dir + "/lib/resources/icons/InfoTool-24.png"
+      @info_tool_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_infotool" + Plugin.image_ext
+      @info_tool_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_infotool" + Plugin.image_ext
       @info_tool_cmd.tooltip = "Info Tool"
       @info_tool_cmd.status_bar_text = "Show object data at a glance"
       @info_tool_cmd.set_validation_proc { enable_if_model_interface }
 
       @show_errors_cmd = UI::Command.new("Show Errors And Warnings") { Plugin.model_manager.model_interface.show_errors }
-      @show_errors_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Warning-16.png"
-      @show_errors_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Warning-24.png"
+      @show_errors_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_warning" + Plugin.image_ext
+      @show_errors_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_warning" + Plugin.image_ext
       @show_errors_cmd.tooltip = "Show Errors And Warnings"
       @show_errors_cmd.status_bar_text = "Show errors and warnings"
       @show_errors_cmd.set_validation_proc { enable_if_model_interface }
 
-      #@render_defaults_cmd = UI::Command.new("Render Default Values") {
-      #  Plugin.model_manager.model_interface.materials_interface.render_defaults = (not Plugin.model_manager.model_interface.materials_interface.render_defaults) }
-      ##@render_defaults_cmd.small_icon = Plugin.dir + "/lib/resources/icons/tbRenderTransparentSmall.png"
-      ##@render_defaults_cmd.large_icon = Plugin.dir + "/lib/resources/icons/tbRenderTransparentLarge.png"
-      #@render_defaults_cmd.tooltip = "Render Default Values"
-      #@render_defaults_cmd.status_bar_text = "Render default values"
-      #@render_defaults_cmd.set_validation_proc {
-      #  result = MF_GRAYED
-      #  if model_manager = Plugin.model_manager
-      #    if model_interface = model_manager.model_interface
-      #      rendering_mode = model_interface.materials_interface.rendering_mode
-      #      if rendering_mode == RenderByConstruction
-      #        if (model_interface.materials_interface.render_defaults)
-      #          result = MF_CHECKED
-      #        else
-      #          result = MF_UNCHECKED
-      #        end
-      #      else
-      #        result = MF_GRAYED
-      #      end
-      #    end
-      #  end
-      #  result
-      #}
-
       @render_by_class_cmd = UI::Command.new("Render By Surface Type") {
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByClass }
         Plugin.add_event( proc )
       }
-      @render_by_class_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_surface_class_16.png"
-      @render_by_class_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_surface_class.png"
+      @render_by_class_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_surface_class" + Plugin.image_ext
+      @render_by_class_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_surface_class" + Plugin.image_ext
       @render_by_class_cmd.tooltip = "Render By SurfaceType"
       @render_by_class_cmd.status_bar_text = "Render objects by surface type"
       @render_by_class_cmd.set_validation_proc {
@@ -388,8 +363,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByDataValue }
         Plugin.add_event( proc )
       }
-      @render_by_data_value_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_data_16.png"
-      @render_by_data_value_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_data.png"
+      @render_by_data_value_cmd.small_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
+      @render_by_data_value_cmd.large_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
       @render_by_data_value_cmd.tooltip = "Render By Data Value"
       @render_by_data_value_cmd.status_bar_text = "Render objects by data value"
       @render_by_data_value_cmd.set_validation_proc {
@@ -408,8 +383,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByBoundary }
         Plugin.add_event( proc )
       }
-      @render_by_boundary_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_boundary_16.png"
-      @render_by_boundary_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_boundary.png"
+      @render_by_boundary_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_boundary" + Plugin.image_ext
+      @render_by_boundary_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_boundary" + Plugin.image_ext
       @render_by_boundary_cmd.tooltip = "Render By Boundary Condition"
       @render_by_boundary_cmd.status_bar_text = "Render objects by boundary condition"
       @render_by_boundary_cmd.set_validation_proc {
@@ -428,8 +403,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByLayer }
         Plugin.add_event( proc )
       }
-      #@render_by_layer_cmd.small_icon = Plugin.dir + "/lib/resources/icons/DisplayColorByLayer-16x16.png"
-      #@render_by_layer_cmd.large_icon = Plugin.dir + "/lib/resources/icons/DisplayColorByLayer-24x24.png"
+      @render_by_layer_cmd.small_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
+      @render_by_layer_cmd.large_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
       @render_by_layer_cmd.tooltip = "Render By Layer"
       @render_by_layer_cmd.status_bar_text = "Render objects by layer"
       @render_by_layer_cmd.set_validation_proc {
@@ -448,8 +423,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderBySurfaceNormal }
         Plugin.add_event( proc )
       }
-      #@render_by_surface_normal_cmd.small_icon = Plugin.dir + "/lib/resources/icons/RenderMode5-16x16.png"
-      #@render_by_surface_normal_cmd.large_icon = Plugin.dir + "/lib/resources/icons/RenderMode5-24x24.png"
+      @render_by_surface_normal_cmd.small_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
+      @render_by_surface_normal_cmd.large_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
       @render_by_surface_normal_cmd.tooltip = "Render By Surface Normal"
       @render_by_surface_normal_cmd.status_bar_text = "Render objects by surface normal"
       @render_by_surface_normal_cmd.set_validation_proc {
@@ -468,8 +443,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByConstruction }
         Plugin.add_event( proc )
       }
-      @render_by_construction_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_construction_16.png"
-      @render_by_construction_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_construction.png"
+      @render_by_construction_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_construction" + Plugin.image_ext
+      @render_by_construction_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_construction" + Plugin.image_ext
       @render_by_construction_cmd.tooltip = "Render By Construction"
       @render_by_construction_cmd.status_bar_text = "Render objects by construction"
       @render_by_construction_cmd.set_validation_proc {
@@ -488,8 +463,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderBySpaceType }
         Plugin.add_event( proc )
       }
-      @render_by_space_type_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_space_type_16.png"
-      @render_by_space_type_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_space_type.png"
+      @render_by_space_type_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_spacetype" + Plugin.image_ext
+      @render_by_space_type_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_spacetype" + Plugin.image_ext
       @render_by_space_type_cmd.tooltip = "Render By Space Type"
       @render_by_space_type_cmd.status_bar_text = "Render objects by space type"
       @render_by_space_type_cmd.set_validation_proc {
@@ -508,8 +483,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByThermalZone }
         Plugin.add_event( proc )
       }
-      @render_by_thermal_zone_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_therm_zone_16.png"
-      @render_by_thermal_zone_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_therm_zone.png"
+      @render_by_thermal_zone_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_therm_zone" + Plugin.image_ext
+      @render_by_thermal_zone_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_therm_zone" + Plugin.image_ext
       @render_by_thermal_zone_cmd.tooltip = "Render By Thermal Zone"
       @render_by_thermal_zone_cmd.status_bar_text = "Render objects by thermal zone"
       @render_by_thermal_zone_cmd.set_validation_proc {
@@ -528,8 +503,8 @@ def create_commands
         proc = Proc.new { Plugin.model_manager.model_interface.materials_interface.rendering_mode = RenderByBuildingStory }
         Plugin.add_event( proc )
       }
-      @render_by_building_story_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_story_16.png"
-      @render_by_building_story_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_story.png"
+      @render_by_building_story_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_render_story" + Plugin.image_ext
+      @render_by_building_story_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_render_story" + Plugin.image_ext
       @render_by_building_story_cmd.tooltip = "Render By Building Story"
       @render_by_building_story_cmd.status_bar_text = "Render objects by building story"
       @render_by_building_story_cmd.set_validation_proc {
@@ -545,8 +520,8 @@ def create_commands
       }
 
       @color_scale_cmd = UI::Command.new("Color Scale") { Plugin.dialog_manager.show(ColorScaleInterface) }
-      @color_scale_cmd.small_icon = Plugin.dir + "/lib/resources/icons/render_color_scale_16.png"
-      @color_scale_cmd.large_icon = Plugin.dir + "/lib/resources/icons/render_color_scale.png"
+      @color_scale_cmd.small_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
+      @color_scale_cmd.large_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
       @color_scale_cmd.tooltip = "Color Scale"
       @color_scale_cmd.status_bar_text = "Show color scale window"
       @color_scale_cmd.set_validation_proc { Plugin.dialog_manager.validate(ColorScaleInterface) if (Plugin.dialog_manager) }
@@ -567,16 +542,15 @@ def create_commands
           end
         end
       end
-      @openstudio_cmd.small_icon = Plugin.dir + "/lib/resources/icons/os_16.png"
-# replace this with 24pix icon
-      @openstudio_cmd.large_icon = Plugin.dir + "/lib/resources/icons/os_24.png"
+      @openstudio_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_os" + Plugin.image_ext
+      @openstudio_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_os" + Plugin.image_ext
       @openstudio_cmd.tooltip = "Launch Openstudio"
       @openstudio_cmd.status_bar_text = "Launch Openstudio"
       @openstudio_cmd.set_validation_proc { enable_if_model_interface }
 
       @online_help_cmd = UI::Command.new("Online Reference") { UI.openURL("https://openstudiocoalition.org/reference/sketchup_plugin_interface/")  }
-      @online_help_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Help-16.png"
-      @online_help_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Help-24.png"
+      @online_help_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_help" + Plugin.image_ext
+      @online_help_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_help" + Plugin.image_ext
       @online_help_cmd.tooltip = "Online OpenStudio Help"
       @online_help_cmd.status_bar_text = "View the Online OpenStudio Help"
       @online_help_cmd.set_validation_proc { MF_ENABLED }
@@ -590,16 +564,16 @@ def create_commands
       # Shortcuts for SketchUp Commands
 
 #      @outliner_cmd = UI::Command.new("Outliner") { UI.show_inspector("Outliner") }
-#      @outliner_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Outliner-16.png"
-#      @outliner_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Outliner-24.png"
+#      @outliner_cmd.small_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
+#      @outliner_cmd.large_icon = Plugin.dir + "/lib/resources/icons/delete_this" + Plugin.image_ext
 #      @outliner_cmd.tooltip = "Show Outliner Window"
 #      @outliner_cmd.status_bar_text = "Show hierarchical outline of all SketchUp groups and components"
 #      @outliner_cmd.set_validation_proc { MF_ENABLED }
 
       @hide_rest_cmd = UI::Command.new("Hide Rest of Model") {
         Sketchup.active_model.rendering_options["InactiveHidden"] = (not Sketchup.active_model.rendering_options["InactiveHidden"]) }
-      @hide_rest_cmd.small_icon = Plugin.dir + "/lib/resources/icons/HideRest-16.png"
-      @hide_rest_cmd.large_icon = Plugin.dir + "/lib/resources/icons/HideRest-24.png"
+      @hide_rest_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_hiderest" + Plugin.image_ext
+      @hide_rest_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_hiderest" + Plugin.image_ext
       @hide_rest_cmd.tooltip = "Hide Rest of Model"
       @hide_rest_cmd.status_bar_text = "Hide all inactive SketchUp groups and components"
       @hide_rest_cmd.set_validation_proc {
@@ -616,8 +590,8 @@ def create_commands
 
       @hidden_geom_cmd = UI::Command.new("View Hidden Geometry") {
         Sketchup.active_model.rendering_options["DrawHidden"] = (not Sketchup.active_model.rendering_options["DrawHidden"]) }
-      @hidden_geom_cmd.small_icon = Plugin.dir + "/lib/resources/icons/SU_ViewHidden-16.png"
-      @hidden_geom_cmd.large_icon = Plugin.dir + "/lib/resources/icons/SU_ViewHidden-24.png"
+      @hidden_geom_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_SU_ViewHidden" + Plugin.image_ext
+      @hidden_geom_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_SU_ViewHidden" + Plugin.image_ext
       @hidden_geom_cmd.tooltip = "View Hidden Geometry"
       @hidden_geom_cmd.status_bar_text = "View/hide hidden geometry"
       @hidden_geom_cmd.set_validation_proc {
@@ -634,8 +608,8 @@ def create_commands
 
       @xray_cmd = UI::Command.new("X-ray Rendering") {
         Sketchup.active_model.rendering_options["ModelTransparency"] = (not Sketchup.active_model.rendering_options["ModelTransparency"]) }
-      @xray_cmd.small_icon = Plugin.dir + "/lib/resources/icons/tbRenderTransparentSmall.png"
-      @xray_cmd.large_icon = Plugin.dir + "/lib/resources/icons/tbRenderTransparentLarge.png"
+      @xray_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_tb_render_transparent" + Plugin.image_ext
+      @xray_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_tb_render_transparent" + Plugin.image_ext
       @xray_cmd.tooltip = "View Model in X-Ray Mode"
       @xray_cmd.status_bar_text = "Turn transparent x-ray mode on and off"
       @xray_cmd.set_validation_proc {
@@ -651,56 +625,12 @@ def create_commands
       }
 
       @shadow_settings_cmd = UI::Command.new("Shadow Settings") { UI.show_inspector("Shadows") }
-      @shadow_settings_cmd.small_icon = Plugin.dir + "/lib/resources/icons/SUShadows-16x16.png"
-      @shadow_settings_cmd.large_icon = Plugin.dir + "/lib/resources/icons/SUShadows-24x24.png"
+      @shadow_settings_cmd.small_icon = Plugin.dir + "/lib/resources/icons/OSC_SU_shadows" + Plugin.image_ext
+      @shadow_settings_cmd.large_icon = Plugin.dir + "/lib/resources/icons/OSC_SU_shadows" + Plugin.image_ext
       @shadow_settings_cmd.tooltip = "Show Shadow Settings Dialog"
       @shadow_settings_cmd.status_bar_text = "Show time of day and day of year for shadow settings"
       @shadow_settings_cmd.set_validation_proc { MF_ENABLED }
 
-      # Animation commands
-
-      @anim_settings_cmd = UI::Command.new("Settings") { Plugin.dialog_manager.show(AnimationSettingsInterface) }
-      @anim_settings_cmd.small_icon = Plugin.dir + "/lib/resources/icons/AnimationSettings~16.png"
-      @anim_settings_cmd.large_icon = Plugin.dir + "/lib/resources/icons/AnimationSettings~24.png"
-      @anim_settings_cmd.tooltip = "Animation Settings"
-      @anim_settings_cmd.status_bar_text = "Show animation settings"
-      @anim_settings_cmd.set_validation_proc { Plugin.dialog_manager.validate(AnimationSettingsInterface) if (Plugin.dialog_manager) }
-
-      @rwd_to_start_cmd = UI::Command.new("Reverse To Marker") { Plugin.animation_manager.reverse_to_marker }
-      @rwd_to_start_cmd.small_icon = Plugin.dir + "/lib/resources/icons/RewindFull16.png"
-      @rwd_to_start_cmd.large_icon = Plugin.dir + "/lib/resources/icons/RewindFull24.png"
-      @rwd_to_start_cmd.tooltip = "Reverse To Marker"
-      @rwd_to_start_cmd.status_bar_text = "Reverse animation to previous marker"
-      @rwd_to_start_cmd.set_validation_proc { Plugin.animation_manager.validate_reverse if (Plugin.animation_manager) }
-
-      @rwd_anim_cmd = UI::Command.new("Reverse") { Plugin.animation_manager.reverse }
-      @rwd_anim_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Rewind16.png"
-      @rwd_anim_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Rewind24.png"
-      @rwd_anim_cmd.tooltip = "Reverse Frame"
-      @rwd_anim_cmd.status_bar_text = "Reverse animation by one frame"
-      @rwd_anim_cmd.set_validation_proc { Plugin.animation_manager.validate_reverse if (Plugin.animation_manager) }
-
-      @play_anim_cmd = UI::Command.new("Play") { Plugin.animation_manager.play }
-      @play_anim_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Play16.png"
-      @play_anim_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Play24.png"
-      @play_anim_cmd.tooltip = "Play"
-      @play_anim_cmd.status_bar_text = "Play animation"
-      @play_anim_cmd.set_validation_proc { Plugin.animation_manager.validate_play_animation if (Plugin.animation_manager) }
-
-      @fwd_anim_cmd = UI::Command.new("Forward") { Plugin.animation_manager.forward }
-      @fwd_anim_cmd.small_icon = Plugin.dir + "/lib/resources/icons/Forward16.png"
-      @fwd_anim_cmd.large_icon = Plugin.dir + "/lib/resources/icons/Forward24.png"
-      @fwd_anim_cmd.tooltip = "Forward Frame"
-      @fwd_anim_cmd.status_bar_text = "Forward animation by one frame"
-      @fwd_anim_cmd.set_validation_proc { Plugin.animation_manager.validate_forward if (Plugin.animation_manager) }
-
-      @fwd_to_end_cmd = UI::Command.new("Forward To Marker") { Plugin.animation_manager.forward_to_marker }
-      @fwd_to_end_cmd.small_icon = Plugin.dir + "/lib/resources/icons/ForwardFull16.png"
-      @fwd_to_end_cmd.large_icon = Plugin.dir + "/lib/resources/icons/ForwardFull24.png"
-      @fwd_to_end_cmd.tooltip = "Forward To Marker"
-      @fwd_to_end_cmd.status_bar_text = "Forward animation to next marker"
-      @fwd_to_end_cmd.set_validation_proc { Plugin.animation_manager.validate_forward if (Plugin.animation_manager) }
-
       # Commands that don't go on the toolbar
 
       @prefs_cmd = UI::Command.new("Preferences") { Plugin.dialog_manager.show(PreferencesInterface) }
@@ -782,7 +712,7 @@ def create_menus
       @help_menu.set_validation_proc(id) { MF_ENABLED }
 
       id = @plugin_menu.add_item(@update_cmd)
-      @plugin_menu.set_validation_proc(id) { 
+      @plugin_menu.set_validation_proc(id) {
         if OpenStudio::UPDATE_MANAGER && Plugin.update_manager.nil?
           MF_ENABLED
         else
diff --git a/plugin/openstudio/lib/PluginManager.rb b/plugin/openstudio/lib/PluginManager.rb
index bc60a3d..9b7bdd6 100644
--- a/plugin/openstudio/lib/PluginManager.rb
+++ b/plugin/openstudio/lib/PluginManager.rb
@@ -104,7 +104,7 @@ def self.current_call_stack
   # PluginManager is an App level class, its members correspond to global variables
   class PluginManager
 
-    attr_reader :name, :version, :dir, :profile_running
+    attr_reader :name, :version, :dir, :image_ext, :profile_running
     attr_reader :event_queue
     attr_reader :openstudio_application_dir
 
@@ -117,6 +117,7 @@ def initialize
       @version = OpenStudio::SKETCHUPPLUGIN_VERSION
       @dir = File.dirname(__FILE__) + "/.."
       @profile_running = false
+      @image_ext = platform_select('.svg', '.pdf')
 
       # this global variable is set by openstudio.rb
       @openstudio_application_dir = eval("$OPENSTUDIO_APPLICATION_DIR")
@@ -199,7 +200,7 @@ def start
       add_event( proc )
 
       if OpenStudio::SKETCHUPPLUGIN_LAUNCH_GETTING_STARTED_ON_START
-        UI.openURL("http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/")
+        UI.openURL("https://openstudiocoalition.org/reference/sketchup_plugin_interface/")
       end
 
       @process_events_timer_id = nil
@@ -542,9 +543,9 @@ def log(level, message)
 
   # initialize QApplication
   OpenStudio::ApplicationClass::instance.application(true)
-  OpenStudio::ApplicationClass::instance.application.setOrganizationName("NREL")
-  OpenStudio::ApplicationClass::instance.application.setOrganizationDomain("nrel.gov")
-  OpenStudio::ApplicationClass::instance.application.setApplicationName("OpenStudio")
+  OpenStudio::ApplicationClass::instance.application.setOrganizationName("OpenStudio Coalition")
+  OpenStudio::ApplicationClass::instance.application.setOrganizationDomain("openstudiocoalition.org")
+  OpenStudio::ApplicationClass::instance.application.setApplicationName("OpenStudioSketchUpPlugIn")
 
   # get SketchUp Qt Widget if possible
   SketchUpWidget = OpenStudio::ApplicationClass::instance.sketchUpWidget
diff --git a/plugin/openstudio/lib/dialogs/html/About.html b/plugin/openstudio/lib/dialogs/html/About.html
index e92211c..72dc15f 100644
--- a/plugin/openstudio/lib/dialogs/html/About.html
+++ b/plugin/openstudio/lib/dialogs/html/About.html
@@ -18,19 +18,21 @@
 
 <center>
 
-<a href="https://openstudiocoalition.org/" target="_blank"><img src="sp_png_256x256.png" border="0"></a>
+<a href="https://openstudiocoalition.org/" target="_blank"><img src="os_256.png" border="0" width="250" height="250"></a>
 
 <br>
 
-<span style="font-size:x-large;">OpenStudio SketchUp Plug-in</span><br><br>
-SketchUp Plug-in Version:<br><input id="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" name="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
-OpenStudio Application Dir:<br><input id="OPENSTUDIO_APPLICATION_DIR" name="OPENSTUDIO_APPLICATION_DIR" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
+<span style="font-size:x-large;">OpenStudio SketchUp Plug-in</span><br><br><br><br>
+
+<b>SketchUp Plug-in Version:</b><br><input id="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" name="OPENSTUDIO_SKETCHUPPLUGIN_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
 <a href="https://openstudiocoalition.org/" target="_blank">https://openstudiocoalition.org/</a><br><br>
 
-OpenStudio SDK (core) Version:<br><input id="OPENSTUDIO_VERSION" name="OPENSTUDIO_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
+<b>OpenStudio Application Dir:</b><br><input id="OPENSTUDIO_APPLICATION_DIR" name="OPENSTUDIO_APPLICATION_DIR" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br><br>
+
+<b>OpenStudio SDK (core) Version:</b><br><input id="OPENSTUDIO_VERSION" name="OPENSTUDIO_VERSION" type="text" size="50" class="static_text" style="text-align:center; border:0; border-style:solid;" readonly><br>
 <a href="https://openstudio.net" target="_blank">https://openstudio.net/</a><br><br>
 
-Copyright &copy; 2020-2021, OpenStudio Coalition and other contributors<br><br>
+<b>Copyright &copy; 2020-2021:</b><br>OpenStudio Coalition and other contributors<br><br>
 
 <input id="ok" onclick="onOK()" type="button" class="button" value="     OK     ">
 
diff --git a/plugin/openstudio/lib/dialogs/html/SurfaceMatching.html b/plugin/openstudio/lib/dialogs/html/SurfaceMatching.html
index 48de51c..582276a 100644
--- a/plugin/openstudio/lib/dialogs/html/SurfaceMatching.html
+++ b/plugin/openstudio/lib/dialogs/html/SurfaceMatching.html
@@ -39,7 +39,7 @@
 <body onload="onLoad()" link="#0000FF" alink="#0000FF" vlink="#0000FF" class="label">
 
 <fieldset>
-<legend>Intersect and Divide Inter-Zone Surfaces <a href="http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
+<legend>Intersect and Divide Inter-Zone Surfaces <a href="http://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
 
 <i>Some users have reported issues with the intersect functionality in this dialog.  If you experience problems, please try to using the "IntersectSpaceGeometry" user script.</i>
 
@@ -58,7 +58,7 @@
 
 
 <fieldset>
-<legend>Surface Matching <a href="http://http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
+<legend>Surface Matching <a href="http://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-matching" target="_blank">(help)</a></legend>
 
 <table border="0" cellpadding="4" width="100%" align="center">
 
diff --git a/plugin/openstudio/lib/dialogs/html/SurfaceSearch.html b/plugin/openstudio/lib/dialogs/html/SurfaceSearch.html
index 910e692..aa88977 100644
--- a/plugin/openstudio/lib/dialogs/html/SurfaceSearch.html
+++ b/plugin/openstudio/lib/dialogs/html/SurfaceSearch.html
@@ -32,7 +32,7 @@
 <body onload="onLoad()" link="#0000FF" alink="#0000FF" vlink="#0000FF" class="label">
 
 <fieldset>
-<legend>Surface Search <a href="http://nrel.github.io/OpenStudio-user-documentation/reference/sketchup_plugin_interface/#surface-search" target="_blank">(help)</a></legend>
+<legend>Surface Search <a href="https://openstudiocoalition.org/reference/sketchup_plugin_interface/#surface-search" target="_blank">(help)</a></legend>
 
 <table border="0" cellpadding="4" width="100%" align="center">
 
diff --git a/plugin/openstudio/lib/dialogs/html/os_256.png b/plugin/openstudio/lib/dialogs/html/os_256.png
new file mode 100644
index 0000000..4950ae1
Binary files /dev/null and b/plugin/openstudio/lib/dialogs/html/os_256.png differ
diff --git a/plugin/openstudio/lib/dialogs/html/sp_png_256x256.png b/plugin/openstudio/lib/dialogs/html/sp_png_256x256.png
deleted file mode 100644
index 219fce4..0000000
Binary files a/plugin/openstudio/lib/dialogs/html/sp_png_256x256.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons.zip b/plugin/openstudio/lib/resources/icons.zip
new file mode 100644
index 0000000..8d19e0d
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons.zip differ
diff --git a/plugin/openstudio/lib/resources/icons/AnimationSettings~16.png b/plugin/openstudio/lib/resources/icons/AnimationSettings~16.png
deleted file mode 100644
index c5e192e..0000000
Binary files a/plugin/openstudio/lib/resources/icons/AnimationSettings~16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/AnimationSettings~24.png b/plugin/openstudio/lib/resources/icons/AnimationSettings~24.png
deleted file mode 100644
index 41fb20f..0000000
Binary files a/plugin/openstudio/lib/resources/icons/AnimationSettings~24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ColorScale-16x16.png b/plugin/openstudio/lib/resources/icons/ColorScale-16x16.png
deleted file mode 100644
index 25fd528..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ColorScale-16x16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ColorScale-24x24.png b/plugin/openstudio/lib/resources/icons/ColorScale-24x24.png
deleted file mode 100644
index f0888d7..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ColorScale-24x24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Forward16.png b/plugin/openstudio/lib/resources/icons/Forward16.png
deleted file mode 100644
index 430ea46..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Forward16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Forward24.png b/plugin/openstudio/lib/resources/icons/Forward24.png
deleted file mode 100644
index 2d48559..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Forward24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ForwardFull16.png b/plugin/openstudio/lib/resources/icons/ForwardFull16.png
deleted file mode 100644
index 4a0cd1b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ForwardFull16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ForwardFull24.png b/plugin/openstudio/lib/resources/icons/ForwardFull24.png
deleted file mode 100644
index b0c7b53..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ForwardFull24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Help-16.png b/plugin/openstudio/lib/resources/icons/Help-16.png
deleted file mode 100644
index f6292b4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Help-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Help-24.png b/plugin/openstudio/lib/resources/icons/Help-24.png
deleted file mode 100644
index a34aaa6..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Help-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/HideRest-16.png b/plugin/openstudio/lib/resources/icons/HideRest-16.png
deleted file mode 100644
index ea72b28..0000000
Binary files a/plugin/openstudio/lib/resources/icons/HideRest-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/HideRest-24.png b/plugin/openstudio/lib/resources/icons/HideRest-24.png
deleted file mode 100644
index a4d88dd..0000000
Binary files a/plugin/openstudio/lib/resources/icons/HideRest-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/IDFExport-16.png b/plugin/openstudio/lib/resources/icons/IDFExport-16.png
deleted file mode 100644
index 7fd9e38..0000000
Binary files a/plugin/openstudio/lib/resources/icons/IDFExport-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/IDFExport-24.png b/plugin/openstudio/lib/resources/icons/IDFExport-24.png
deleted file mode 100644
index f22a66d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/IDFExport-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/IDFImport-16.png b/plugin/openstudio/lib/resources/icons/IDFImport-16.png
deleted file mode 100644
index 2219355..0000000
Binary files a/plugin/openstudio/lib/resources/icons/IDFImport-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/IDFImport-24.png b/plugin/openstudio/lib/resources/icons/IDFImport-24.png
deleted file mode 100644
index 5bf8d23..0000000
Binary files a/plugin/openstudio/lib/resources/icons/IDFImport-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/InfoTool-16.png b/plugin/openstudio/lib/resources/icons/InfoTool-16.png
deleted file mode 100644
index c22e319..0000000
Binary files a/plugin/openstudio/lib/resources/icons/InfoTool-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/InfoTool-24.png b/plugin/openstudio/lib/resources/icons/InfoTool-24.png
deleted file mode 100644
index 5c81d1e..0000000
Binary files a/plugin/openstudio/lib/resources/icons/InfoTool-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Inspector-16.png b/plugin/openstudio/lib/resources/icons/Inspector-16.png
deleted file mode 100644
index 87b63b6..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Inspector-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Inspector-24.png b/plugin/openstudio/lib/resources/icons/Inspector-24.png
deleted file mode 100644
index 0b2c1b7..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Inspector-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ModelMaker-16.png b/plugin/openstudio/lib/resources/icons/ModelMaker-16.png
deleted file mode 100644
index ceeb079..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ModelMaker-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/ModelMaker-24.png b/plugin/openstudio/lib/resources/icons/ModelMaker-24.png
deleted file mode 100644
index 1f19c0a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/ModelMaker-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewDaylighting-16.png b/plugin/openstudio/lib/resources/icons/NewDaylighting-16.png
deleted file mode 100644
index b85a95d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewDaylighting-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewDaylighting-24.png b/plugin/openstudio/lib/resources/icons/NewDaylighting-24.png
deleted file mode 100644
index 4307698..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewDaylighting-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewGlare-16.png b/plugin/openstudio/lib/resources/icons/NewGlare-16.png
deleted file mode 100644
index e8191d5..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewGlare-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewGlare-24.png b/plugin/openstudio/lib/resources/icons/NewGlare-24.png
deleted file mode 100644
index a04eb22..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewGlare-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewIlluminance-16.png b/plugin/openstudio/lib/resources/icons/NewIlluminance-16.png
deleted file mode 100644
index d9d2f6b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewIlluminance-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewIlluminance-24.png b/plugin/openstudio/lib/resources/icons/NewIlluminance-24.png
deleted file mode 100644
index 5b18ca2..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewIlluminance-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewLuminaire-16.png b/plugin/openstudio/lib/resources/icons/NewLuminaire-16.png
deleted file mode 100644
index 35c6af7..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewLuminaire-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewLuminaire-24.png b/plugin/openstudio/lib/resources/icons/NewLuminaire-24.png
deleted file mode 100644
index e909dff..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewLuminaire-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewPartition-16.png b/plugin/openstudio/lib/resources/icons/NewPartition-16.png
deleted file mode 100644
index d9438b5..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewPartition-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewPartition-24.png b/plugin/openstudio/lib/resources/icons/NewPartition-24.png
deleted file mode 100644
index d109be3..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewPartition-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewShading-16.png b/plugin/openstudio/lib/resources/icons/NewShading-16.png
deleted file mode 100644
index 58bb421..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewShading-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewShading-24.png b/plugin/openstudio/lib/resources/icons/NewShading-24.png
deleted file mode 100644
index 43402f4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewShading-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewSpace-16.png b/plugin/openstudio/lib/resources/icons/NewSpace-16.png
deleted file mode 100644
index 0c72be6..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewSpace-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/NewSpace-24.png b/plugin/openstudio/lib/resources/icons/NewSpace-24.png
deleted file mode 100644
index 195b6bf..0000000
Binary files a/plugin/openstudio/lib/resources/icons/NewSpace-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_IDFexport.pdf b/plugin/openstudio/lib/resources/icons/OSC_IDFexport.pdf
new file mode 100644
index 0000000..bfffd4f
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_IDFexport.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_IDFexport.svg b/plugin/openstudio/lib/resources/icons/OSC_IDFexport.svg
new file mode 100644
index 0000000..c882a56
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_IDFexport.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect x="55.47" y="40.32" width="25.27" height="16.64" fill="#11619a"/><polygon points="75.03 29.23 97.65 48.7 75.19 68.05 75.03 29.23" fill="#11619a"/><rect x="11.17" y="19.29" width="49.98" height="67.35" transform="translate(-12.48 11.16) rotate(-15)" fill="#11619a"/><polygon points="36.06 18.13 51.58 13.97 55.47 28.5 36.06 18.13" fill="#2d7dd2"/><path d="M24.23,64.2l-4.7,1.26L14.84,47.94l4.7-1.26Z" fill="#fff"/><path d="M22.38,45.92l9.16-2.46A9,9,0,0,1,36,43.22c2,.57,3.36,2.23,4.09,5l.53,2.08c1.15,4.31,1.25,5.32.68,7.06s-2.24,2.9-5.34,3.73l-8.9,2.39ZM34.5,57.14c1.21-.32,1.67-.73,1.91-1.61.21-.7.05-1.7-.59-4.09-.56-2.08-1-3-1.44-3.47s-1.19-.58-2.4-.26l-3.81,1,2.53,9.43Z" fill="#fff"/><path d="M47.29,47l7.11-1.9,1,3.86-7.12,1.9L50,57.29l-4.7,1.26L40.64,41,53.06,37.7l1,3.86-7.72,2.07Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_IDFimport.pdf b/plugin/openstudio/lib/resources/icons/OSC_IDFimport.pdf
new file mode 100644
index 0000000..0e33518
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_IDFimport.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_IDFimport.svg b/plugin/openstudio/lib/resources/icons/OSC_IDFimport.svg
new file mode 100644
index 0000000..d853583
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_IDFimport.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect x="5.71" y="29.23" width="21.04" height="16.64" fill="#11619a"/><polygon points="21.04 18.14 43.66 37.61 21.2 56.96 21.04 18.14" fill="#11619a"/><rect x="39.55" y="19.94" width="49.98" height="67.35" transform="translate(16.08 -14.88) rotate(15)" fill="#11619a"/><polygon points="81.87 23.4 97.39 27.56 93.5 42.08 81.87 23.4" fill="#2d7dd2"/><path d="M48.6,57.38l-4.71-1.26,4.7-17.52,4.7,1.26Z" fill="#fff"/><path d="M56.13,40.62l9.16,2.46a8.81,8.81,0,0,1,4,2c1.44,1.49,1.8,3.61,1.06,6.34l-.58,2.07c-1.15,4.3-1.57,5.23-2.94,6.44s-3.38,1.41-6.48.58l-8.91-2.39ZM61,56.4A2.14,2.14,0,0,0,63.47,56c.53-.5.9-1.45,1.54-3.84.55-2.07.69-3.11.49-3.72s-.75-1.1-2-1.43l-3.81-1-2.53,9.43Z" fill="#fff"/><path d="M77.14,54.05,84.25,56l-1,3.86L76.1,57.91l-1.71,6.38L69.69,63l4.7-17.52,12.42,3.33-1,3.86-7.72-2.07Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.pdf b/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.pdf
new file mode 100644
index 0000000..a298a10
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.svg b/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.svg
new file mode 100644
index 0000000..30ade5b
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_SU_ViewHidden.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="25.89 69.34 44.87 88.32 44.87 69.34 25.89 69.34" fill="none"/><polygon points="82.83 50.36 63.85 31.38 63.85 50.36 82.83 50.36" fill="none"/><polygon points="63.85 50.36 63.85 31.38 25.89 31.38 44.87 50.36 63.85 50.36" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="44.87 50.36 25.89 31.38 25.89 69.34 44.87 69.34 44.87 50.36" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="44.87 69.34 44.87 88.32 82.83 88.32 63.85 69.34 44.87 69.34" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="63.85 50.36 63.85 69.34 82.83 88.32 82.83 50.36 63.85 50.36" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><rect x="44.87" y="50.36" width="18.98" height="18.98" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="63.85 31.38 82.83 50.36 63.85 50.36 63.85 31.38" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="44.87 88.32 25.89 69.34 44.87 69.34 44.87 88.32" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="31.35 76.28 29.26 74.11 29.26 30.16 31.35 30.16 31.35 76.28" fill="#fff"/><polygon points="38.27 83.24 36.19 81.24 36.19 30.24 38.27 30.24 38.27 83.24" fill="#fff"/><rect x="47.19" y="30.24" width="2.08" height="59.17" fill="#fff"/><rect x="57.19" y="30.24" width="2.08" height="59.17" fill="#fff"/><polygon points="80.08 89.41 78 89.41 78 43.87 80.08 45.87 80.08 89.41" fill="#fff"/><polygon points="73.92 39.79 24.64 39.79 24.64 37.71 71.92 37.71 73.92 39.79" fill="#fff"/><rect x="24.64" y="53.84" width="59.36" height="2.08" fill="#fff"/><polygon points="84 73.93 28.91 73.93 26.91 71.85 84 71.85 84 73.93" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.pdf b/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.pdf
new file mode 100644
index 0000000..e023a9d
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.svg b/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.svg
new file mode 100644
index 0000000..1ca47a5
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_SU_shadows.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect x="14.94" y="27.29" width="67.49" height="60.66" fill="#fff"/><path d="M81.93,27.79V87.45H15.44V27.79H81.93m1-1H14.44V88.45H82.93V26.79Z" fill="gray"/><polygon points="13.04 85.52 13.04 24.87 80.52 24.87 80.52 74.56 61.22 85.52 13.04 85.52" fill="#fff"/><path d="M80,25.36V74.27L61.08,85H13.54V25.36H80m1-1H12.55V86h48.8l.22-.13L80.51,75.13l.5-.28V24.37Z" fill="gray"/><rect x="8.29" y="12.25" width="76.98" height="15.54" rx="2" fill="#f89820"/><rect x="21.84" y="8.2" width="3.75" height="11.03" rx="1.24" fill="gray"/><rect x="67.97" y="8.2" width="3.75" height="11.03" rx="1.24" fill="gray"/><rect x="16.52" y="31.53" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M26.68,31.61v9H16.59v-9H26.68m.15-.15H16.44v9.35H26.83V31.46Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="29.09" y="31.53" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M39.25,31.61v9H29.16v-9H39.25m.16-.15H29v9.35h10.4V31.46Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="41.66" y="31.53" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M51.83,31.61v9H41.73v-9h10.1m.15-.15H41.58v9.35H52V31.46Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="54.23" y="31.53" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M64.4,31.61v9H54.31v-9H64.4m.15-.15H54.16v9.35H64.55V31.46Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="66.8" y="31.53" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M77,31.61v9H66.88v-9H77m.15-.15H66.73v9.35H77.12V31.46Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="16.52" y="44.03" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M26.68,44.1v9.06H16.59V44.1H26.68m.15-.15H16.44v9.36H26.83V44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="29.09" y="44.03" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M39.25,44.1v9.06H29.16V44.1H39.25m.16-.15H29v9.36h10.4V44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="41.66" y="44.03" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M51.83,44.1v9.06H41.73V44.1h10.1M52,44H41.58v9.36H52V44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="54.23" y="44.03" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M64.4,44.1v9.06H54.31V44.1H64.4m.15-.15H54.16v9.36H64.55V44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="66.8" y="44.03" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M77,44.1v9.06H66.88V44.1H77m.15-.15H66.73v9.36H77.12V44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="16.52" y="56.52" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M26.68,56.59v9.06H16.59V56.59H26.68m.15-.15H16.44V65.8H26.83V56.44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="29.09" y="56.52" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M39.25,56.59v9.06H29.16V56.59H39.25m.16-.15H29V65.8h10.4V56.44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="41.66" y="56.52" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M51.83,56.59v9.06H41.73V56.59h10.1m.15-.15H41.58V65.8H52V56.44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="54.23" y="56.52" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M64.4,56.59v9.06H54.31V56.59H64.4m.15-.15H54.16V65.8H64.55V56.44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="66.8" y="56.52" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M77,56.59v9.06H66.88V56.59H77m.15-.15H66.73V65.8H77.12V56.44Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="16.52" y="69.01" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M26.68,69.09v9H16.59v-9H26.68m.15-.15H16.44v9.35H26.83V68.94Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="29.09" y="69.01" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M39.25,69.09v9H29.16v-9H39.25m.16-.15H29v9.35h10.4V68.94Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="41.66" y="69.01" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M51.83,69.09v9H41.73v-9h10.1m.15-.15H41.58v9.35H52V68.94Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="54.23" y="69.01" width="10.24" height="9.21" fill="#fff" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M64.4,69.09v9H54.31v-9H64.4m.15-.15H54.16v9.35H64.55V68.94Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><path d="M77,69.09v7.16l-3.76,1.89H66.88v-9H77m.15-.15H66.73v9.35h7.08l3.31-1.73V68.94Z" fill="gray" stroke="gray" stroke-miterlimit="10" stroke-width="0.5"/><rect x="54.31" y="44.1" width="10.09" height="9.05" fill="#f89820"/><path d="M60.74,85.57s-1.39-1.23-2-5.84c-.51-4.14,2.39-8.28,2.39-8.28s.37,3.29,9,4.61c4.58.7,9.82-1.22,9.82-1.22Z" fill="#ccc" stroke="gray" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.pdf b/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.pdf
new file mode 100644
index 0000000..0cab65c
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.svg b/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.svg
new file mode 100644
index 0000000..1d466b5
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_edit_spaces.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M12.2,29.84l35.88-25a2.37,2.37,0,0,1,2.65-.06L87.57,28.37a2.41,2.41,0,0,1,1.1,2V67.26a2.4,2.4,0,0,1-1,1.94L50.77,95.93A2.41,2.41,0,0,1,48,96L12.19,70.82a2.41,2.41,0,0,1-1-2V31.8A2.39,2.39,0,0,1,12.2,29.84Z" fill="#2d7dd2"/><path id="rect5005" d="M52.24,82.81l8.22-5.93c.81-.59,1.47-.48,1.47.24v8.32a3.5,3.5,0,0,1-1.47,2.36l-8.22,5.93c-.82.59-1.47.48-1.47-.24V85.17a3.47,3.47,0,0,1,1.47-2.36Z" fill="#11619a"/><path id="rect5765" d="M52.68,69.23l7.9-5.7c.9-.65,1.63-.47,1.63.41v7.77a4,4,0,0,1-1.63,2.75l-7.9,5.7c-.9.65-1.63.47-1.63-.4V72a4,4,0,0,1,1.62-2.76Z" fill="#11619a"/><path id="rect5767" d="M52,56.28l9.26-6.67c.52-.38,1,.37,1,1.67v6.2a4.44,4.44,0,0,1-1,3.05L52,67.21c-.53.38-1-.37-1-1.68v-6.2a4.34,4.34,0,0,1,1-3Z" fill="#11619a"/><path id="rect5769" d="M65.28,46.62l8.3-5.94c.82-.58,1.48-.14,1.48,1v6.84a4.21,4.21,0,0,1-1.48,3.1l-8.3,5.94c-.81.58-1.47.14-1.47-1V49.72a4.23,4.23,0,0,1,1.47-3.1Z" fill="#11619a"/><path id="rect5771" d="M65,60.21l8.93-6.39c.64-.46,1.16.26,1.16,1.61v6a4.55,4.55,0,0,1-1.16,3.27L65,71.13c-.64.46-1.16-.26-1.16-1.61v-6A4.55,4.55,0,0,1,65,60.21Z" fill="#11619a"/><path id="rect5773" d="M65.16,73.28l8-5.71c.91-.65,1.64,0,1.64,1.47v5.64a5.14,5.14,0,0,1-1.64,3.81l-8,5.71c-.9.65-1.63,0-1.63-1.47V77.09a5.21,5.21,0,0,1,1.63-3.82Z" fill="#11619a"/><path id="rect5775" d="M77.76,63.78l8.3-5.93c.82-.59,1.48-.14,1.48,1v6.83a4.21,4.21,0,0,1-1.48,3.1l-8.3,5.94c-.82.58-1.48.14-1.48-1V66.89a4.25,4.25,0,0,1,1.48-3.11Z" fill="#11619a"/><path id="rect5777" d="M77.79,51.3l8.61-6.17c.73-.52,1.32,0,1.32,1.15V53a4.12,4.12,0,0,1-1.32,3l-8.61,6.16c-.73.52-1.32,0-1.32-1.14V54.33a4.07,4.07,0,0,1,1.31-3Z" fill="#11619a"/><path id="rect5779" d="M77.79,37.81l8.61-6.17c.73-.52,1.32-.34,1.32.4v8.25a3.25,3.25,0,0,1-1.32,2.28l-8.61,6.16c-.73.52-1.32.35-1.32-.39V40.09a3.2,3.2,0,0,1,1.31-2.28Z" fill="#11619a"/><path id="rect8055" d="M39,77.13l8.33,5.6A4.33,4.33,0,0,1,48.71,86v6.29c0,1.28-.64,1.89-1.42,1.36L39,88.06a4.34,4.34,0,0,1-1.42-3.27V78.5c0-1.28.64-1.9,1.42-1.37Z" fill="#11619a"/><path id="rect8815" d="M39.14,63.6l8.34,5.6a3.13,3.13,0,0,1,1.41,2.16v8.5c0,.67-.63.79-1.41.26l-8.34-5.59a3.17,3.17,0,0,1-1.41-2.17v-8.5c0-.67.63-.79,1.41-.26Z" fill="#11619a"/><path id="rect8817" d="M39.14,50.67l8.34,5.6a3.46,3.46,0,0,1,1.41,2.53v7.77c0,.87-.63,1.15-1.41.63l-8.34-5.6a3.44,3.44,0,0,1-1.41-2.53V51.3c0-.87.63-1.15,1.41-.62Z" fill="#11619a"/><path id="rect8819" d="M26.39,68.67l8.33,5.6a3.88,3.88,0,0,1,1.42,3v6.92c0,1.11-.63,1.58-1.42,1.06l-8.33-5.6a3.94,3.94,0,0,1-1.42-3V69.72c0-1.1.64-1.57,1.42-1Z" fill="#11619a"/><path id="rect8821" d="M26.39,55.45,34.72,61a4.08,4.08,0,0,1,1.42,3.1v6.63c0,1.19-.63,1.72-1.42,1.2l-8.33-5.6A4.09,4.09,0,0,1,25,63.27V56.64c0-1.18.64-1.72,1.42-1.2Z" fill="#11619a"/><path id="rect8823" d="M26.48,42.7l8.34,5.6A3.58,3.58,0,0,1,36.23,51v7.48c0,.95-.63,1.3-1.41.78l-8.34-5.6A3.6,3.6,0,0,1,25.07,51V43.47c0-.95.63-1.29,1.41-.77Z" fill="#11619a"/><path id="rect8825" d="M13.54,60.1l8.33,5.6a3.33,3.33,0,0,1,1.42,2.41v8c0,.81-.64,1.05-1.42.52L13.54,71a3.33,3.33,0,0,1-1.42-2.42v-8c0-.81.64-1,1.42-.51Z" fill="#11619a"/><path id="rect8827" d="M13.72,47.41,22.06,53a3.3,3.3,0,0,1,1.41,2.36v8.11c0,.78-.63,1-1.41.46l-8.34-5.6A3.3,3.3,0,0,1,12.31,56V47.87c0-.78.63-1,1.42-.46Z" fill="#11619a"/><path id="rect8829" d="M13.72,34.37,22.06,40a3.18,3.18,0,0,1,1.41,2.2V50.6c0,.68-.63.81-1.41.29l-8.34-5.6a3.17,3.17,0,0,1-1.41-2.19V34.66c0-.69.63-.82,1.42-.29Z" fill="#11619a"/><g id="g11205"><path id="rect10429" d="M24.83,24.41l9.28,5.91c.46.29.11,1-.78,1.66L26,37.13c-.9.62-2,.89-2.45.6l-9.28-5.9c-.46-.29-.11-1,.78-1.66L22.38,25c.9-.63,2-.9,2.45-.61Z" fill="#11619a"/><path id="rect11189" d="M37.46,32.77l9.28,5.9c.46.3.11,1-.79,1.67l-7.32,5.14c-.89.63-2,.9-2.44.61l-9.29-5.9c-.46-.29-.1-1,.79-1.66L35,33.38c.89-.63,2-.9,2.44-.61Z" fill="#11619a"/><path id="rect11191" d="M50.42,41l9.29,5.91c.45.29.1,1-.79,1.66L51.6,53.73c-.89.62-2,.9-2.45.6l-9.28-5.9c-.46-.29-.11-1,.78-1.66L48,41.62c.89-.62,2-.9,2.44-.6Z" fill="#11619a"/><path id="rect11193" d="M37.62,15.54l9.28,5.91c.46.29.11,1-.78,1.66L38.8,28.26c-.9.62-2,.89-2.45.6L27.07,23c-.46-.29-.11-1,.78-1.66l7.32-5.15c.9-.63,2-.9,2.45-.61Z" fill="#11619a"/><path id="rect11195" d="M50.41,23.67l9.28,5.9c.46.29.11,1-.78,1.66l-7.33,5.15c-.89.63-2,.9-2.44.61l-9.29-5.91c-.45-.29-.1-1,.79-1.66L48,24.27c.89-.62,2-.89,2.44-.6Z" fill="#11619a"/><path id="rect11197" d="M63.65,32.09,72.93,38c.46.29.11,1-.78,1.66L64.82,44.8c-.89.63-2,.9-2.44.61l-9.29-5.9c-.45-.3-.1-1,.79-1.67L61.2,32.7c.89-.63,2-.9,2.44-.61Z" fill="#11619a"/><path id="rect11199" d="M50,6.81l9.28,5.91c.46.29.11,1-.78,1.66l-7.33,5.15c-.89.62-2,.9-2.44.61l-9.29-5.91c-.45-.29-.1-1,.79-1.66l7.32-5.15c.9-.63,2-.9,2.45-.61Z" fill="#11619a"/><path id="rect11201" d="M63.19,14.93l9.28,5.9c.46.29.11,1-.78,1.67l-7.32,5.14c-.9.63-2,.9-2.45.61l-9.28-5.9c-.46-.3-.11-1,.78-1.67l7.32-5.14c.9-.63,2-.9,2.45-.61Z" fill="#11619a"/><path id="rect11203" d="M76.07,23.35l9.29,5.91c.46.29.1,1-.79,1.66l-7.32,5.15c-.89.62-2,.9-2.45.6l-9.28-5.9c-.46-.29-.11-1,.79-1.66L73.63,24c.89-.62,2-.9,2.44-.61Z" fill="#11619a"/></g><path d="M35.81,22.65c-7.22,4.52-9.64,8-10.34,9.23a3.14,3.14,0,0,0-4.15,4.62l4.84,5.78a3.14,3.14,0,0,0,4.82-4l0,0c.43-.6,1-1.41,1.78-2.32l31.62,41a2.74,2.74,0,0,0,3.94.42l5.52-4.62a2.74,2.74,0,0,0,.26-4L38.75,30.05a16.33,16.33,0,0,1,2.17-1.32c4.49-2.22,8.63-2.34,11-3a.51.51,0,0,0,.16-.91C49.68,23.18,43.22,18,35.81,22.65Z" fill="#fff"/><path d="M75.59,38.58a11.25,11.25,0,0,0,1.57-12l-7.48,8.92-5.79-.36-1-6.35,7-8.33A11.25,11.25,0,0,0,57.4,37.27L27.07,70.51a2.33,2.33,0,0,0,.22,3.36L32,77.8a2.33,2.33,0,0,0,3.35-.37L62.79,41.79A11.25,11.25,0,0,0,75.59,38.58Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_extrude.pdf b/plugin/openstudio/lib/resources/icons/OSC_extrude.pdf
new file mode 100644
index 0000000..2f833ea
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_extrude.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_extrude.svg b/plugin/openstudio/lib/resources/icons/OSC_extrude.svg
new file mode 100644
index 0000000..65e8e28
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_extrude.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M32.28,27.62A6.09,6.09,0,0,1,37,27.57L96,52.88c1.45.63,1.68,1.66.52,2.3L67.44,71.39a6,6,0,0,1-4.73,0l-59-25.31c-1.45-.62-1.69-1.64-.53-2.29ZM89.16,54.1,74.42,47.78,49.55,61.64,64.29,68,89.16,54.1m-78.6-9.19L44.29,59.38,55,53.4,21.29,38.93l-10.73,6m58.6.61-8.35-3.58-9.94,5.54,8.36,3.58,9.93-5.54m-13.6-5.84L47.21,36.1l-9.94,5.54,8.35,3.58,9.94-5.54M42,33.85l-6.53-2.8-9.94,5.53L32,39.39,42,33.85" fill="#0e5180"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_help.pdf b/plugin/openstudio/lib/resources/icons/OSC_help.pdf
new file mode 100644
index 0000000..5cc587f
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_help.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_help.svg b/plugin/openstudio/lib/resources/icons/OSC_help.svg
new file mode 100644
index 0000000..3d4b748
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_help.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M51.24,45.05l7.46,4.1a1,1,0,0,1,0,1.68l-7.46,4.1a1.9,1.9,0,0,1-1.85,0l-7.46-4.1a1,1,0,0,1,0-1.68l7.46-4.1A1.9,1.9,0,0,1,51.24,45.05ZM50.32,42,35.74,50h0l14.58,8,14.57-8h0L50.32,42Z" fill="#ccc"/><path d="M10.85,35.55v29h0v3.87a7.25,7.25,0,0,0,3.64,6.29l32.2,18.53a7.31,7.31,0,0,0,7.24,0l32.2-18.53a7.25,7.25,0,0,0,3.64-6.29V64.52h0v-29h0V31.46a7.26,7.26,0,0,0-3.67-6.31L53.9,6.82a7.28,7.28,0,0,0-7.19,0L14.52,25.15a7.26,7.26,0,0,0-3.67,6.31v4.09m0,0h0" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.32"/><polygon points="10.85 64.52 37.15 50.03 10.85 35.55 10.85 64.52" fill="#71675c"/><path d="M86.1,25.15,53.9,6.82a7.28,7.28,0,0,0-3.59-1V42.79h0L63.46,50,89.77,35.55V31.46A7.26,7.26,0,0,0,86.1,25.15Z" fill="#2d7dd2"/><path d="M46.71,6.82,14.52,25.15a7.26,7.26,0,0,0-3.67,6.31v4.09L37.15,50l13.16-7.24V5.87A7.34,7.34,0,0,0,46.71,6.82Z" fill="#11619a"/><path d="M37.15,50,10.85,64.52v3.87a7.25,7.25,0,0,0,3.64,6.29l32.2,18.53a7.29,7.29,0,0,0,3.62,1V57.27Z" fill="#97897b"/><path d="M50.31,57.27h0v36.9a7.29,7.29,0,0,0,3.62-1l32.2-18.53a7.25,7.25,0,0,0,3.64-6.29V64.52L63.46,50Z" fill="#f89820"/><polygon points="89.77 64.52 89.77 35.55 63.46 50.03 89.77 64.52" fill="#fbc179"/><path d="M40.56,60.62a16.82,16.82,0,0,1-.1-1.89c0-10,1.36-12.18,9.66-16.28,5.88-2.84,6-2.94,7.14-3.89a5.58,5.58,0,0,0,1.89-4.62c0-4.83-1.78-6.3-7.56-6.3-6.2,0-8.4,1.58-8.4,5.88,0,.32,0,1.16.1,2.31h-16l.1-2.83c.11-7.56.95-10.19,3.78-12.92,4-3.68,10.3-5.25,21-5.25,17.22,0,22.79,4.62,22.79,19,0,6.82-1.36,10.61-4.83,13.65-1.37,1.16-4,2.52-8.51,4.62-4.2,1.89-5,3-5,7.67v.84ZM56,85.41H40.88V69.34H56Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_hiderest.pdf b/plugin/openstudio/lib/resources/icons/OSC_hiderest.pdf
new file mode 100644
index 0000000..6f555e6
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_hiderest.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_hiderest.svg b/plugin/openstudio/lib/resources/icons/OSC_hiderest.svg
new file mode 100644
index 0000000..efb7d68
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_hiderest.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect x="9.01" y="9" width="54.65" height="54.65" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/><rect x="36.34" y="36.33" width="54.65" height="54.65" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/><line x1="9.01" y1="9" x2="36.34" y2="36.33" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/><line x1="63.66" y1="9" x2="90.99" y2="36.33" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/><line x1="9.01" y1="63.65" x2="36.34" y2="90.98" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/><line x1="63.66" y1="63.65" x2="90.99" y2="90.98" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_infotool.pdf b/plugin/openstudio/lib/resources/icons/OSC_infotool.pdf
new file mode 100644
index 0000000..9f6225a
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_infotool.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_infotool.svg b/plugin/openstudio/lib/resources/icons/OSC_infotool.svg
new file mode 100644
index 0000000..f20f0b4
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_infotool.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M34,30,58.45,13a1.63,1.63,0,0,1,1.81,0L85.39,29a1.63,1.63,0,0,1,.75,1.37V55.53a1.65,1.65,0,0,1-.67,1.33L60.28,75.09a1.62,1.62,0,0,1-1.89,0L34,58a1.63,1.63,0,0,1-.69-1.33V31.34A1.61,1.61,0,0,1,34,30Z" fill="#f89820"/><path id="rect5005" d="M61.29,66.14l5.61-4c.55-.4,1-.33,1,.16v5.68a2.41,2.41,0,0,1-1,1.61l-5.61,4c-.56.4-1,.32-1-.17V67.75a2.39,2.39,0,0,1,1-1.61Z" fill="#fbc179"/><path id="rect5765" d="M61.59,56.88,67,53c.61-.44,1.11-.32,1.11.27v5.31A2.73,2.73,0,0,1,67,60.44l-5.39,3.89c-.62.45-1.12.32-1.12-.27v-5.3a2.72,2.72,0,0,1,1.11-1.88Z" fill="#fbc179"/><path id="rect5767" d="M61.12,48l6.32-4.55c.36-.26.65.25.65,1.14v4.23a3,3,0,0,1-.65,2.08L61.12,55.5c-.35.26-.65-.26-.65-1.15V50.12A3,3,0,0,1,61.12,48Z" fill="#fbc179"/><path id="rect5769" d="M70.19,41.45l5.66-4.05c.56-.4,1-.1,1,.67v4.67a2.85,2.85,0,0,1-1,2.11l-5.66,4c-.56.4-1,.1-1-.67V43.57a2.87,2.87,0,0,1,1-2.12Z" fill="#fbc179"/><path id="rect5771" d="M70,50.72l6.1-4.36c.44-.31.79.18.79,1.1v4.12a3.08,3.08,0,0,1-.79,2.23L70,58.18c-.43.31-.79-.18-.79-1.1V53A3.12,3.12,0,0,1,70,50.72Z" fill="#fbc179"/><path id="rect5773" d="M70.11,59.64l5.44-3.9c.62-.44,1.12,0,1.12,1V60.6a3.53,3.53,0,0,1-1.12,2.6l-5.44,3.89c-.62.44-1.12,0-1.12-1V62.24a3.51,3.51,0,0,1,1.12-2.6Z" fill="#fbc179"/><path id="rect5775" d="M78.7,53.16l5.66-4c.56-.4,1-.09,1,.68v4.65a2.89,2.89,0,0,1-1,2.13l-5.66,4c-.56.39-1,.09-1-.68V55.28a2.92,2.92,0,0,1,1-2.12Z" fill="#fbc179"/><path id="rect5777" d="M78.72,44.64l5.88-4.2c.49-.36.9,0,.9.78v4.6a2.8,2.8,0,0,1-.9,2.07L78.72,52.1c-.5.35-.9,0-.9-.79v-4.6a2.8,2.8,0,0,1,.9-2.07Z" fill="#fbc179"/><path id="rect5779" d="M78.72,35.43l5.88-4.2c.49-.36.9-.24.9.27v5.63a2.2,2.2,0,0,1-.9,1.55l-5.88,4.21c-.5.36-.9.24-.9-.27V37a2.2,2.2,0,0,1,.9-1.55Z" fill="#fbc179"/><path id="rect8055" d="M52.22,62.27l5.69,3.82a2.9,2.9,0,0,1,1,2.23v4.29c0,.87-.43,1.29-1,.93l-5.69-3.82a3,3,0,0,1-1-2.23V63.2c0-.87.43-1.29,1-.93Z" fill="#fbc179"/><path id="rect8815" d="M52.35,53,58,56.85a2.17,2.17,0,0,1,1,1.48v5.8c0,.46-.44.54-1,.18l-5.69-3.82a2.16,2.16,0,0,1-1-1.48V53.22c0-.46.43-.54,1-.19Z" fill="#fbc179"/><path id="rect8817" d="M52.35,44.22,58,48a2.35,2.35,0,0,1,1,1.72v5.3c0,.6-.44.79-1,.43l-5.69-3.82a2.36,2.36,0,0,1-1-1.72V44.64c0-.59.43-.78,1-.42Z" fill="#fbc179"/><path id="rect8819" d="M43.65,56.5l5.69,3.82a2.66,2.66,0,0,1,1,2v4.72c0,.76-.43,1.08-1,.72L43.65,64a2.68,2.68,0,0,1-1-2V57.21c0-.75.44-1.07,1-.71Z" fill="#fbc179"/><path id="rect8821" d="M43.65,47.47l5.69,3.82a2.79,2.79,0,0,1,1,2.11v4.53c0,.81-.43,1.17-1,.82l-5.69-3.82a2.82,2.82,0,0,1-1-2.12V48.29c0-.81.44-1.18,1-.82Z" fill="#fbc179"/><path id="rect8823" d="M43.71,38.78,49.4,42.6a2.43,2.43,0,0,1,1,1.82v5.1c0,.65-.43.89-1,.53l-5.69-3.82a2.45,2.45,0,0,1-1-1.82V39.3c0-.65.43-.88,1-.52Z" fill="#fbc179"/><path id="rect8825" d="M34.88,50.64l5.69,3.82a2.29,2.29,0,0,1,1,1.65v5.46c0,.55-.43.71-1,.35L34.88,58.1a2.29,2.29,0,0,1-1-1.65V51c0-.56.43-.71,1-.36Z" fill="#fbc179"/><path id="rect8827" d="M35,42l5.69,3.82a2.26,2.26,0,0,1,1,1.61V53c0,.53-.43.67-1,.32L35,49.45a2.27,2.27,0,0,1-1-1.61V42.3c0-.53.44-.67,1-.31Z" fill="#fbc179"/><path id="rect8829" d="M35,33.09l5.69,3.82a2.17,2.17,0,0,1,1,1.5v5.75c0,.47-.43.56-1,.2L35,40.54a2.17,2.17,0,0,1-1-1.49V33.29c0-.47.44-.56,1-.2Z" fill="#fbc179"/><g id="g11205"><path id="rect10429" d="M42.59,26.3l6.33,4c.31.2.07.71-.54,1.14l-5,3.51a1.91,1.91,0,0,1-1.67.42l-6.34-4c-.31-.2-.07-.71.54-1.14l5-3.51a1.86,1.86,0,0,1,1.67-.41Z" fill="#fbc179"/><path id="rect11189" d="M51.2,32l6.34,4c.31.2.07.7-.54,1.13l-5,3.51c-.61.43-1.35.62-1.67.42l-6.33-4c-.31-.2-.07-.71.54-1.13l5-3.52c.61-.42,1.36-.61,1.67-.41Z" fill="#fbc179"/><path id="rect11191" d="M60.05,37.62l6.33,4c.32.2.08.71-.53,1.14l-5,3.51c-.61.43-1.36.61-1.67.41l-6.33-4c-.32-.19-.08-.7.53-1.13l5-3.51c.61-.43,1.36-.61,1.67-.41Z" fill="#fbc179"/><path id="rect11193" d="M51.31,20.24l6.34,4c.31.2.07.71-.54,1.14l-5,3.51c-.6.43-1.35.61-1.66.41l-6.34-4c-.31-.2-.07-.71.54-1.14l5-3.51c.61-.43,1.36-.61,1.67-.41Z" fill="#fbc179"/><path id="rect11195" d="M60,25.79l6.33,4c.32.2.08.7-.53,1.13l-5,3.51c-.61.43-1.35.62-1.67.42l-6.33-4c-.32-.2-.08-.71.53-1.14l5-3.51A1.86,1.86,0,0,1,60,25.79Z" fill="#fbc179"/><path id="rect11197" d="M69.07,31.53l6.34,4c.31.2.07.71-.54,1.14l-5,3.51c-.6.43-1.35.61-1.66.41l-6.34-4c-.31-.19-.07-.7.54-1.13l5-3.51a1.91,1.91,0,0,1,1.67-.42Z" fill="#fbc179"/><path id="rect11199" d="M59.79,14.29l6.33,4c.31.2.07.7-.54,1.13l-5,3.51c-.61.43-1.36.62-1.67.42l-6.34-4c-.31-.2-.07-.71.54-1.14l5-3.51a1.86,1.86,0,0,1,1.67-.41Z" fill="#fbc179"/><path id="rect11201" d="M68.76,19.83l6.33,4c.32.2.08.71-.53,1.14l-5,3.51a1.86,1.86,0,0,1-1.67.41l-6.33-4c-.31-.2-.07-.71.53-1.14l5-3.51c.61-.43,1.36-.61,1.67-.41Z" fill="#fbc179"/><path id="rect11203" d="M77.55,25.57l6.34,4c.31.2.07.71-.54,1.14l-5,3.51a1.86,1.86,0,0,1-1.67.41l-6.33-4c-.31-.2-.07-.71.54-1.14l5-3.51a1.91,1.91,0,0,1,1.67-.42Z" fill="#fbc179"/></g><path d="M50.3,54.15,15.45,24.21a.86.86,0,0,0-1.42.65v46a.86.86,0,0,0,1.47.6l9.43-9.56a.85.85,0,0,1,1.38.23L38.1,86.85a.86.86,0,0,0,1.14.41l9.31-4.43a.85.85,0,0,0,.4-1.14l-11.42-24a.85.85,0,0,1,.71-1.22l11.56-.8A.85.85,0,0,0,50.3,54.15Z"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_inspector.pdf b/plugin/openstudio/lib/resources/icons/OSC_inspector.pdf
new file mode 100644
index 0000000..190c1e8
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_inspector.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_inspector.svg b/plugin/openstudio/lib/resources/icons/OSC_inspector.svg
new file mode 100644
index 0000000..99ef91d
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_inspector.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M42.49,30.81l3,1.68a.4.4,0,0,1,0,.69l-3,1.68a.79.79,0,0,1-.76,0l-3-1.68a.4.4,0,0,1,0-.69l3-1.68A.79.79,0,0,1,42.49,30.81Zm-.38-1.26-6,3.28h0l6,3.29,6-3.29h0l-6-3.28Z" fill="#fff"/><path d="M26,26.93V38.78h0v1.58a3,3,0,0,0,1.49,2.58l13.18,7.58a3,3,0,0,0,3,0l13.17-7.58a3,3,0,0,0,1.49-2.58V38.78h0V26.93h0V25.25a3,3,0,0,0-1.5-2.58l-13.17-7.5a3,3,0,0,0-2.94,0l-13.18,7.5A3,3,0,0,0,26,25.25v1.68m0,0h0" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.36"/><polygon points="25.96 38.78 36.73 32.85 25.96 26.93 25.96 38.78" fill="#71675c"/><path d="M56.75,22.67l-13.17-7.5a3,3,0,0,0-1.47-.39V29.89h0l5.38,3,10.76-5.92V25.25A3,3,0,0,0,56.75,22.67Z" fill="#2d7dd2"/><path d="M40.64,15.17l-13.18,7.5A3,3,0,0,0,26,25.25v1.68l10.77,5.92,5.38-3V14.78A2.94,2.94,0,0,0,40.64,15.17Z" fill="#11619a"/><path d="M36.73,32.85,26,38.78v1.58a3,3,0,0,0,1.49,2.58l13.18,7.58a3,3,0,0,0,1.48.39V35.81Z" fill="#97897b"/><path d="M42.11,35.81h0v15.1a3,3,0,0,0,1.48-.39l13.17-7.58a3,3,0,0,0,1.49-2.58V38.78L47.49,32.85Z" fill="#f89820"/><polygon points="58.26 38.78 58.26 26.93 47.49 32.85 58.26 38.78" fill="#fbc179"/><circle cx="42.91" cy="33.04" r="24.52" fill="none" stroke="#814904" stroke-miterlimit="10" stroke-width="4.65"/><circle cx="41.73" cy="31.38" r="24.52" fill="none" stroke="#f89820" stroke-miterlimit="10" stroke-width="4.65"/><path d="M60.49,50.88H72a0,0,0,0,1,0,0V91.54a5.75,5.75,0,0,1-5.75,5.75h0a5.75,5.75,0,0,1-5.75-5.75V50.88a0,0,0,0,1,0,0Z" transform="translate(-28.17 43.05) rotate(-30)" fill="#f89820"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.pdf
new file mode 100644
index 0000000..2b34a7a
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.svg b/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.svg
new file mode 100644
index 0000000..d174a09
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_daylighting.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="37.64" cy="40.29" r="8.75" fill="#f89923"/><path d="M37.79,51.35a4.72,4.72,0,0,1,.92,1.39,5.7,5.7,0,0,1,.45,1.38,7.55,7.55,0,0,1-.3,2.78c-.13.92-.28,1.85-.46,2.77s-.36,1.85-.61,2.78h-.3c-.24-.93-.4-1.85-.61-2.78s-.32-1.85-.45-2.77a7.35,7.35,0,0,1-.3-2.78,5.7,5.7,0,0,1,.45-1.38,4.88,4.88,0,0,1,.91-1.39Z" fill="#f89923"/><path d="M37.49,29.23a5,5,0,0,1-.91-1.39,5.64,5.64,0,0,1-.45-1.39,7.3,7.3,0,0,1,.3-2.77c.13-.93.28-1.85.45-2.78s.37-1.85.61-2.77h.3c.25.92.41,1.85.61,2.77s.33,1.85.46,2.78a7.5,7.5,0,0,1,.3,2.77,5.64,5.64,0,0,1-.45,1.39,4.85,4.85,0,0,1-.92,1.39Z" fill="#f89923"/><path d="M48.7,40.14a5,5,0,0,1,1.39-.92,5.77,5.77,0,0,1,1.39-.45,7.3,7.3,0,0,1,2.77.31c.93.12,1.85.27,2.78.45s1.85.36,2.77.61v.3c-.92.24-1.85.4-2.77.61s-1.85.33-2.78.45a7.3,7.3,0,0,1-2.77.3,5.74,5.74,0,0,1-1.39-.44,5.48,5.48,0,0,1-1.39-.92Z" fill="#f89923"/><path d="M26.58,40.44a5.27,5.27,0,0,1-1.38.92,5.88,5.88,0,0,1-1.39.44A7.35,7.35,0,0,1,21,41.5c-.92-.12-1.85-.28-2.77-.45s-1.85-.37-2.78-.61v-.3c.93-.25,1.85-.41,2.78-.61s1.85-.33,2.77-.45a7.36,7.36,0,0,1,2.78-.31,5.92,5.92,0,0,1,1.39.45,4.81,4.81,0,0,1,1.38.92Z" fill="#f89923"/><path d="M45.57,48.23a4.9,4.9,0,0,1,1.63.34,5.88,5.88,0,0,1,1.3.66c.81.49,1.18,1.43,1.75,2.18s1.11,1.5,1.64,2.28,1,1.57,1.53,2.39l-.21.22c-.83-.49-1.6-1-2.4-1.54s-1.54-1.07-2.28-1.64-1.68-.93-2.18-1.74a6.1,6.1,0,0,1-.66-1.3,5,5,0,0,1-.33-1.63Z" fill="#f89923"/><path d="M29.71,32.81a4.84,4.84,0,0,1-1.62-.34,5.66,5.66,0,0,1-1.3-.66C26,31.32,25.6,30.38,25,29.63s-1.11-1.5-1.64-2.28-1-1.57-1.53-2.39l.21-.22c.83.49,1.59,1,2.39,1.54s1.54,1.07,2.29,1.64,1.68.93,2.17,1.74A6.63,6.63,0,0,1,29.6,31a5.23,5.23,0,0,1,.33,1.63Z" fill="#f89923"/><path d="M30,48.29a4.85,4.85,0,0,1-.34,1.63,5.66,5.66,0,0,1-.66,1.3c-.49.82-1.43,1.18-2.18,1.75s-1.5,1.11-2.28,1.64-1.57,1-2.39,1.53l-.22-.21c.49-.83,1-1.59,1.54-2.39s1.07-1.54,1.64-2.29.93-1.68,1.74-2.17a5.7,5.7,0,0,1,1.3-.67,5.23,5.23,0,0,1,1.63-.33Z" fill="#f89923"/><path d="M45.43,32.44a4.9,4.9,0,0,1,.34-1.63,5.88,5.88,0,0,1,.66-1.3c.49-.82,1.43-1.18,2.18-1.75s1.5-1.11,2.28-1.64,1.57-1.05,2.39-1.53l.22.21c-.49.83-1,1.6-1.54,2.39s-1.07,1.54-1.64,2.29-.93,1.68-1.74,2.17a5.7,5.7,0,0,1-1.3.67,5,5,0,0,1-1.63.33Z" fill="#f89923"/><path d="M71.6,38H59.8V29.13H71.6V16.89h9.7V29.13H93.16V38H81.3V50.19H71.6Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.79"/><path d="M44.91,37.26V58.73H66.38A21.47,21.47,0,0,0,44.91,37.26Z" fill="#2d7dd2" fill-opacity="0.7" stroke="#0d4973" stroke-miterlimit="10" stroke-width="2.6"/><path d="M44.91,80.21V58.73H23.43A21.47,21.47,0,0,0,44.91,80.21Z" fill="#2d7dd2" fill-opacity="0.7" stroke="#0d4973" stroke-miterlimit="10" stroke-width="2.6"/><circle cx="44.59" cy="59.05" r="21.79" fill="none" stroke="#0d4973" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.47"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_glare.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_glare.pdf
new file mode 100644
index 0000000..38f84ae
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_glare.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_glare.svg b/plugin/openstudio/lib/resources/icons/OSC_new_glare.svg
new file mode 100644
index 0000000..e6058ba
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_glare.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100"><defs><radialGradient id="radial-gradient" cx="50" cy="54.92" r="33.58" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f89820"/><stop offset="0.32" stop-color="#f89820" stop-opacity="0.99"/><stop offset="0.46" stop-color="#f89820" stop-opacity="0.96"/><stop offset="0.56" stop-color="#f89820" stop-opacity="0.91"/><stop offset="0.64" stop-color="#f89820" stop-opacity="0.84"/><stop offset="0.72" stop-color="#f89820" stop-opacity="0.75"/><stop offset="0.79" stop-color="#f89820" stop-opacity="0.63"/><stop offset="0.85" stop-color="#f89820" stop-opacity="0.49"/><stop offset="0.91" stop-color="#f89820" stop-opacity="0.33"/><stop offset="0.96" stop-color="#f89820" stop-opacity="0.16"/><stop offset="1" stop-color="#f89820" stop-opacity="0"/></radialGradient></defs><circle cx="50" cy="54.92" r="33.58" fill="url(#radial-gradient)"/><path d="M68.28,43.6h-6a10,10,0,0,0-9.7,7.47,5.13,5.13,0,0,0-5.14,0,10,10,0,0,0-9.7-7.45h-6A10.28,10.28,0,0,0,21.34,53a10.06,10.06,0,0,0,10,10.72h6.36a10,10,0,0,0,10-8.82,2.21,2.21,0,0,1,1.43-1.82,2.47,2.47,0,0,1,.86-.15,2.72,2.72,0,0,1,1.22.3,2.12,2.12,0,0,1,1.1,1.64,10,10,0,0,0,10,8.85h6.36A10.06,10.06,0,0,0,78.66,53,10.28,10.28,0,0,0,68.28,43.6Z"/><path d="M72.5,32.56H60.7V23.68H72.5V11.44h9.7V23.68H94.06v8.88H82.2V44.74H72.5Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.79"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.pdf
new file mode 100644
index 0000000..72bc35f
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.svg b/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.svg
new file mode 100644
index 0000000..b0a72a3
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_illuminance.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="32.93" cy="34.45" r="8.75" fill="#f89923"/><path d="M33.08,45.51A4.72,4.72,0,0,1,34,46.9a5.7,5.7,0,0,1,.45,1.38,7.56,7.56,0,0,1-.31,2.78c-.12.92-.27,1.85-.45,2.77s-.37,1.85-.61,2.78h-.3c-.24-.93-.4-1.85-.61-2.78s-.33-1.85-.45-2.77a7.56,7.56,0,0,1-.31-2.78,5.7,5.7,0,0,1,.45-1.38,4.72,4.72,0,0,1,.92-1.39Z" fill="#f89923"/><path d="M32.78,23.39A4.85,4.85,0,0,1,31.86,22a5.64,5.64,0,0,1-.45-1.39,7.51,7.51,0,0,1,.31-2.77c.12-.93.27-1.85.45-2.78s.37-1.85.61-2.77h.3c.24.92.4,1.85.61,2.77s.33,1.85.45,2.78a7.51,7.51,0,0,1,.31,2.77A5.64,5.64,0,0,1,34,22a4.85,4.85,0,0,1-.92,1.39Z" fill="#f89923"/><path d="M44,34.3a4.85,4.85,0,0,1,1.39-.92,5.64,5.64,0,0,1,1.39-.45,7.3,7.3,0,0,1,2.77.31c.93.12,1.85.27,2.78.45s1.84.36,2.77.61v.3c-.93.24-1.85.4-2.77.61s-1.85.33-2.78.45a7.51,7.51,0,0,1-2.77.31,6.09,6.09,0,0,1-1.39-.45A5.07,5.07,0,0,1,44,34.6Z" fill="#f89923"/><path d="M21.87,34.6a5.07,5.07,0,0,1-1.39.92,6.09,6.09,0,0,1-1.39.45,7.51,7.51,0,0,1-2.77-.31c-.93-.12-1.85-.28-2.78-.45s-1.85-.37-2.77-.61v-.3c.92-.25,1.85-.41,2.77-.61s1.85-.33,2.78-.45a7.3,7.3,0,0,1,2.77-.31,5.64,5.64,0,0,1,1.39.45,4.85,4.85,0,0,1,1.39.92Z" fill="#f89923"/><path d="M40.86,42.39a5,5,0,0,1,1.63.34,6.1,6.1,0,0,1,1.3.66c.81.49,1.18,1.43,1.74,2.18s1.11,1.5,1.64,2.28,1,1.57,1.54,2.39l-.22.22c-.82-.49-1.59-1-2.39-1.54s-1.54-1.07-2.28-1.64-1.69-.93-2.18-1.74a6.1,6.1,0,0,1-.66-1.3,5,5,0,0,1-.34-1.63Z" fill="#f89923"/><path d="M25,27a5,5,0,0,1-1.63-.34,6.1,6.1,0,0,1-1.3-.66c-.81-.49-1.18-1.43-1.74-2.18s-1.11-1.5-1.64-2.28-1.05-1.57-1.54-2.39l.22-.22c.82.49,1.59,1,2.39,1.54S21.3,21.51,22,22.08s1.69.93,2.18,1.74a6.1,6.1,0,0,1,.66,1.3,5,5,0,0,1,.34,1.63Z" fill="#f89923"/><path d="M25.29,42.45A4.86,4.86,0,0,1,25,44.08a5.66,5.66,0,0,1-.66,1.3c-.5.82-1.44,1.18-2.18,1.75s-1.51,1.11-2.28,1.64-1.57,1-2.4,1.53l-.21-.21c.48-.83,1-1.59,1.53-2.39s1.08-1.54,1.64-2.29.94-1.68,1.75-2.17a5.5,5.5,0,0,1,1.3-.67,5.17,5.17,0,0,1,1.63-.33Z" fill="#f89923"/><path d="M40.72,26.6A5.17,5.17,0,0,1,41.05,25a6.36,6.36,0,0,1,.67-1.3c.49-.81,1.43-1.18,2.17-1.75s1.51-1.11,2.29-1.64,1.56-1.05,2.39-1.53l.21.21c-.48.83-1,1.6-1.53,2.39s-1.08,1.55-1.64,2.29-.93,1.68-1.75,2.18a5.66,5.66,0,0,1-1.3.66,4.85,4.85,0,0,1-1.62.33Z" fill="#f89923"/><path d="M28,46.71l20.55-14.3a1.36,1.36,0,0,1,1.52,0L71.15,45.87A1.38,1.38,0,0,1,71.78,47V68.14a1.36,1.36,0,0,1-.57,1.11L50.08,84.56a1.38,1.38,0,0,1-1.59,0L28,70.18a1.37,1.37,0,0,1-.58-1.12V47.84A1.4,1.4,0,0,1,28,46.71Z" fill="#2d7dd2"/><path id="rect5005" d="M50.92,77l4.71-3.39c.46-.34.84-.28.84.14v4.76a2,2,0,0,1-.84,1.35l-4.71,3.4c-.47.33-.84.27-.84-.14V78.4A2,2,0,0,1,50.92,77Z" fill="#11619a"/><path id="rect5765" d="M51.17,69.27,55.7,66c.51-.37.93-.27.93.23v4.45a2.28,2.28,0,0,1-.93,1.57l-4.53,3.27c-.52.37-.93.27-.93-.23V70.85a2.23,2.23,0,0,1,.93-1.58Z" fill="#11619a"/><path id="rect5767" d="M50.78,61.85,56.08,58c.3-.22.55.21.55,1v3.55a2.54,2.54,0,0,1-.55,1.75l-5.3,3.82c-.3.22-.54-.21-.54-1V63.6a2.54,2.54,0,0,1,.54-1.75Z" fill="#11619a"/><path id="rect5769" d="M58.39,56.32l4.75-3.4c.47-.33.85-.08.85.57V57.4a2.41,2.41,0,0,1-.85,1.78l-4.75,3.4c-.47.33-.85.08-.85-.57V58.1a2.43,2.43,0,0,1,.85-1.78Z" fill="#11619a"/><path id="rect5771" d="M58.21,64.1l5.11-3.66c.37-.26.67.15.67.93v3.46a2.58,2.58,0,0,1-.67,1.87l-5.11,3.66c-.37.26-.67-.15-.67-.92V66a2.59,2.59,0,0,1,.67-1.88Z" fill="#11619a"/><path id="rect5773" d="M58.32,71.58l4.57-3.26c.52-.37.94,0,.94.84v3.23a3,3,0,0,1-.94,2.18l-4.57,3.27c-.52.37-.94,0-.94-.84V73.77a3,3,0,0,1,.94-2.19Z" fill="#11619a"/><path id="rect5775" d="M65.53,66.15l4.75-3.4c.47-.33.85-.08.85.57v3.91A2.43,2.43,0,0,1,70.28,69l-4.75,3.4c-.46.33-.84.08-.84-.57V67.93a2.46,2.46,0,0,1,.84-1.78Z" fill="#11619a"/><path id="rect5777" d="M65.55,59l4.93-3.53c.42-.3.76,0,.76.66V60a2.36,2.36,0,0,1-.76,1.74l-4.93,3.53c-.42.29-.76,0-.76-.66V60.74A2.36,2.36,0,0,1,65.55,59Z" fill="#11619a"/><path id="rect5779" d="M65.55,51.27l4.93-3.52c.42-.3.76-.2.76.22V52.7a1.86,1.86,0,0,1-.76,1.3l-4.93,3.53c-.42.3-.76.2-.76-.22V52.58a1.88,1.88,0,0,1,.76-1.31Z" fill="#11619a"/><path id="rect8055" d="M43.31,73.79,48.09,77a2.5,2.5,0,0,1,.81,1.87v3.6c0,.73-.37,1.08-.81.78l-4.78-3.2a2.5,2.5,0,0,1-.81-1.87v-3.6c0-.74.37-1.09.81-.79Z" fill="#11619a"/><path id="rect8815" d="M43.42,66l4.77,3.21A1.78,1.78,0,0,1,49,70.49v4.87c0,.38-.36.45-.81.15L43.42,72.3a1.78,1.78,0,0,1-.81-1.24V66.2c0-.39.36-.46.81-.16Z" fill="#11619a"/><path id="rect8817" d="M43.42,58.64l4.77,3.21A2,2,0,0,1,49,63.3v4.45c0,.49-.36.66-.81.36L43.42,64.9a2,2,0,0,1-.81-1.45V59c0-.49.36-.66.81-.36Z" fill="#11619a"/><path id="rect8819" d="M36.12,69l4.77,3.2a2.23,2.23,0,0,1,.81,1.69v4c0,.63-.36.9-.81.6L36.12,75.2a2.22,2.22,0,0,1-.81-1.69v-4c0-.63.36-.9.81-.6Z" fill="#11619a"/><path id="rect8821" d="M36.12,61.38l4.77,3.2a2.34,2.34,0,0,1,.81,1.77v3.8c0,.68-.36,1-.81.69l-4.77-3.21a2.33,2.33,0,0,1-.81-1.77v-3.8c0-.68.36-1,.81-.69Z" fill="#11619a"/><path id="rect8823" d="M36.17,54.08l4.77,3.2a2.05,2.05,0,0,1,.81,1.53V63.1c0,.54-.36.74-.81.44l-4.77-3.21a2,2,0,0,1-.81-1.53V54.52c0-.54.36-.74.81-.44Z" fill="#11619a"/><path id="rect8825" d="M28.76,64l4.77,3.2a1.91,1.91,0,0,1,.81,1.39V73.2c0,.47-.36.6-.81.3l-4.77-3.21A1.9,1.9,0,0,1,28,68.91V64.34c0-.47.36-.6.81-.3Z" fill="#11619a"/><path id="rect8827" d="M28.87,56.78,33.64,60a1.89,1.89,0,0,1,.81,1.35V66c0,.44-.36.56-.81.26L28.87,63a1.87,1.87,0,0,1-.81-1.35V57c0-.45.36-.56.81-.26Z" fill="#11619a"/><path id="rect8829" d="M28.87,49.31l4.77,3.2a1.8,1.8,0,0,1,.81,1.26V58.6c0,.39-.36.47-.81.17l-4.77-3.21a1.8,1.8,0,0,1-.81-1.26V49.47c0-.39.36-.46.81-.17Z" fill="#11619a"/><g id="g11205"><path id="rect10429" d="M35.22,43.61,40.54,47c.26.16.06.59-.45.95l-4.19,3c-.51.35-1.14.51-1.4.34l-5.32-3.38c-.26-.16-.06-.59.45-1L33.82,44a1.62,1.62,0,0,1,1.41-.35Z" fill="#11619a"/><path id="rect11189" d="M42.45,48.39l5.32,3.38c.26.17.06.6-.45.95l-4.19,3c-.51.36-1.14.52-1.4.35l-5.32-3.38c-.26-.17-.06-.59.45-1l4.19-2.95c.51-.36,1.14-.52,1.4-.35Z" fill="#11619a"/><path id="rect11191" d="M49.88,53.11l5.31,3.38c.27.17.07.59-.44.95l-4.2,3c-.51.36-1.14.52-1.4.35l-5.31-3.38c-.27-.17-.07-.6.45-1l4.19-2.95a1.6,1.6,0,0,1,1.4-.35Z" fill="#11619a"/><path id="rect11193" d="M42.55,38.53l5.31,3.38c.27.16.07.59-.45,1l-4.19,3c-.51.36-1.14.51-1.4.34l-5.31-3.38c-.27-.16-.07-.59.44-1l4.2-3c.51-.35,1.14-.51,1.4-.34Z" fill="#11619a"/><path id="rect11195" d="M49.87,43.18l5.32,3.38c.26.17.06.59-.45.95l-4.2,3a1.59,1.59,0,0,1-1.4.35l-5.31-3.38c-.26-.17-.06-.6.45-1l4.19-2.94c.51-.36,1.14-.52,1.4-.35Z" fill="#11619a"/><path id="rect11197" d="M57.45,48l5.32,3.38c.26.17.06.59-.45.95l-4.19,3c-.52.36-1.14.52-1.4.35l-5.32-3.38c-.26-.17-.06-.6.45-1l4.19-2.95c.51-.36,1.14-.52,1.4-.35Z" fill="#11619a"/><path id="rect11199" d="M49.66,33.53,55,36.91c.27.17.07.59-.44,1l-4.2,3a1.6,1.6,0,0,1-1.4.35l-5.31-3.38c-.27-.17-.07-.6.45-1l4.19-2.94c.51-.36,1.14-.52,1.4-.35Z" fill="#11619a"/><path id="rect11201" d="M57.19,38.18l5.32,3.38c.26.16.06.59-.45.95l-4.2,3c-.51.35-1.13.51-1.4.34l-5.31-3.38c-.27-.16-.06-.59.45-1l4.19-2.95c.51-.36,1.14-.51,1.4-.34Z" fill="#11619a"/><path id="rect11203" d="M64.57,43l5.31,3.38c.27.17.06.59-.45.95l-4.19,3a1.6,1.6,0,0,1-1.4.35l-5.32-3.38c-.26-.17-.06-.6.45-1l4.2-2.94c.51-.36,1.14-.52,1.4-.35Z" fill="#11619a"/></g><path d="M64.86,42.16H55.09V34.81h9.77V24.67h8V34.81h9.83v7.35H72.89V52.25h-8Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.65"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.pdf
new file mode 100644
index 0000000..88f60fa
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.svg b/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.svg
new file mode 100644
index 0000000..24fa2fd
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_luminaire.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><ellipse cx="56.2" cy="80.81" rx="5.44" ry="4" transform="translate(-19 17.3) rotate(-15)" fill="#fff"/><path d="M62,79.27a4.28,4.28,0,0,1-1.14,3.91,7.68,7.68,0,0,1-7.48,2.18,5.06,5.06,0,0,1-1.92-1,3.72,3.72,0,0,1-1.14-4.24,5.11,5.11,0,0,1,1.16-1.83,7.49,7.49,0,0,1,3.57-2,7.39,7.39,0,0,1,4,.12A4.26,4.26,0,0,1,62,79.27Zm-1,.26a3.19,3.19,0,0,0-2.29-2,6.22,6.22,0,0,0-6.12,1.81A3,3,0,0,0,51.74,82a3,3,0,0,0,2,1.93A6.2,6.2,0,0,0,60,82.44,3.21,3.21,0,0,0,61,79.53Z" fill="#f89820"/><path d="M62.91,46.9a15.26,15.26,0,1,0-29.48,7.9C35.09,61,40,62.5,44.58,66.46c1.64,1.43,4,8,4,8l11.35-3s-1.26-6.91-.56-9C61.21,56.76,64.54,53,62.91,46.9Z" fill="#fff"/><path d="M62.19,47.09a16.45,16.45,0,0,0-1.75-4,15.87,15.87,0,0,0-2.85-3.27,14.38,14.38,0,0,0-16.23-1.61A14,14,0,0,0,38,40.86a13.38,13.38,0,0,0-2.44,3.49,14,14,0,0,0-1.35,8.28,12.79,12.79,0,0,0,1.19,4,11.58,11.58,0,0,0,2.55,3.26c2.11,1.92,4.84,3.44,7.24,5.55a5.75,5.75,0,0,1,.52.5c.18.2.28.37.43.56a11.5,11.5,0,0,1,.66,1.07c.4.72.74,1.43,1.06,2.15.64,1.44,1.2,2.87,1.72,4.35l-1.26-.66L59.68,70.5l-.66,1a50.68,50.68,0,0,1-.71-6.41,13.34,13.34,0,0,1,0-1.67,5.81,5.81,0,0,1,.11-.9l.13-.48.14-.38c.35-1,.79-2,1.21-3A38.1,38.1,0,0,0,62.19,53,11.81,11.81,0,0,0,62.58,50,12.76,12.76,0,0,0,62.19,47.09Zm1.44-.38a12.71,12.71,0,0,1,.06,6.63,40.6,40.6,0,0,1-2.3,6c-.41,1-.81,1.92-1.13,2.89l-.12.37-.07.28a6.78,6.78,0,0,0-.07.68,12.38,12.38,0,0,0,0,1.49,51.73,51.73,0,0,0,.79,6.15L61,72l-.8.23L48.83,75.43l-.91.26-.34-.91c-.53-1.39-1.12-2.8-1.75-4.14-.32-.67-.66-1.33-1-2a9.82,9.82,0,0,0-.55-.86c-.1-.11-.2-.26-.28-.35a3.64,3.64,0,0,0-.32-.29c-2.22-1.9-4.9-3.37-7.35-5.55a13.64,13.64,0,0,1-3-4,14.4,14.4,0,0,1-1.36-4.76,15.8,15.8,0,0,1,.17-4.9,16.38,16.38,0,0,1,4.5-8.52,15.12,15.12,0,0,1,3.91-2.87,16.19,16.19,0,0,1,18.09,2,17.27,17.27,0,0,1,3.13,3.64A17.57,17.57,0,0,1,63.63,46.71Z" fill="#f89820"/><rect x="47.99" y="72.8" width="14.31" height="8.14" transform="translate(-18.02 16.89) rotate(-15)" fill="#fff"/><path d="M63.59,79.23,49.48,83.39l-.7.21-.22-.75c-.77-2.6-1.53-5.21-2.24-7.83l-.24-.86.87-.23c4.6-1.24,9.27-2.27,13.88-3.47l.64-.17.17.63C62.35,73.7,63,76.52,63.59,79.23Zm-1-.55c-.8-2.53-1.57-5-2.25-7.42l.8.47C56.57,73,52,74.43,47.41,75.66l.63-1.1c.7,2.63,1.34,5.26,2,7.9l-.93-.53Z" fill="#f89820"/><path d="M50.62,73.21a4.57,4.57,0,0,0,.54-1.82,8.74,8.74,0,0,0-.08-2,35.4,35.4,0,0,0-1-4.13c-.82-2.73-1.91-5.41-3-8.07a6,6,0,0,0-.46-.88c-.15-.26-.38-.46-.43-.45a.93.93,0,0,0-.47.24,1,1,0,0,0-.33.56.77.77,0,0,0,.61.93,5.59,5.59,0,0,0,.91.12,3.44,3.44,0,0,0,.92-.05,4,4,0,0,0,1.65-.82,2.1,2.1,0,0,0,.7-1.42,4.67,4.67,0,0,0-.08-1.86,3,3,0,0,0-.66-1.41h0a.5.5,0,0,0-.21.08.72.72,0,0,0-.15.11l-.08.06h0a.55.55,0,0,0-.09.19,2.71,2.71,0,0,0,.22,1.62,2.41,2.41,0,0,0,.47.69,1.7,1.7,0,0,0,.31.26l.46.35A10.33,10.33,0,0,0,52,56.62a2.07,2.07,0,0,0,.76.22h.16l.24,0c.16,0,.32-.05.47-.09a2.11,2.11,0,0,0,.74-.31.77.77,0,0,0,.32-.53,1.1,1.1,0,0,0,0-.66.65.65,0,0,0-.43-.34c-.39-.15-.72.07-.95.62a9.31,9.31,0,0,0-.12,4,37.16,37.16,0,0,0,.7,4.2,21.87,21.87,0,0,0,1.27,4A8.58,8.58,0,0,0,57.5,71l-.51.78a9.31,9.31,0,0,1-2.77-3.62,22.69,22.69,0,0,1-1.38-4.2,36.84,36.84,0,0,1-.77-4.32,10.46,10.46,0,0,1,.14-4.57,2.47,2.47,0,0,1,.86-1.13,2,2,0,0,1,.76-.28,1.55,1.55,0,0,1,.43,0,3,3,0,0,1,.35.08,1.9,1.9,0,0,1,1.21,1A2.28,2.28,0,0,1,56,56.14a3.18,3.18,0,0,1-.08.33,2,2,0,0,1-.67,1A3.31,3.31,0,0,1,54,58a4.29,4.29,0,0,1-.6.13l-.29.05-.38,0a3.51,3.51,0,0,1-1.31-.35,11.78,11.78,0,0,1-1.91-1.29l-.41-.29a4.93,4.93,0,0,1-.52-.43,4.16,4.16,0,0,1-.75-1.09,4,4,0,0,1-.33-2.59,1.76,1.76,0,0,1,.39-.77,1.54,1.54,0,0,1,.17-.19l.14-.1a2.11,2.11,0,0,1,.29-.2,2,2,0,0,1,.79-.3,1.56,1.56,0,0,1,1,.22A2.49,2.49,0,0,1,51.19,52a6.56,6.56,0,0,1,.38,1.16,6.4,6.4,0,0,1,.06,2.43,3.47,3.47,0,0,1-1.3,2.3,5.17,5.17,0,0,1-2.22,1,5.12,5.12,0,0,1-1.23,0,5.78,5.78,0,0,1-1.22-.21,2.15,2.15,0,0,1-1.19-.91,2,2,0,0,1-.23-1.5A2.2,2.2,0,0,1,45,55.12a2.39,2.39,0,0,1,.62-.36,1.4,1.4,0,0,1,.9-.08,2,2,0,0,1,1.11,1,7.22,7.22,0,0,1,.51,1c1,2.72,2.1,5.4,2.91,8.21a33.67,33.67,0,0,1,1,4.28,6.79,6.79,0,0,1-.67,4.55Z" fill="#f89820"/><path d="M25.84,54.94a9.52,9.52,0,0,1-3.11,2,14.74,14.74,0,0,1-3.45.67q-1.74.31-3.48.57c-1.17.14-2.33.32-3.51.44a.11.11,0,0,1-.13-.11.11.11,0,0,1,.07-.12c1.08-.48,2.17-.91,3.26-1.37s2.19-.85,3.3-1.25a14.82,14.82,0,0,1,3.32-1.14,9.54,9.54,0,0,1,3.67.13.14.14,0,0,1,.1.17A.21.21,0,0,1,25.84,54.94Z" fill="#f89820"/><path d="M65.05,44.19a9.23,9.23,0,0,1,3.11-1.94,14.26,14.26,0,0,1,3.45-.68c1.15-.21,2.31-.4,3.48-.56s2.33-.33,3.51-.45a.12.12,0,0,1,.13.11.11.11,0,0,1-.07.12c-1.08.48-2.18.91-3.26,1.37s-2.2.85-3.3,1.25a14.73,14.73,0,0,1-3.33,1.14,9.49,9.49,0,0,1-3.66-.13.13.13,0,0,1-.1-.17Z" fill="#f89820"/><path d="M42.8,31.27a9.43,9.43,0,0,1-1.94-3.11,14.45,14.45,0,0,1-.68-3.45c-.21-1.16-.4-2.32-.56-3.48s-.33-2.34-.45-3.52a.12.12,0,0,1,.11-.13.14.14,0,0,1,.12.07c.49,1.08.91,2.18,1.37,3.27s.85,2.19,1.25,3.29a14.9,14.9,0,0,1,1.14,3.33A9.49,9.49,0,0,1,43,31.2a.13.13,0,0,1-.17.1Z" fill="#f89820"/><path d="M29.4,40.08a9.5,9.5,0,0,1-3.57-.83,14.49,14.49,0,0,1-2.92-2c-1-.67-1.92-1.35-2.86-2.06s-1.88-1.42-2.8-2.17a.12.12,0,0,1,.12-.2c1.11.42,2.18.89,3.28,1.34s2.15.94,3.21,1.44A15.19,15.19,0,0,1,27,37.19a9.49,9.49,0,0,1,2.5,2.68.13.13,0,0,1-.05.19Z" fill="#f89820"/><path d="M58.84,32a9.4,9.4,0,0,1,.82-3.58,15.22,15.22,0,0,1,2-2.92c.67-1,1.36-1.91,2.06-2.85s1.42-1.89,2.17-2.8a.12.12,0,0,1,.21.12c-.42,1.1-.9,2.18-1.34,3.27s-.95,2.16-1.45,3.22a15.16,15.16,0,0,1-1.54,3.16A9.67,9.67,0,0,1,59,32.14a.15.15,0,0,1-.19,0A.17.17,0,0,1,58.84,32Z" fill="#f89820"/><path d="M64.91,43.49H55.14V36.14h9.77V26h8V36.14h9.82v7.35H73V53.58h-8Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.65"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_partition.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_partition.pdf
new file mode 100644
index 0000000..36913c9
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_partition.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_partition.svg b/plugin/openstudio/lib/resources/icons/OSC_new_partition.svg
new file mode 100644
index 0000000..d200524
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_partition.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="51.42 31.7 51.42 64.1 18.45 82.09 18.45 49.69 51.42 31.7" fill="#2d7dd2" stroke="#11619a" stroke-linejoin="round" stroke-width="1.5"/><polygon points="51.42 31.7 51.42 64.1 82.27 75.3 82.27 42.9 51.42 31.7" fill="#2d7dd2" stroke="#11619a" stroke-linejoin="round" stroke-width="1.5"/><polygon points="51.42 31.7 51.42 64.1 18.45 82.09 18.45 49.69 51.42 31.7" fill="#225e9e" stroke="#11619a" stroke-linejoin="round" stroke-width="1.5" opacity="0.5"/><path d="M72.63,29.7H62.86V22.35h9.77V12.21h8V22.35h9.82V29.7H80.66V39.79h-8Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.65"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_shading.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_shading.pdf
new file mode 100644
index 0000000..1d54883
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_shading.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_shading.svg b/plugin/openstudio/lib/resources/icons/OSC_new_shading.svg
new file mode 100644
index 0000000..c4bd6a1
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_shading.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><circle cx="34.35" cy="34.62" r="8.75" fill="#f89923"/><path d="M34.5,45.68a4.72,4.72,0,0,1,.92,1.39,5.7,5.7,0,0,1,.45,1.38,7.56,7.56,0,0,1-.31,2.78c-.12.92-.27,1.85-.45,2.77s-.37,1.85-.61,2.78h-.3c-.24-.93-.4-1.85-.61-2.78s-.33-1.85-.45-2.77a7.56,7.56,0,0,1-.31-2.78,5.7,5.7,0,0,1,.45-1.38,4.72,4.72,0,0,1,.92-1.39Z" fill="#f89923"/><path d="M34.2,23.56a5,5,0,0,1-.92-1.39,5.77,5.77,0,0,1-.45-1.39A7.51,7.51,0,0,1,33.14,18c.12-.93.28-1.85.45-2.78s.37-1.85.61-2.77h.3c.24.92.4,1.85.61,2.77s.33,1.85.45,2.78a7.51,7.51,0,0,1,.31,2.77,5.77,5.77,0,0,1-.45,1.39,5,5,0,0,1-.92,1.39Z" fill="#f89923"/><path d="M45.41,34.47a4.85,4.85,0,0,1,1.39-.92,5.64,5.64,0,0,1,1.39-.45,7.5,7.5,0,0,1,2.77.3c.93.13,1.85.28,2.78.46s1.85.36,2.77.61v.3c-.92.24-1.85.4-2.77.61s-1.85.32-2.78.45a7.3,7.3,0,0,1-2.77.3,5.25,5.25,0,0,1-1.39-.45,5,5,0,0,1-1.39-.91Z" fill="#f89923"/><path d="M23.29,34.77a5,5,0,0,1-1.39.91,5.25,5.25,0,0,1-1.39.45,7.3,7.3,0,0,1-2.77-.3c-.92-.13-1.85-.28-2.77-.45s-1.85-.37-2.78-.61v-.3c.93-.25,1.85-.41,2.78-.61s1.85-.33,2.77-.46a7.5,7.5,0,0,1,2.77-.3,5.64,5.64,0,0,1,1.39.45,4.85,4.85,0,0,1,1.39.92Z" fill="#f89923"/><path d="M42.28,42.56a5,5,0,0,1,1.63.34,6.1,6.1,0,0,1,1.3.66C46,44.05,46.39,45,47,45.74s1.12,1.5,1.64,2.28,1,1.57,1.54,2.39l-.22.22c-.82-.49-1.59-1-2.39-1.54S46,48,45.24,47.45s-1.69-.93-2.18-1.75a5.8,5.8,0,0,1-.66-1.29,5,5,0,0,1-.34-1.63Z" fill="#f89923"/><path d="M26.42,27.13a4.72,4.72,0,0,1-1.63-.33,6.1,6.1,0,0,1-1.3-.66c-.81-.5-1.18-1.44-1.74-2.18s-1.11-1.5-1.64-2.28-1.05-1.57-1.54-2.39l.22-.22c.82.48,1.59,1,2.39,1.54s1.54,1.07,2.28,1.64,1.69.93,2.18,1.74a5.88,5.88,0,0,1,.66,1.3,5,5,0,0,1,.34,1.63Z" fill="#f89923"/><path d="M26.71,42.62a4.91,4.91,0,0,1-.33,1.63,5.88,5.88,0,0,1-.66,1.3c-.5.82-1.44,1.18-2.18,1.75s-1.5,1.11-2.28,1.64S19.69,50,18.87,50.47l-.22-.21c.48-.83,1-1.6,1.53-2.39s1.08-1.54,1.64-2.29.94-1.68,1.75-2.17a5.5,5.5,0,0,1,1.3-.67,4.91,4.91,0,0,1,1.63-.33Z" fill="#f89923"/><path d="M42.14,26.77a4.85,4.85,0,0,1,.34-1.63,5.66,5.66,0,0,1,.66-1.3c.49-.82,1.43-1.18,2.17-1.75S46.82,21,47.6,20.45,49.16,19.4,50,18.92l.21.21c-.48.83-1,1.59-1.53,2.39S47.6,23.06,47,23.81,46.1,25.49,45.28,26a5.32,5.32,0,0,1-1.3.67,5.11,5.11,0,0,1-1.62.33Z" fill="#f89923"/><rect x="45.73" y="38.08" width="28.27" height="28.27" transform="translate(119.73 104.42) rotate(180)" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><rect x="31.6" y="52.21" width="28.27" height="28.27" transform="translate(91.46 132.68) rotate(180)" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><line x1="74" y1="38.08" x2="59.86" y2="52.21" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><line x1="45.73" y1="38.08" x2="31.6" y2="52.21" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><line x1="74" y1="66.34" x2="59.86" y2="80.48" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><line x1="45.73" y1="66.34" x2="31.6" y2="80.48" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.55"/><path d="M70,30H60.18V22.59H70V12.46h8V22.59h9.82V30H78V40H70Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.65"/><path d="M74,66.34H45.73L31.6,80.48l10.73,6.89a1.06,1.06,0,0,0,.57.17H70.42a1.06,1.06,0,0,0,.75-.31L84.06,74.34a1.06,1.06,0,0,0-.18-1.64Z" fill="#11619a" opacity="0.5"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_space.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_space.pdf
new file mode 100644
index 0000000..f6bd388
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_space.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_space.svg b/plugin/openstudio/lib/resources/icons/OSC_new_space.svg
new file mode 100644
index 0000000..dbf7c07
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_space.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><style>.cls-1{fill:#2d7dd2;}.cls-2,.cls-4{fill:#0d4973;}.cls-3{fill:#11619a;}.cls-4{stroke:#fff;stroke-linecap:round;stroke-linejoin:round;}</style></defs><path class="cls-1" d="M15.67,33.08l31.6-22A2.1,2.1,0,0,1,49.6,11L82,31.79a2.12,2.12,0,0,1,1,1.77V66a2.1,2.1,0,0,1-.87,1.71L49.63,91.29a2.1,2.1,0,0,1-2.44,0L15.66,69.17a2.1,2.1,0,0,1-.9-1.72V34.81A2.11,2.11,0,0,1,15.67,33.08Z"/><path id="rect5005" class="cls-2" d="M50.93,79.73l7.24-5.22c.71-.52,1.29-.42,1.29.21v7.33a3.1,3.1,0,0,1-1.29,2.08l-7.24,5.22c-.72.52-1.3.43-1.3-.21V81.81a3.1,3.1,0,0,1,1.3-2.08Z"/><path id="rect5765" class="cls-3" d="M51.31,67.78l7-5c.8-.57,1.44-.42,1.44.35V70a3.5,3.5,0,0,1-1.44,2.42l-7,5c-.79.57-1.43.41-1.43-.35V70.2a3.49,3.49,0,0,1,1.43-2.42Z"/><path id="rect5767" class="cls-3" d="M50.72,56.37l8.15-5.88c.46-.33.84.33.84,1.48v5.46a3.86,3.86,0,0,1-.84,2.68L50.72,66c-.47.34-.84-.32-.84-1.47V59.06a3.85,3.85,0,0,1,.84-2.69Z"/><path id="rect5769" class="cls-3" d="M62.42,47.86l7.3-5.23c.72-.51,1.31-.12,1.31.87v6a3.74,3.74,0,0,1-1.31,2.73l-7.3,5.22c-.72.52-1.31.13-1.31-.86v-6a3.74,3.74,0,0,1,1.31-2.73Z"/><path id="rect5771" class="cls-3" d="M62.14,59.83,70,54.2c.56-.4,1,.23,1,1.42v5.32a4,4,0,0,1-1,2.88l-7.87,5.63c-.57.4-1-.23-1-1.42V62.71a4,4,0,0,1,1-2.88Z"/><path id="rect5773" class="cls-3" d="M62.31,71.34l7-5c.8-.57,1.44,0,1.44,1.29v5a4.54,4.54,0,0,1-1.44,3.36l-7,5c-.8.57-1.44,0-1.44-1.29v-5a4.54,4.54,0,0,1,1.44-3.35Z"/><path id="rect5775" class="cls-3" d="M73.4,63l7.31-5.23c.72-.51,1.3-.12,1.3.87v6a3.72,3.72,0,0,1-1.3,2.73L73.4,72.6c-.71.52-1.3.12-1.3-.87v-6A3.76,3.76,0,0,1,73.4,63Z"/><path id="rect5777" class="cls-3" d="M73.43,52,81,46.55c.65-.46,1.17,0,1.17,1V53.5A3.62,3.62,0,0,1,81,56.18L73.43,61.6c-.65.46-1.17,0-1.17-1V54.65A3.61,3.61,0,0,1,73.43,52Z"/><path id="rect5779" class="cls-3" d="M73.43,40.1,81,34.67c.65-.46,1.17-.3,1.17.35v7.26a2.86,2.86,0,0,1-1.17,2l-7.58,5.43c-.65.46-1.17.31-1.17-.35V42.11a2.86,2.86,0,0,1,1.17-2Z"/><path id="rect8055" class="cls-2" d="M39.23,74.73l7.34,4.93a3.8,3.8,0,0,1,1.25,2.88v5.54c0,1.13-.56,1.67-1.25,1.2l-7.34-4.93A3.79,3.79,0,0,1,38,81.48V75.94c0-1.13.55-1.67,1.24-1.21Z"/><path id="rect8815" class="cls-3" d="M39.4,62.82l7.34,4.93A2.78,2.78,0,0,1,48,69.65v7.49c0,.59-.56.69-1.24.23L39.4,72.44a2.78,2.78,0,0,1-1.25-1.91V63.05c0-.59.56-.7,1.25-.23Z"/><path id="rect8817" class="cls-3" d="M39.4,51.43l7.34,4.93A3.07,3.07,0,0,1,48,58.59v6.84c0,.77-.56,1-1.24.56L39.4,61.05a3,3,0,0,1-1.25-2.22V52c0-.77.56-1,1.25-.56Z"/><path id="rect8819" class="cls-3" d="M28.16,67.28l7.34,4.93a3.44,3.44,0,0,1,1.25,2.6v6.1c0,1-.56,1.39-1.25.92L28.16,76.9a3.42,3.42,0,0,1-1.24-2.6V68.21c0-1,.55-1.39,1.24-.93Z"/><path id="rect8821" class="cls-2" d="M28.16,55.63l7.34,4.93a3.63,3.63,0,0,1,1.25,2.73v5.84c0,1.05-.56,1.52-1.25,1.06l-7.34-4.93a3.62,3.62,0,0,1-1.24-2.73V56.69c0-1,.55-1.52,1.24-1.06Z"/><path id="rect8823" class="cls-3" d="M28.24,44.41l7.34,4.93a3.16,3.16,0,0,1,1.25,2.35v6.59c0,.84-.56,1.15-1.25.68L28.24,54A3.14,3.14,0,0,1,27,51.68V45.09c0-.84.56-1.14,1.24-.68Z"/><path id="rect8825" class="cls-3" d="M16.84,59.73l7.34,4.93a3,3,0,0,1,1.25,2.13v7c0,.71-.56.92-1.25.45l-7.34-4.93a3,3,0,0,1-1.24-2.13v-7c0-.72.56-.92,1.24-.46Z"/><path id="rect8827" class="cls-3" d="M17,48.56l7.34,4.93a2.89,2.89,0,0,1,1.25,2.08v7.14c0,.68-.56.86-1.25.4L17,58.18a2.89,2.89,0,0,1-1.25-2.07V49c0-.68.56-.86,1.25-.4Z"/><path id="rect8829" class="cls-3" d="M17,37.07,24.35,42a2.8,2.8,0,0,1,1.25,1.93v7.43c0,.61-.56.72-1.25.26L17,46.69a2.78,2.78,0,0,1-1.25-1.93V37.33c0-.61.56-.72,1.25-.26Z"/><g id="g11205"><path id="rect10429" class="cls-3" d="M26.79,28.3,35,33.5c.41.26.1.92-.69,1.47L27.82,39.5c-.78.55-1.75.79-2.15.54l-8.18-5.2c-.4-.26-.09-.92.7-1.47l6.44-4.53c.79-.55,1.76-.79,2.16-.54Z"/><path id="rect11189" class="cls-3" d="M37.91,35.67l8.17,5.19c.41.26.1.92-.69,1.47l-6.45,4.53c-.78.55-1.75.79-2.15.54l-8.18-5.2c-.4-.26-.09-.91.7-1.47l6.45-4.53a2.44,2.44,0,0,1,2.15-.54Z"/><path id="rect11191" class="cls-3" d="M49.33,42.92l8.17,5.2c.41.26.1.92-.69,1.47l-6.45,4.53c-.78.55-1.75.79-2.15.53L40,49.46c-.4-.26-.09-.92.69-1.47l6.45-4.53c.79-.55,1.75-.79,2.16-.53Z"/><path id="rect11193" class="cls-3" d="M38.05,20.49l8.18,5.2c.4.26.09.91-.69,1.47l-6.45,4.53c-.79.55-1.75.79-2.16.53L28.76,27c-.41-.25-.1-.91.69-1.46L35.9,21c.79-.55,1.75-.79,2.15-.54Z"/><path id="rect11195" class="cls-3" d="M49.31,27.65l8.18,5.2c.4.25.1.91-.69,1.46l-6.45,4.53c-.79.56-1.75.8-2.15.54L40,34.18c-.4-.26-.09-.91.69-1.46l6.45-4.54c.78-.55,1.75-.79,2.15-.53Z"/><path id="rect11197" class="cls-3" d="M61,35.06l8.18,5.2c.4.26.1.92-.69,1.47L62,46.26c-.79.55-1.75.79-2.15.54l-8.18-5.2c-.4-.26-.09-.92.69-1.47l6.45-4.53c.78-.55,1.75-.79,2.15-.54Z"/><path id="rect11199" class="cls-3" d="M49,12.81,57.16,18c.41.26.1.92-.69,1.47L50,24c-.78.55-1.75.79-2.15.54l-8.18-5.2c-.4-.26-.09-.91.7-1.47l6.45-4.53c.78-.55,1.75-.79,2.15-.54Z"/><path id="rect11201" class="cls-3" d="M60.57,20l8.18,5.2c.4.26.09.91-.69,1.47l-6.45,4.53c-.79.55-1.75.79-2.16.53l-8.17-5.2c-.41-.25-.1-.91.69-1.46l6.45-4.53A2.42,2.42,0,0,1,60.57,20Z"/><path id="rect11203" class="cls-3" d="M71.92,27.37l8.18,5.2c.4.26.09.91-.7,1.47L73,38.57c-.78.55-1.75.79-2.15.53l-8.18-5.2c-.4-.25-.09-.91.7-1.46l6.45-4.53c.78-.55,1.75-.79,2.15-.54Z"/></g><path class="cls-4" d="M66.53,35.21h-15V23.9h15V8.31H78.89V23.9H94V35.21H78.89V50.72H66.53Z"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_space2.pdf b/plugin/openstudio/lib/resources/icons/OSC_new_space2.pdf
new file mode 100644
index 0000000..e2e04a9
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_new_space2.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_new_space2.svg b/plugin/openstudio/lib/resources/icons/OSC_new_space2.svg
new file mode 100644
index 0000000..4bc1f56
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_new_space2.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M70.05,28.6H60.28V21.25h9.77V11.11h8V21.25h9.82V28.6H78.09V38.68h-8Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.65"/><rect x="15.11" y="28.49" width="40.52" height="40.52" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/><line x1="55.63" y1="28.49" x2="75.89" y2="48.75" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/><line x1="15.11" y1="69.01" x2="35.37" y2="89.27" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/><line x1="55.63" y1="69.01" x2="75.89" y2="89.27" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/><rect x="38.55" y="57.17" width="28.49" height="28.49" fill="#97897b" stroke="#71675c" stroke-linejoin="round" stroke-width="1.05"/><polygon points="24.51 43.14 24.51 71.63 38.34 85.45 38.34 57.38 24.51 43.14" fill="#97897b" stroke="#71675c" stroke-linejoin="round" stroke-width="1.05"/><polygon points="66.61 57.17 38.34 57.17 24.51 43.14 51.38 43.14 66.61 57.17" fill="#97897b" stroke="#71675c" stroke-linejoin="round" stroke-width="1.05"/><rect x="35.37" y="48.75" width="40.52" height="40.52" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/><line x1="15.11" y1="28.49" x2="35.37" y2="48.75" fill="none" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.22"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os.pdf b/plugin/openstudio/lib/resources/icons/OSC_os.pdf
new file mode 100644
index 0000000..499dacf
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_os.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os.svg b/plugin/openstudio/lib/resources/icons/OSC_os.svg
new file mode 100644
index 0000000..41f66d6
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_os.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M51,48l5.59,3.08a.72.72,0,0,1,0,1.26L51,55.38a1.43,1.43,0,0,1-1.39,0L44,52.31a.72.72,0,0,1,0-1.26L49.59,48A1.43,1.43,0,0,1,51,48Zm-.69-2.31-10.93,6h0l10.93,6,10.92-6h0l-10.92-6Z" fill="#fff"/><path d="M20.7,40.85V62.56h0v2.91a5.44,5.44,0,0,0,2.73,4.71L47.56,84.07a5.48,5.48,0,0,0,5.43,0L77.13,70.18a5.45,5.45,0,0,0,2.72-4.71V62.56h0V40.85h0V37.79a5.43,5.43,0,0,0-2.75-4.73L53,19.32a5.45,5.45,0,0,0-5.38,0L23.45,33.06a5.43,5.43,0,0,0-2.75,4.73v3.06m0,0h0" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.49"/><polygon points="20.7 62.56 40.42 51.71 20.7 40.85 20.7 62.56" fill="#71675c"/><path d="M77.1,33.06,53,19.32a5.47,5.47,0,0,0-2.69-.71V46.28h0l9.86,5.43L79.85,40.85V37.79A5.43,5.43,0,0,0,77.1,33.06Z" fill="#2d7dd2"/><path d="M47.59,19.32,23.45,33.06a5.43,5.43,0,0,0-2.75,4.73v3.06L40.42,51.71l9.86-5.43V18.61A5.47,5.47,0,0,0,47.59,19.32Z" fill="#11619a"/><path d="M40.42,51.71,20.7,62.56v2.91a5.44,5.44,0,0,0,2.73,4.71L47.56,84.07a5.48,5.48,0,0,0,2.72.72V57.14Z" fill="#97897b"/><path d="M50.28,57.14h0V84.79A5.44,5.44,0,0,0,53,84.07L77.13,70.18a5.45,5.45,0,0,0,2.72-4.71V62.56L60.14,51.71Z" fill="#f89820"/><polygon points="79.86 62.56 79.86 40.85 60.14 51.71 79.86 62.56" fill="#fbc179"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_new.pdf b/plugin/openstudio/lib/resources/icons/OSC_os_new.pdf
new file mode 100644
index 0000000..20b5702
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_os_new.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_new.svg b/plugin/openstudio/lib/resources/icons/OSC_os_new.svg
new file mode 100644
index 0000000..f020da8
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_os_new.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="62.37 82.03 10.65 90.71 10.65 23.78 41.52 19.52 62.37 34.67 62.37 82.03" fill="#fff" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><path d="M16,33c1.37-.2,1.37.51,2.74.32s1.36-.91,2.73-1.1,1.37.51,2.73.32,1.37-.9,2.74-1.1,1.37.51,2.73.32,1.37-.9,2.74-1.1,1.37.51,2.73.32,1.37-.9,2.74-1.1,1.36.51,2.73.32,1.37-.9,2.74-1.09,1.37.5,2.74.31,1.37-.9,2.74-1.09,1.37.5,2.74.3" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><path d="M16,41.26c1.87-.27,1.87,1.89,3.73,1.61s1.86-2.43,3.72-2.7,1.86,1.88,3.72,1.61,1.86-2.42,3.73-2.69,1.86,1.87,3.72,1.59S36.5,38.27,38.37,38s1.86,1.86,3.72,1.59,1.86-2.41,3.73-2.68,1.86,1.86,3.72,1.58,1.87-2.4,3.73-2.67S55.14,37.67,57,37.4" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><path d="M16,50.89c1.58-.24,1.58.58,3.15.34s1.58-1,3.15-1.29,1.58.58,3.15.34,1.58-1.05,3.15-1.28,1.58.57,3.15.33,1.58-1,3.16-1.28,1.57.57,3.15.33,1.57-1,3.15-1.28,1.57.57,3.15.33,1.58-1,3.15-1.28,1.58.57,3.16.33,1.58-1,3.16-1.28,1.57.57,3.15.33" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><path d="M16,59.18c1.87-.29,1.87,1.87,3.73,1.58s1.86-2.44,3.72-2.73,1.86,1.86,3.72,1.58,1.86-2.44,3.73-2.73,1.86,1.86,3.72,1.57S36.5,56,38.37,55.73s1.86,1.85,3.72,1.56,1.86-2.42,3.73-2.7,1.86,1.84,3.72,1.55,1.87-2.42,3.73-2.7S55.14,55.27,57,55" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><polygon points="41.87 19.47 62.37 34.6 41.87 37.59 41.87 19.47" fill="#fff" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.08"/><path d="M65.13,31.87H53.22v-9H65.13V10.56h9.79V22.91h12v9h-12V44.16H65.13Z" fill="#0d4973" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.79"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_open.pdf b/plugin/openstudio/lib/resources/icons/OSC_os_open.pdf
new file mode 100644
index 0000000..4c899e9
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_os_open.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_open.svg b/plugin/openstudio/lib/resources/icons/OSC_os_open.svg
new file mode 100644
index 0000000..383c117
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_os_open.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><rect x="11.9" y="39.92" width="63.27" height="52.89" rx="2.26" fill="#2d7dd2"/><polygon points="68.03 87.92 20.13 87.92 20.13 25.93 48.71 25.93 68.03 43.02 68.03 87.92" fill="#fff" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><path d="M25.1,35.2c1.27,0,1.27.66,2.53.66s1.27-.66,2.53-.66,1.27.66,2.54.66,1.26-.66,2.53-.66,1.27.66,2.53.66S39,35.2,40.3,35.2s1.26.66,2.52.66,1.27-.66,2.54-.66,1.26.66,2.53.66,1.27-.66,2.54-.66,1.27.66,2.53.66,1.27-.66,2.54-.66,1.27.66,2.54.66" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><path d="M25.1,42.85c1.72,0,1.72,2,3.45,2s1.72-2,3.45-2,1.72,2,3.45,2,1.72-2,3.45-2,1.72,2,3.45,2,1.72-2,3.44-2,1.73,2,3.45,2,1.73-2,3.45-2,1.73,2,3.46,2,1.72-2,3.45-2,1.73,2,3.46,2" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><path d="M25.1,51.79c1.46,0,1.46.76,2.92.76s1.46-.76,2.91-.76,1.46.76,2.92.76,1.46-.76,2.92-.76,1.46.76,2.92.76,1.46-.76,2.92-.76,1.46.76,2.92.76,1.46-.76,2.92-.76,1.46.76,2.92.76,1.46-.76,2.92-.76,1.46.76,2.92.76,1.46-.76,2.92-.76,1.47.76,2.93.76" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><path d="M25.1,59.48c1.72,0,1.72,2,3.45,2s1.72-2,3.45-2,1.72,2,3.45,2,1.72-2,3.45-2,1.72,2,3.45,2,1.72-2,3.44-2,1.73,2,3.45,2,1.73-2,3.45-2,1.73,2,3.46,2,1.72-2,3.45-2,1.73,2,3.46,2" fill="none" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><polygon points="49.04 25.93 68.03 42.95 49.04 42.95 49.04 25.93" fill="#fff" stroke="#999" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/><rect x="30.07" y="18.42" width="14.11" height="13.16" transform="translate(12.12 62.13) rotate(-90)" fill="#11619a"/><polygon points="21.77 19.78 37.18 6.61 52.48 19.69 21.77 19.78" fill="#11619a"/><path d="M75.57,92.82H15L26.71,51a3.52,3.52,0,0,1,3.38-2.57h56a3.52,3.52,0,0,1,3.38,4.47L79,90.26A3.52,3.52,0,0,1,75.57,92.82Z" fill="#11619a"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_save.pdf b/plugin/openstudio/lib/resources/icons/OSC_os_save.pdf
new file mode 100644
index 0000000..19b365a
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_os_save.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_save.svg b/plugin/openstudio/lib/resources/icons/OSC_os_save.svg
new file mode 100644
index 0000000..5ee95b4
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_os_save.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M20.05,26.37l1.41-1.29,53.37-5.93,3.38,2.79V76.83l-1,1.1L21.32,85.49l-1.27-.95S20.47,25.9,20.05,26.37Z" fill="#2d7dd2"/><path d="M68,39.11,29.88,43.65A1.61,1.61,0,0,1,28,42V24.42l42.21-4.7V36.66A2.56,2.56,0,0,1,68,39.11Z" fill="#11619a"/><path d="M67.63,39l-21.82,2.6a1.74,1.74,0,0,1-2-1.75V22.32l25.82-2.87V36.78A2.29,2.29,0,0,1,67.63,39Z" fill="#999"/><path d="M70.24,77.89,28,83.59V50.69a2.31,2.31,0,0,1,2-2.23l38.21-4.63a1.73,1.73,0,0,1,2,1.72Z" fill="#f2f2f2"/><path d="M65.76,37.85l-6.08.72a.86.86,0,0,1-1-.86V25.56a1.15,1.15,0,0,1,1-1.1l6.08-.68a.86.86,0,0,1,1,.87v12.1A1.13,1.13,0,0,1,65.76,37.85Z" fill="#0d4973"/><polygon points="66.76 22.09 62.29 22.59 62.29 20.71 66.76 20.21 66.76 22.09" fill="#0d4973"/><polygon points="51.15 23.84 46.68 24.34 46.68 22.45 51.15 21.95 51.15 23.84" fill="#0d4973"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_save_as.pdf b/plugin/openstudio/lib/resources/icons/OSC_os_save_as.pdf
new file mode 100644
index 0000000..40000e9
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_os_save_as.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_os_save_as.svg b/plugin/openstudio/lib/resources/icons/OSC_os_save_as.svg
new file mode 100644
index 0000000..d1339da
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_os_save_as.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M21.43,29.42l1.42-1.29,53.36-5.94L79.6,25V79.87l-1,1.1L22.7,88.54l-1.27-1S21.86,29,21.43,29.42Z" fill="#2d7dd2"/><path d="M69.4,42.15,31.26,46.69a1.6,1.6,0,0,1-1.85-1.62V27.47l42.21-4.7V39.71A2.54,2.54,0,0,1,69.4,42.15Z" fill="#11619a"/><path d="M69,42,47.2,44.62a1.73,1.73,0,0,1-2-1.74V25.36L71,22.49V39.83A2.29,2.29,0,0,1,69,42Z" fill="#999"/><path d="M71.62,80.94,29.41,86.63V53.74a2.33,2.33,0,0,1,2-2.24l38.21-4.62a1.72,1.72,0,0,1,2,1.72Z" fill="#f2f2f2"/><path d="M67.15,40.9l-6.08.72a.87.87,0,0,1-1-.87V28.61a1.14,1.14,0,0,1,1-1.1l6.08-.69a.87.87,0,0,1,1,.87V39.8A1.15,1.15,0,0,1,67.15,40.9Z" fill="#0d4973"/><polygon points="68.15 25.14 63.67 25.64 63.67 23.76 68.15 23.26 68.15 25.14" fill="#0d4973"/><polygon points="52.54 26.89 48.06 27.39 48.06 25.5 52.54 25 52.54 26.89" fill="#0d4973"/><rect x="32.05" y="20.46" width="10.04" height="57.29" transform="translate(86.13 86.25) rotate(164.18)" fill="#f89820"/><polygon points="47.23 85.17 49.62 75.19 39.95 77.93 47.23 85.17" fill="#fbcb8f"/><polygon points="47.26 85.31 47.95 82.43 45.18 83.24 47.26 85.31" fill="#595959"/><path d="M32.59,24.64q1.84,5.92,3.59,11.86l3.44,11.9,3.32,11.93q1.62,6,3.16,12-1.85-5.91-3.59-11.85l-3.44-11.9L35.76,36.62Q34.13,30.65,32.59,24.64Z" fill="#fbcb8f"/><path d="M30.27,25.32q1.83,5.92,3.59,11.86l3.44,11.9L40.61,61q1.64,6,3.16,12-1.85-5.91-3.59-11.85l-3.44-11.9L33.43,37.3Q31.8,31.33,30.27,25.32Z" fill="#fbcb8f"/><path d="M27.93,26q1.84,5.93,3.59,11.86L35,49.74l3.32,11.94q1.63,6,3.16,12Q39.6,67.74,37.85,61.8L34.41,49.9,31.1,38Q29.47,32,27.93,26Z" fill="#fbcb8f"/><rect x="24.04" y="19.38" width="10.04" height="2.87" transform="translate(62.69 32.93) rotate(164.18)" fill="#999"/><path d="M23,14.15H33a0,0,0,0,1,0,0v3.93a1.81,1.81,0,0,1-1.81,1.81H24.77A1.81,1.81,0,0,1,23,18.09V14.15A0,0,0,0,1,23,14.15Z" transform="translate(59.55 25.78) rotate(164.18)" fill="#ffbfc8"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_boundary.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_boundary.pdf
new file mode 100644
index 0000000..4274207
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_boundary.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_boundary.svg b/plugin/openstudio/lib/resources/icons/OSC_render_boundary.svg
new file mode 100644
index 0000000..c6abd14
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_boundary.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="19.28 20.16 41.76 35.08 80.72 30 59.45 15.99 19.28 20.16" fill="#70a0c2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="19.28 20.16 19.28 69.1 41.76 84.01 41.76 35.08 19.28 20.16" fill="#4181ae" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="80.72 79.01 41.76 84.01 41.76 35 80.72 30 80.72 79.01" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="23.64 71.9 23.64 45.92 34.92 53.35 34.92 79.34" fill="#fff" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.81"/><polygon points="66.68 65.69 55.81 67.08 55.81 53.41 66.68 52.01 66.68 65.69" fill="#fff" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_construction.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_construction.pdf
new file mode 100644
index 0000000..6d43e81
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_construction.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_construction.svg b/plugin/openstudio/lib/resources/icons/OSC_render_construction.svg
new file mode 100644
index 0000000..f2314f5
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_construction.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M46.78,82.48a6.43,6.43,0,0,1-3.21-.86L19.43,67.74a6.48,6.48,0,0,1-3.23-5.59V34.47a6.48,6.48,0,0,1,1.34-3.93,6.4,6.4,0,0,1,1.92-1.67L43.59,15.14a6.4,6.4,0,0,1,5.62-.37,7.51,7.51,0,0,1,.76.36L74.1,28.87A6.19,6.19,0,0,1,76,30.54a6.54,6.54,0,0,1,1.34,3.93V62.15a6.39,6.39,0,0,1-.5,2.48,6.53,6.53,0,0,1-.37.75,6.21,6.21,0,0,1-1,1.32,6.78,6.78,0,0,1-1.34,1L50,81.62A6.43,6.43,0,0,1,46.78,82.48Z" fill="#ab6105"/><path d="M46.78,15.29a5.58,5.58,0,0,1,2,.4,5.46,5.46,0,0,1,.64.32L73.61,29.74a4.81,4.81,0,0,1,.6.4,5.09,5.09,0,0,1,1,1,4.6,4.6,0,0,1,.4.58,5.51,5.51,0,0,1,.74,2.74v3.07h0V62.15a5.45,5.45,0,0,1-.42,2.09c-.09.22-.2.43-.31.64A6.18,6.18,0,0,1,74.77,66a5.73,5.73,0,0,1-1.14.87L49.49,80.75a5.4,5.4,0,0,1-5.42,0L19.93,66.87a5.44,5.44,0,0,1-2.73-4.72V37.54h0V34.47a5.38,5.38,0,0,1,1.14-3.32A5.32,5.32,0,0,1,20,29.74L44.09,16a5.37,5.37,0,0,1,2.69-.72m0-2a7.42,7.42,0,0,0-3.68,1L19,28a7.41,7.41,0,0,0-3.77,6.47V62.15a7.44,7.44,0,0,0,3.74,6.45L43.07,82.49a7.45,7.45,0,0,0,7.42,0L74.63,68.6a7.43,7.43,0,0,0,1.55-1.19,7.62,7.62,0,0,0,1.18-1.53,7,7,0,0,0,.42-.87,7.38,7.38,0,0,0,.58-2.86V34.47a7.44,7.44,0,0,0-1-3.74,8.77,8.77,0,0,0-.54-.81,7.84,7.84,0,0,0-1.39-1.37A9,9,0,0,0,74.6,28L50.46,14.27a7.16,7.16,0,0,0-.88-.43,7.43,7.43,0,0,0-2.8-.55Z" fill="#fff"/><polyline points="17.2 30.98 46.78 45.61 76.14 31.95" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="46.78" y1="45.61" x2="46.78" y2="81.48" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="17.31 42.29 46.89 57.91 76.25 43.25" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="17.31 53.04 46.89 69.67 76.25 54.01" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="24.73" y1="57.21" x2="24.73" y2="69.67" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="56.9" y1="65.01" x2="57.27" y2="76.95" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="34.68" y1="51.69" x2="34.68" y2="62.14" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="67.85" y1="47.82" x2="67.85" y2="58.27" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="59.81" y1="40.38" x2="59.81" y2="50.84" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="26.63" y1="35.84" x2="26.63" y2="46.3" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="27.95" y1="24.54" x2="59.75" y2="40.27" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="26.63" y1="35.84" x2="57.08" y2="19.48" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="50" y1="34.51" x2="68.7" y2="25.47" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.pdf
new file mode 100644
index 0000000..5fb31a6
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.svg b/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.svg
new file mode 100644
index 0000000..3562e9a
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_spacetype.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path id="rect5005" d="M51.32,82.62l7.89-5.69c.78-.56,1.41-.46,1.41.23v8a3.35,3.35,0,0,1-1.41,2.26L51.32,93.1c-.78.56-1.41.46-1.41-.23v-8a3.37,3.37,0,0,1,1.41-2.27Z" fill="#f89820"/><path id="rect5765" d="M51.74,69.6l7.58-5.47c.87-.62,1.57-.45,1.57.39V72a3.8,3.8,0,0,1-1.57,2.64l-7.58,5.47c-.86.62-1.56.45-1.56-.39V72.24a3.77,3.77,0,0,1,1.56-2.64Z" fill="#fbc179"/><path id="rect5767" d="M51.09,57.17,60,50.77c.51-.37.92.35.92,1.61v5.94A4.2,4.2,0,0,1,60,61.25l-8.88,6.4c-.5.37-.91-.35-.91-1.6V60.1a4.17,4.17,0,0,1,.91-2.93Z" fill="#fbc179"/><path id="rect5769" d="M63.84,47.91l8-5.7c.78-.56,1.41-.14,1.41.95v6.56a4.05,4.05,0,0,1-1.41,3l-8,5.7c-.79.56-1.42.13-1.42-1V50.88a4,4,0,0,1,1.42-3Z" fill="#f89820"/><path id="rect5771" d="M63.53,60.94l8.57-6.13c.62-.44,1.12.25,1.12,1.54v5.8a4.35,4.35,0,0,1-1.12,3.14l-8.57,6.13c-.61.44-1.11-.25-1.11-1.55V64.08a4.38,4.38,0,0,1,1.11-3.14Z" fill="#fbc179"/><path id="rect5773" d="M63.72,73.48,71.38,68c.86-.62,1.57,0,1.57,1.41v5.41a5,5,0,0,1-1.57,3.66L63.72,84c-.87.62-1.57,0-1.57-1.41V77.13a4.94,4.94,0,0,1,1.57-3.65Z" fill="#fbc179"/><path id="rect5775" d="M75.8,64.37l8-5.69c.79-.56,1.42-.14,1.42,1v6.55a4,4,0,0,1-1.42,3l-8,5.69c-.78.56-1.41.14-1.41-.95V67.35a4.08,4.08,0,0,1,1.41-3Z" fill="#fbc179"/><path id="rect5777" d="M75.83,52.39l8.26-5.91c.7-.5,1.27,0,1.27,1.1v6.47A4,4,0,0,1,84.09,57l-8.26,5.91c-.7.5-1.27,0-1.27-1.1V55.3a4,4,0,0,1,1.27-2.91Z" fill="#fbc179"/><path id="rect5779" d="M75.83,39.45l8.26-5.91c.7-.5,1.27-.33,1.27.37v7.92A3.13,3.13,0,0,1,84.09,44l-8.26,5.91c-.7.5-1.27.33-1.27-.38V41.64a3.13,3.13,0,0,1,1.27-2.19Z" fill="#fbc179"/><path id="rect8055" d="M38.58,77.17l8,5.37a4.2,4.2,0,0,1,1.35,3.14v6c0,1.23-.61,1.82-1.35,1.31l-8-5.37a4.13,4.13,0,0,1-1.36-3.13v-6c0-1.23.61-1.82,1.36-1.32Z" fill="#f89820"/><path id="rect8815" d="M38.76,64.19l8,5.37a3.07,3.07,0,0,1,1.35,2.08v8.15c0,.65-.61.76-1.35.26l-8-5.38A3,3,0,0,1,37.4,72.6V64.45c0-.65.61-.76,1.36-.26Z" fill="#fbc179"/><path id="rect8817" d="M38.76,51.79l8,5.37a3.34,3.34,0,0,1,1.35,2.43V67c0,.84-.61,1.11-1.35.61l-8-5.37a3.32,3.32,0,0,1-1.36-2.43V52.4c0-.84.61-1.11,1.36-.6Z" fill="#fbc179"/><path id="rect8819" d="M26.52,69.06l8,5.37a3.74,3.74,0,0,1,1.36,2.83V83.9c0,1.06-.61,1.51-1.36,1l-8-5.37a3.74,3.74,0,0,1-1.35-2.83V70.07c0-1.06.6-1.51,1.35-1Z" fill="#fbc179"/><path id="rect8821" d="M26.52,56.37l8,5.37a3.92,3.92,0,0,1,1.36,3v6.36c0,1.14-.61,1.66-1.36,1.15l-8-5.37a3.91,3.91,0,0,1-1.35-3V57.52c0-1.14.6-1.65,1.35-1.15Z" fill="#f89820"/><path id="rect8823" d="M26.61,44.15l8,5.37A3.43,3.43,0,0,1,36,52.08v7.18c0,.91-.6,1.24-1.35.74l-8-5.37a3.46,3.46,0,0,1-1.36-2.57V44.89c0-.92.61-1.25,1.36-.74Z" fill="#fbc179"/><path id="rect8825" d="M14.19,60.83l8,5.37a3.24,3.24,0,0,1,1.36,2.32v7.67c0,.78-.61,1-1.36.5l-8-5.38A3.19,3.19,0,0,1,12.84,69V61.33c0-.78.61-1,1.35-.5Z" fill="#fbc179"/><path id="rect8827" d="M14.37,48.67l8,5.37a3.14,3.14,0,0,1,1.36,2.26v7.78c0,.74-.61.94-1.36.44l-8-5.37A3.17,3.17,0,0,1,13,56.89V49.1c0-.74.61-.94,1.35-.44Z" fill="#fbc179"/><path id="rect8829" d="M14.37,36.15l8,5.37a3,3,0,0,1,1.36,2.11v8.09c0,.66-.61.78-1.36.28l-8-5.37A3,3,0,0,1,13,44.53v-8.1c0-.66.61-.78,1.35-.28Z" fill="#fbc179"/><g id="g11205"><path id="rect10429" d="M25,26.6l8.9,5.66c.44.28.11,1-.75,1.6l-7,4.94c-.85.6-1.9.86-2.34.58L14.9,33.72c-.44-.28-.1-1,.76-1.6l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/><path id="rect11189" d="M37.14,34.62l8.91,5.66c.44.28.1,1-.76,1.6l-7,4.94c-.86.6-1.91.86-2.35.58L27,41.73c-.44-.28-.11-1,.75-1.59l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/><path id="rect11191" d="M49.58,42.52l8.9,5.67c.44.28.11,1-.75,1.59l-7,4.94c-.86.6-1.91.86-2.35.58l-8.91-5.66c-.44-.28-.1-1,.76-1.59l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/><path id="rect11193" d="M37.3,18.09l8.9,5.66c.44.28.1,1-.75,1.6l-7,4.94c-.85.6-1.9.86-2.34.58l-8.91-5.66c-.44-.28-.1-1,.76-1.6l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/><path id="rect11195" d="M49.56,25.89l8.91,5.66c.44.28.1,1-.75,1.59l-7,4.94a2.67,2.67,0,0,1-2.34.59L39.44,33c-.44-.28-.1-1,.75-1.59l7-4.94a2.67,2.67,0,0,1,2.34-.59Z" fill="#fbc179"/><path id="rect11197" d="M62.26,34l8.91,5.67c.44.28.1,1-.75,1.59l-7,4.94c-.85.6-1.9.86-2.34.58l-8.91-5.66c-.44-.28-.1-1,.75-1.6l7-4.93A2.67,2.67,0,0,1,62.26,34Z" fill="#fbc179"/><path id="rect11199" d="M49.21,9.72l8.9,5.66c.44.28.11,1-.75,1.6l-7,4.93c-.86.61-1.91.87-2.35.59l-8.91-5.67c-.44-.28-.1-1,.76-1.59l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/><path id="rect11201" d="M61.83,17.5l8.9,5.67c.44.28.11,1-.75,1.59L63,29.7c-.85.6-1.9.86-2.34.58L51.7,24.62c-.44-.28-.1-1,.76-1.6l7-4.93c.86-.61,1.91-.87,2.35-.59Z" fill="#fbc179"/><path id="rect11203" d="M74.19,25.58l8.9,5.67c.44.28.1,1-.75,1.59l-7,4.94c-.85.6-1.9.86-2.34.58L64.06,32.7c-.44-.28-.1-1,.75-1.59l7-4.94c.86-.6,1.91-.86,2.35-.58Z" fill="#fbc179"/></g></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_story.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_story.pdf
new file mode 100644
index 0000000..879c299
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_story.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_story.svg b/plugin/openstudio/lib/resources/icons/OSC_render_story.svg
new file mode 100644
index 0000000..ed85499
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_story.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="38.45 86.74 12.05 72.08 12.05 17.68 38.45 32.34 38.45 86.74" fill="#fbc179" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="38.45 86.74 88.26 82.08 88.26 27.61 38.45 32.34 38.45 86.74" fill="#fbc179" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="12.05 17.68 60.03 13.84 88.26 27.61 38.45 32.34 12.05 17.68" fill="#fbc179" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="87.72 64.87 38 69.86 13.02 56.91" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="12.52 38.15 37.5 51.1 87.22 46.11" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><line x1="38.13" y1="86.76" x2="11.74" y2="72.1" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="11.74 72.1 38.13 86.76 38.13 69.96 11.74 55.3 11.74 72.1" fill="#f89820" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="38.45 86.74 88.26 82.08 88.26 65 38.45 69.73 38.45 86.74" fill="#f89820" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.pdf
new file mode 100644
index 0000000..783c9d6
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.svg b/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.svg
new file mode 100644
index 0000000..97ef2d2
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_surface_class.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="21.03 20.16 43.52 35.08 82.48 30 61.21 15.99 21.03 20.16" fill="#944549" stroke="#97897b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="21.03 20.16 21.03 69.1 43.52 84.01 43.52 35.08 21.03 20.16" fill="#fbc179" stroke="#97897b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polygon points="82.48 79.01 43.52 84.01 43.52 35 82.48 30 82.48 79.01" fill="#fbc179" stroke="#97897b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/><polyline points="25.4 71.9 25.4 45.92 36.68 53.35 36.68 79.34" fill="#71675c" stroke="#97897b" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.81"/><polygon points="68.43 65.69 57.56 67.08 57.56 53.41 68.43 52.01 68.43 65.69" fill="#81b1e4" stroke="#97897b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.pdf b/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.pdf
new file mode 100644
index 0000000..c29271a
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.svg b/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.svg
new file mode 100644
index 0000000..cfe27ef
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_render_therm_zone.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path id="rect5765" d="M52.89,72.16l10.3-7.42c1.17-.85,2.12-.61,2.12.52V75.38A5.22,5.22,0,0,1,63.19,79l-10.3,7.42c-1.17.85-2.12.62-2.12-.52V75.75a5.14,5.14,0,0,1,2.12-3.59Z" fill="#f89820"/><path id="rect5767" d="M52,55.29l12.06-8.7c.68-.49,1.24.49,1.24,2.19v8.07c0,1.7-.56,3.48-1.24,4L52,69.52c-.68.5-1.24-.48-1.24-2.18V59.27c0-1.71.55-3.49,1.24-4Z" fill="#fbc179"/><path id="rect5769" d="M69.32,42.71,80.12,35c1.07-.77,1.93-.19,1.93,1.28v8.91a5.49,5.49,0,0,1-1.93,4l-10.8,7.73c-1.07.76-1.93.18-1.93-1.29v-8.9a5.47,5.47,0,0,1,1.93-4Z" fill="#fbc179"/><path id="rect5771" d="M68.9,60.4l11.64-8.32c.83-.6,1.51.34,1.51,2.1v7.87c0,1.76-.68,3.66-1.51,4.26L68.9,74.64c-.83.59-1.51-.35-1.51-2.1V64.67c0-1.76.68-3.67,1.51-4.27Z" fill="#fbc179"/><path id="rect8815" d="M35.27,64.82l10.85,7.3A4.1,4.1,0,0,1,48,74.93V86c0,.88-.83,1-1.85.35l-10.85-7.3a4.08,4.08,0,0,1-1.84-2.81V65.17c0-.88.82-1,1.84-.35Z" fill="#f89820"/><path id="rect8817" d="M35.27,48l10.85,7.29A4.49,4.49,0,0,1,48,58.57V68.69c0,1.14-.83,1.5-1.85.82L35.27,62.22a4.47,4.47,0,0,1-1.84-3.29V48.8c0-1.13.82-1.49,1.84-.81Z" fill="#fbc179"/><path id="rect8821" d="M18.65,54.2l10.86,7.29a5.34,5.34,0,0,1,1.84,4v8.64c0,1.54-.82,2.24-1.84,1.56l-10.86-7.3a5.31,5.31,0,0,1-1.84-4V55.76c0-1.55.83-2.24,1.84-1.56Z" fill="#fbc179"/><path id="rect8823" d="M18.77,37.6l10.86,7.29a4.69,4.69,0,0,1,1.84,3.48v9.75c0,1.24-.82,1.69-1.84,1l-10.86-7.3a4.66,4.66,0,0,1-1.84-3.48V38.61c0-1.24.83-1.69,1.84-1Z" fill="#fbc179"/><g id="g11205"><path id="rect11189" d="M33.07,24.67l12.09,7.69c.6.38.14,1.35-1,2.16L34.6,41.23C33.44,42,32,42.4,31.41,42L19.32,34.33c-.6-.38-.14-1.35,1-2.17l9.54-6.7c1.16-.82,2.59-1.17,3.18-.8Z" fill="#fbc179"/><path id="rect11191" d="M50,35.4l12.09,7.69c.6.38.14,1.35-1,2.17L51.49,52c-1.16.82-2.59,1.17-3.19.79L36.21,45.06c-.6-.38-.14-1.35,1-2.16l9.54-6.71c1.16-.81,2.59-1.16,3.19-.78Z" fill="#fbc179"/><path id="rect11195" d="M49.94,12.81,62,20.5c.6.38.14,1.35-1,2.17l-9.54,6.7c-1.16.82-2.59,1.17-3.19.79L36.19,22.47c-.6-.38-.14-1.35,1-2.17l9.54-6.7c1.16-.82,2.59-1.17,3.18-.79Z" fill="#fbc179"/><path id="rect11197" d="M67.18,23.78l12.1,7.69c.59.38.14,1.35-1,2.16l-9.53,6.71c-1.17.81-2.59,1.17-3.19.79L53.44,33.44c-.6-.38-.14-1.35,1-2.17L64,24.57c1.16-.82,2.58-1.17,3.18-.79Z" fill="#fbc179"/></g></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_surface search.pdf b/plugin/openstudio/lib/resources/icons/OSC_surface search.pdf
new file mode 100644
index 0000000..80cac00
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_surface search.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_surface search.svg b/plugin/openstudio/lib/resources/icons/OSC_surface search.svg
new file mode 100644
index 0000000..7001c77
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_surface search.svg	
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polyline points="20.68 30.37 43.27 54.79 43.27 84.49 51.13 80.29 51.13 54.79 73.72 30.37" fill="#fbc179" stroke="#ab6105" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.18"/><path d="M47.21,36.6c-13.39,0-26.95-2.64-26.95-7.67s13.56-7.67,27-7.67,26.95,2.63,26.95,7.67S60.6,36.6,47.21,36.6Z" fill="#f89820"/><path d="M47.21,22.29c14.31,0,25.92,3,25.92,6.64s-11.61,6.63-25.92,6.63-25.91-3-25.91-6.63,11.6-6.64,25.91-6.64m0-2.06c-10.39,0-28,1.83-28,8.7s17.59,8.7,28,8.7,28-1.83,28-8.7-17.59-8.7-28-8.7Z" fill="#ab6105"/><path d="M40.24,22.54c-10.92.78-18.94,3.34-18.94,6.39,0,3.63,11.38,6.57,25.51,6.63Z" fill="#ab6105" opacity="0.5"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.pdf b/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.pdf
new file mode 100644
index 0000000..707ce80
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.svg b/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.svg
new file mode 100644
index 0000000..f7610f1
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_surface_matching_selected.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="64.87 21.39 64.87 78.17 40.23 87.01 40.23 15.5 64.87 21.39" fill="#2d7dd2" stroke="#11619a" stroke-linejoin="round" stroke-width="1.93"/><rect x="19.99" y="36.45" width="19.94" height="6.44" fill="#11619a"/><rect x="52.98" y="56.63" width="30.53" height="6.44" fill="#11619a"/><rect x="52.98" y="36.45" width="28.28" height="6.44" fill="#11619a"/><rect x="21.82" y="56.63" width="18.11" height="6.44" fill="#11619a"/><polygon points="14.63 59.85 23.44 66.47 23.44 53.22 14.63 59.85" fill="#11619a"/><polygon points="87.91 39.67 79.11 33.04 79.11 46.3 87.91 39.67" fill="#11619a"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.pdf b/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.pdf
new file mode 100644
index 0000000..1a3c792
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.svg b/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.svg
new file mode 100644
index 0000000..3488af8
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_tb_render_transparent.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><polygon points="21.44 59.49 40.42 78.47 40.42 59.49 21.44 59.49" fill="none"/><polygon points="78.38 40.51 59.4 21.53 59.4 40.51 78.38 40.51" fill="none"/><polygon points="59.4 40.51 59.4 21.53 21.44 21.53 40.42 40.51 59.4 40.51" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="40.42 40.51 21.44 21.53 21.44 59.49 40.42 59.49 40.42 40.51" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="40.42 59.49 40.42 78.47 78.38 78.47 59.4 59.49 40.42 59.49" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="59.4 40.51 59.4 59.49 78.38 78.47 78.38 40.51 59.4 40.51" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><rect x="40.42" y="40.51" width="18.98" height="18.98" fill="#31c49d" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="59.4 21.53 78.38 40.51 59.4 40.51 59.4 21.53" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/><polygon points="40.42 78.47 21.44 59.49 40.42 59.49 40.42 78.47" fill="#2d7dd2" stroke="#11619a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.08"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_warning.pdf b/plugin/openstudio/lib/resources/icons/OSC_warning.pdf
new file mode 100644
index 0000000..fb883d3
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_warning.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_warning.svg b/plugin/openstudio/lib/resources/icons/OSC_warning.svg
new file mode 100644
index 0000000..abc1d06
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_warning.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M47.77,12.29,8.79,79.8A2.49,2.49,0,0,0,11,83.54H88.91a2.49,2.49,0,0,0,2.16-3.74l-39-67.51A2.5,2.5,0,0,0,47.77,12.29Z" fill="#f89820"/><path d="M42.33,29,57.54,29,53.72,60.76h-7.5Zm14.05,36V77.62H43.49V64.93Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.pdf b/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.pdf
new file mode 100644
index 0000000..94a3fa0
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.pdf differ
diff --git a/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.svg b/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.svg
new file mode 100644
index 0000000..2db1b7e
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OSC_windows_transparent.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M49.11,66.82V80.37c0,.37,0,.74,0,1.11a1,1,0,0,1-1.36,1L40,81.15,25.18,78.48c-1.68-.3-2.07-.77-2.07-2.46q0-13.86,0-27.71c0-.12,0-.24,0-.37,0-1.34.5-1.72,1.8-1.49l9.68,1.75Q41,49.36,47.48,50.53c1.23.23,1.62.73,1.63,2C49.12,57.28,49.11,62.05,49.11,66.82ZM25.36,62.53c0,3.83,0,7.65,0,11.48,0,2.23-.28,1.85,1.85,2.24,6.28,1.14,12.56,2.26,18.83,3.41.69.12.89-.1.89-.75q0-12.55,0-25.1a.82.82,0,0,0-.78-1c-1-.17-2-.36-3.06-.55l-16.65-3c-1.05-.19-1.08-.15-1.08.93Z" fill="#11619a"/><path d="M77.35,37.82V52c0,1.38-.4,1.73-1.75,1.49L57.86,50.28l-4.73-.85a1.78,1.78,0,0,1-1.75-2V19c0-1.38.48-1.75,1.84-1.5l22.47,4.05c1.22.22,1.66.74,1.66,2Zm-2.18-.45h0V25.15c0-1.13,0-1.14-1.09-1.34l-7-1.26L54.62,20.29c-.87-.16-1-.05-1,.85,0,4.05-.06,8.09-.07,12.14s0,8.24,0,12.37c0,1.23.06,1.28,1.23,1.49L74.05,50.6c1,.18,1.11.1,1.12-.94Z" fill="#11619a"/><path d="M22.79,28.07V13.85c0-1.44.43-1.79,1.86-1.54l22.33,4c1.38.25,1.79.75,1.79,2.16V46.64c0,1.58-.4,1.91-2,1.63q-11.08-2-22.18-4c-1.47-.26-1.82-.71-1.82-2.21Zm2.19.38h0c0,4.1,0,8.19,0,12.29A1,1,0,0,0,26,42q9.75,1.73,19.49,3.49c1,.17,1.07.12,1.07-.88,0-4,.07-8,.08-12.06q0-6.3,0-12.59c0-1-.13-1.11-1.05-1.27L26.12,15.18c-1.06-.19-1.14-.13-1.14,1Z" fill="#11619a"/><path d="M77.34,71.86V86c0,1.44-.42,1.79-1.85,1.54l-22.33-4c-1.4-.25-1.79-.72-1.79-2.15q0-14.2,0-28.43c0-1.25.48-1.62,1.7-1.4l22.47,4c1.42.26,1.8.73,1.8,2.14V71.86ZM53.55,67.55q0,6.2,0,12.37c0,1,.11,1.12,1,1.28l19.34,3.47c1.16.2,1.24.15,1.24-1V59.29c0-1.16-.06-1.21-1.22-1.42L54.76,54.42c-1.1-.2-1.2-.13-1.2,1Q53.54,61.49,53.55,67.55Z" fill="#11619a"/></svg>
\ No newline at end of file
diff --git a/plugin/openstudio/lib/resources/icons/OSExport-16.png b/plugin/openstudio/lib/resources/icons/OSExport-16.png
deleted file mode 100644
index 113821d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSExport-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSExport-24.png b/plugin/openstudio/lib/resources/icons/OSExport-24.png
deleted file mode 100644
index d73a4f3..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSExport-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSImport-16.png b/plugin/openstudio/lib/resources/icons/OSImport-16.png
deleted file mode 100644
index 5763dbc..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSImport-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSImport-24.png b/plugin/openstudio/lib/resources/icons/OSImport-24.png
deleted file mode 100644
index 3e5ba71..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSImport-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSNew-16.png b/plugin/openstudio/lib/resources/icons/OSNew-16.png
deleted file mode 100644
index 6190dfb..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSNew-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSNew-24.png b/plugin/openstudio/lib/resources/icons/OSNew-24.png
deleted file mode 100644
index d1bb0c8..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSNew-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSOpen-16.png b/plugin/openstudio/lib/resources/icons/OSOpen-16.png
deleted file mode 100644
index 56442a6..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSOpen-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSOpen-24.png b/plugin/openstudio/lib/resources/icons/OSOpen-24.png
deleted file mode 100644
index 914feed..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSOpen-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSSave-16.png b/plugin/openstudio/lib/resources/icons/OSSave-16.png
deleted file mode 100644
index c7e9385..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSSave-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSSave-24.png b/plugin/openstudio/lib/resources/icons/OSSave-24.png
deleted file mode 100644
index 61ebc9d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSSave-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSSaveAs-16.png b/plugin/openstudio/lib/resources/icons/OSSaveAs-16.png
deleted file mode 100644
index 492b095..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSSaveAs-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OSSaveAs-24.png b/plugin/openstudio/lib/resources/icons/OSSaveAs-24.png
deleted file mode 100644
index 9345c96..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OSSaveAs-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Outliner-16.png b/plugin/openstudio/lib/resources/icons/Outliner-16.png
deleted file mode 100644
index e46b02a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Outliner-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Outliner-24.png b/plugin/openstudio/lib/resources/icons/Outliner-24.png
deleted file mode 100644
index 8354776..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Outliner-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Play16.png b/plugin/openstudio/lib/resources/icons/Play16.png
deleted file mode 100644
index d85064b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Play16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Play24.png b/plugin/openstudio/lib/resources/icons/Play24.png
deleted file mode 100644
index 9f17aad..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Play24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByBoundary-16x16.png b/plugin/openstudio/lib/resources/icons/RenderByBoundary-16x16.png
deleted file mode 100644
index aae16c2..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByBoundary-16x16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByBoundary-24x24.png b/plugin/openstudio/lib/resources/icons/RenderByBoundary-24x24.png
deleted file mode 100644
index 1b2b41b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByBoundary-24x24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByData-16x16.png b/plugin/openstudio/lib/resources/icons/RenderByData-16x16.png
deleted file mode 100644
index 4637fe8..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByData-16x16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByData-24x24.png b/plugin/openstudio/lib/resources/icons/RenderByData-24x24.png
deleted file mode 100644
index dcc0c4f..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByData-24x24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByType-16x16.png b/plugin/openstudio/lib/resources/icons/RenderByType-16x16.png
deleted file mode 100644
index 5cc2185..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByType-16x16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RenderByType-24x24.png b/plugin/openstudio/lib/resources/icons/RenderByType-24x24.png
deleted file mode 100644
index 82720bc..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RenderByType-24x24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Rewind16.png b/plugin/openstudio/lib/resources/icons/Rewind16.png
deleted file mode 100644
index 9949454..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Rewind16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Rewind24.png b/plugin/openstudio/lib/resources/icons/Rewind24.png
deleted file mode 100644
index 8a6fc21..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Rewind24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RewindFull16.png b/plugin/openstudio/lib/resources/icons/RewindFull16.png
deleted file mode 100644
index b0360ac..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RewindFull16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/RewindFull24.png b/plugin/openstudio/lib/resources/icons/RewindFull24.png
deleted file mode 100644
index affe512..0000000
Binary files a/plugin/openstudio/lib/resources/icons/RewindFull24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SUShadows-16x16.png b/plugin/openstudio/lib/resources/icons/SUShadows-16x16.png
deleted file mode 100644
index 78e8981..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SUShadows-16x16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SUShadows-24x24.png b/plugin/openstudio/lib/resources/icons/SUShadows-24x24.png
deleted file mode 100644
index 87f0367..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SUShadows-24x24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SU_ViewHidden-16.png b/plugin/openstudio/lib/resources/icons/SU_ViewHidden-16.png
deleted file mode 100644
index 6e19300..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SU_ViewHidden-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SU_ViewHidden-24.png b/plugin/openstudio/lib/resources/icons/SU_ViewHidden-24.png
deleted file mode 100644
index fed255b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SU_ViewHidden-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SU_Xray-16.png b/plugin/openstudio/lib/resources/icons/SU_Xray-16.png
deleted file mode 100644
index 6e19300..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SU_Xray-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SU_Xray-24.png b/plugin/openstudio/lib/resources/icons/SU_Xray-24.png
deleted file mode 100644
index fed255b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SU_Xray-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-16.png b/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-16.png
deleted file mode 100644
index 7466a43..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-24.png b/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-24.png
deleted file mode 100644
index 62e2ad7..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SetDefaultConstPrefs-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SpaceLoads-16.png b/plugin/openstudio/lib/resources/icons/SpaceLoads-16.png
deleted file mode 100644
index 5203fde..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SpaceLoads-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SpaceLoads-24.png b/plugin/openstudio/lib/resources/icons/SpaceLoads-24.png
deleted file mode 100644
index 10a0453..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SpaceLoads-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-16.png b/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-16.png
deleted file mode 100644
index 51197c0..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-24.png b/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-24.png
deleted file mode 100644
index b390b48..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SurfaceMatchingSelected-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SurfaceSearch-16.png b/plugin/openstudio/lib/resources/icons/SurfaceSearch-16.png
deleted file mode 100644
index ef26673..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SurfaceSearch-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/SurfaceSearch-24.png b/plugin/openstudio/lib/resources/icons/SurfaceSearch-24.png
deleted file mode 100644
index 4226e10..0000000
Binary files a/plugin/openstudio/lib/resources/icons/SurfaceSearch-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Warning-16.png b/plugin/openstudio/lib/resources/icons/Warning-16.png
deleted file mode 100644
index 86fb35a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Warning-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/Warning-24.png b/plugin/openstudio/lib/resources/icons/Warning-24.png
deleted file mode 100644
index 4cd3f75..0000000
Binary files a/plugin/openstudio/lib/resources/icons/Warning-24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/direct_select.png b/plugin/openstudio/lib/resources/icons/direct_select.png
deleted file mode 100644
index af8e955..0000000
Binary files a/plugin/openstudio/lib/resources/icons/direct_select.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/direct_select_16.png b/plugin/openstudio/lib/resources/icons/direct_select_16.png
deleted file mode 100644
index 6454fa9..0000000
Binary files a/plugin/openstudio/lib/resources/icons/direct_select_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/edit_spaces.png b/plugin/openstudio/lib/resources/icons/edit_spaces.png
deleted file mode 100644
index eaef0c0..0000000
Binary files a/plugin/openstudio/lib/resources/icons/edit_spaces.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/edit_spaces_16.png b/plugin/openstudio/lib/resources/icons/edit_spaces_16.png
deleted file mode 100644
index c346963..0000000
Binary files a/plugin/openstudio/lib/resources/icons/edit_spaces_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/extrude.png b/plugin/openstudio/lib/resources/icons/extrude.png
deleted file mode 100644
index 193e1d4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/extrude.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/extrude_16.png b/plugin/openstudio/lib/resources/icons/extrude_16.png
deleted file mode 100644
index f74039a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/extrude_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/new_space.png b/plugin/openstudio/lib/resources/icons/new_space.png
deleted file mode 100644
index 719448d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/new_space.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/new_space_16.png b/plugin/openstudio/lib/resources/icons/new_space_16.png
deleted file mode 100644
index 7bb24d1..0000000
Binary files a/plugin/openstudio/lib/resources/icons/new_space_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/os_16.png b/plugin/openstudio/lib/resources/icons/os_16.png
deleted file mode 100644
index fee67bb..0000000
Binary files a/plugin/openstudio/lib/resources/icons/os_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/os_24.png b/plugin/openstudio/lib/resources/icons/os_24.png
deleted file mode 100644
index 4a4a97e..0000000
Binary files a/plugin/openstudio/lib/resources/icons/os_24.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/project_geo.png b/plugin/openstudio/lib/resources/icons/project_geo.png
deleted file mode 100644
index c5864e5..0000000
Binary files a/plugin/openstudio/lib/resources/icons/project_geo.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/project_geo_16.png b/plugin/openstudio/lib/resources/icons/project_geo_16.png
deleted file mode 100644
index 9879b6f..0000000
Binary files a/plugin/openstudio/lib/resources/icons/project_geo_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_boundary.png b/plugin/openstudio/lib/resources/icons/render_boundary.png
deleted file mode 100644
index 4df29c0..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_boundary.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_boundary_16.png b/plugin/openstudio/lib/resources/icons/render_boundary_16.png
deleted file mode 100644
index 46351a8..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_boundary_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_color_scale.png b/plugin/openstudio/lib/resources/icons/render_color_scale.png
deleted file mode 100644
index 64a2892..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_color_scale.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_color_scale_16.png b/plugin/openstudio/lib/resources/icons/render_color_scale_16.png
deleted file mode 100644
index b440bd4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_color_scale_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_construction.png b/plugin/openstudio/lib/resources/icons/render_construction.png
deleted file mode 100644
index db39e9b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_construction.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_construction_16.png b/plugin/openstudio/lib/resources/icons/render_construction_16.png
deleted file mode 100644
index 87dfd22..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_construction_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_data.png b/plugin/openstudio/lib/resources/icons/render_data.png
deleted file mode 100644
index 2c523e4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_data.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_data_16.png b/plugin/openstudio/lib/resources/icons/render_data_16.png
deleted file mode 100644
index 4ea613c..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_data_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_eplus_zone.png b/plugin/openstudio/lib/resources/icons/render_eplus_zone.png
deleted file mode 100644
index d1f9a76..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_eplus_zone.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_eplus_zone_16.png b/plugin/openstudio/lib/resources/icons/render_eplus_zone_16.png
deleted file mode 100644
index 5aafdb7..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_eplus_zone_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_face_normal.png b/plugin/openstudio/lib/resources/icons/render_face_normal.png
deleted file mode 100644
index 6c8cf3a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_face_normal.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_face_normal_16.png b/plugin/openstudio/lib/resources/icons/render_face_normal_16.png
deleted file mode 100644
index e5fec44..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_face_normal_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_options.png b/plugin/openstudio/lib/resources/icons/render_options.png
deleted file mode 100644
index 84cf31c..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_options.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_options_16.png b/plugin/openstudio/lib/resources/icons/render_options_16.png
deleted file mode 100644
index ba2250b..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_options_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_space_type.png b/plugin/openstudio/lib/resources/icons/render_space_type.png
deleted file mode 100644
index 2e77309..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_space_type.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_space_type_16.png b/plugin/openstudio/lib/resources/icons/render_space_type_16.png
deleted file mode 100644
index 81f809a..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_space_type_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_story.png b/plugin/openstudio/lib/resources/icons/render_story.png
deleted file mode 100644
index b7cf4e9..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_story.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_story_16.png b/plugin/openstudio/lib/resources/icons/render_story_16.png
deleted file mode 100644
index 42285db..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_story_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_surface_class.png b/plugin/openstudio/lib/resources/icons/render_surface_class.png
deleted file mode 100644
index 52e5b62..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_surface_class.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_surface_class_16.png b/plugin/openstudio/lib/resources/icons/render_surface_class_16.png
deleted file mode 100644
index 430902e..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_surface_class_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_therm_zone.png b/plugin/openstudio/lib/resources/icons/render_therm_zone.png
deleted file mode 100644
index 02f7b93..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_therm_zone.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/render_therm_zone_16.png b/plugin/openstudio/lib/resources/icons/render_therm_zone_16.png
deleted file mode 100644
index ccac926..0000000
Binary files a/plugin/openstudio/lib/resources/icons/render_therm_zone_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/space_type.png b/plugin/openstudio/lib/resources/icons/space_type.png
deleted file mode 100644
index 785da4d..0000000
Binary files a/plugin/openstudio/lib/resources/icons/space_type.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/space_type_16.png b/plugin/openstudio/lib/resources/icons/space_type_16.png
deleted file mode 100644
index 172633f..0000000
Binary files a/plugin/openstudio/lib/resources/icons/space_type_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/story.png b/plugin/openstudio/lib/resources/icons/story.png
deleted file mode 100644
index 667dfb0..0000000
Binary files a/plugin/openstudio/lib/resources/icons/story.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/story_16.png b/plugin/openstudio/lib/resources/icons/story_16.png
deleted file mode 100644
index fa36003..0000000
Binary files a/plugin/openstudio/lib/resources/icons/story_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/tbRenderTransparentLarge.png b/plugin/openstudio/lib/resources/icons/tbRenderTransparentLarge.png
deleted file mode 100644
index 505affc..0000000
Binary files a/plugin/openstudio/lib/resources/icons/tbRenderTransparentLarge.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/tbRenderTransparentSmall.png b/plugin/openstudio/lib/resources/icons/tbRenderTransparentSmall.png
deleted file mode 100644
index 379745e..0000000
Binary files a/plugin/openstudio/lib/resources/icons/tbRenderTransparentSmall.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/thermal_zone.png b/plugin/openstudio/lib/resources/icons/thermal_zone.png
deleted file mode 100644
index d7488a1..0000000
Binary files a/plugin/openstudio/lib/resources/icons/thermal_zone.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/thermal_zone_16.png b/plugin/openstudio/lib/resources/icons/thermal_zone_16.png
deleted file mode 100644
index 68dacf1..0000000
Binary files a/plugin/openstudio/lib/resources/icons/thermal_zone_16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/windows_transparent-16.png b/plugin/openstudio/lib/resources/icons/windows_transparent-16.png
deleted file mode 100644
index a709d90..0000000
Binary files a/plugin/openstudio/lib/resources/icons/windows_transparent-16.png and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/windows_transparent.png b/plugin/openstudio/lib/resources/icons/windows_transparent.png
deleted file mode 100644
index 22c73b4..0000000
Binary files a/plugin/openstudio/lib/resources/icons/windows_transparent.png and /dev/null differ
diff --git a/plugin/openstudio/user_scripts/Building Component Library/Get_BCL_Weather_File.rb b/plugin/openstudio/user_scripts/Building Component Library/Get_BCL_Weather_File.rb
index b198392..02818ac 100644
--- a/plugin/openstudio/user_scripts/Building Component Library/Get_BCL_Weather_File.rb	
+++ b/plugin/openstudio/user_scripts/Building Component Library/Get_BCL_Weather_File.rb	
@@ -42,14 +42,6 @@ def name
   def arguments(model)
     result = OpenStudio::Ruleset::OSArgumentVector.new
 
-    # Check Auth Key in LocalBCL instance
-    library = OpenStudio::LocalBCL::instance()
-    if (library::prodAuthKey().empty?)
-      authKey = OpenStudio::Ruleset::OSArgument::makeStringArgument("authKey")
-      authKey.setDisplayName("BCL AuthKey")
-      result << authKey
-    end
-
     city = OpenStudio::Ruleset::OSArgument::makeStringArgument("city",false)
     city.setDisplayName("City Name")
     city.setDefaultValue("Denver")
@@ -67,22 +59,6 @@ def run(model, runner, user_arguments)
       return false
     end
 
-    # Check Auth Key in LocalBCL instance
-    library = OpenStudio::LocalBCL::instance()
-    if (library::prodAuthKey().empty?)
-      authKey = runner.getStringArgumentValue("authKey",user_arguments)
-
-      good_key = false
-      if authKey
-        good_key = library::setProdAuthKey(authKey)
-      end
-
-      if not good_key
-        runner.registerError("BCL authentication required for first time use, follow instructions at http://nrel.github.io/OpenStudio-user-documentation/getting_started/getting_started/ to get your auth key.")
-        return false
-      end
-    end
-
     city = runner.getStringArgumentValue("city",user_arguments)
 
     if city.empty?
diff --git a/plugin/openstudio/user_scripts/Building Component Library/Setup_BCL_Key.rb b/plugin/openstudio/user_scripts/Building Component Library/Setup_BCL_Key.rb
deleted file mode 100644
index 91abb02..0000000
--- a/plugin/openstudio/user_scripts/Building Component Library/Setup_BCL_Key.rb	
+++ /dev/null
@@ -1,77 +0,0 @@
-########################################################################################################################
-#  OpenStudio(R), Copyright (c) 2008-2021, OpenStudio Coalition and other contributors. All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
-#  following conditions are met:
-#
-#  (1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-#  disclaimer.
-#
-#  (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-#  disclaimer in the documentation and/or other materials provided with the distribution.
-#
-#  (3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
-#  derived from this software without specific prior written permission from the respective party.
-#
-#  (4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works
-#  may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior
-#  written permission from Alliance for Sustainable Energy, LLC.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-#  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-#  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
-#  STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-#  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-#  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-########################################################################################################################
-
-module OpenStudio
-
-# Each user script is implemented within a class that derives from OpenStudio::Ruleset::UserScript
-class SetupBCLKey < OpenStudio::Ruleset::ModelUserScript
-
-  # override name to return the name of your script
-  def name
-    return "Setup BCL Key"
-  end
-
-  # returns a vector of arguments, the runner will present these arguments to the user
-  # then pass in the results on run
-  def arguments(model)
-    result = OpenStudio::Ruleset::OSArgumentVector.new
-
-    currentAuthKey = OpenStudio::LocalBCL::instance().prodAuthKey
-
-    authKey = OpenStudio::Ruleset::OSArgument::makeStringArgument("authKey")
-    authKey.setDisplayName("BCL AuthKey")
-    authKey.setDefaultValue(currentAuthKey)
-    result << authKey
-
-    return result
-  end
-
-  # override run to implement the functionality of your script
-  def run(model, runner, user_arguments)
-    super(model, runner, user_arguments)
-
-    if not runner.validateUserArguments(arguments(model),user_arguments)
-      return false
-    end
-
-    authKey = runner.getStringArgumentValue("authKey",user_arguments)
-
-    good_key = OpenStudio::LocalBCL::instance().setProdAuthKey(authKey)
-    if not good_key
-      runner.registerError("BCL authentication failed, follow instructions at http://nrel.github.io/OpenStudio-user-documentation/getting_started/getting_started/#installation-instructions to get your auth key.")
-      return false
-    end
-  end
-
-end
-
-# this call registers your script with the OpenStudio SketchUp plug-in
-SetupBCLKey.new.registerWithApplication
-
-end
\ No newline at end of file