diff --git a/plugin/openstudio/lib/resources/icons/InfoToolCursor-16x17.tiff b/plugin/openstudio/lib/resources/icons/InfoToolCursor-16x17.tiff
deleted file mode 100644
index 5cd9e64..0000000
Binary files a/plugin/openstudio/lib/resources/icons/InfoToolCursor-16x17.tiff and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/InfoToolCursor.png b/plugin/openstudio/lib/resources/icons/InfoToolCursor.png
new file mode 100644
index 0000000..12e8274
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/InfoToolCursor.png differ
diff --git a/plugin/openstudio/lib/resources/icons/InfoToolCursor.svg b/plugin/openstudio/lib/resources/icons/InfoToolCursor.svg
new file mode 100644
index 0000000..4ad7847
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/InfoToolCursor.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666662 8.4666662"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><g
+       id="g1"
+       transform="matrix(0.26458333,0,0,0.26458333,-98.522403,-58.72818)"><g
+         id="g1-5"
+         transform="matrix(0.42029556,0,0,0.42447474,246.29614,142.99615)"><path
+           d="m 322.53985,205.58831 24.45,-17 a 1.63,1.63 0 0 1 1.81,0 l 25.13,16 a 1.63,1.63 0 0 1 0.75,1.37 v 25.16 a 1.65,1.65 0 0 1 -0.67,1.33 l -25.19,18.23 a 1.62,1.62 0 0 1 -1.89,0 l -24.39,-17.09 a 1.63,1.63 0 0 1 -0.69,-1.33 v -25.33 a 1.61,1.61 0 0 1 0.69,-1.34 z"
+           fill="#f89820"
+           id="path1" /><path
+           id="rect5005"
+           d="m 349.82985,241.72831 5.61,-4 c 0.55,-0.4 1,-0.33 1,0.16 v 5.68 a 2.41,2.41 0 0 1 -1,1.61 l -5.61,4 c -0.56,0.4 -1,0.32 -1,-0.17 v -5.67 a 2.39,2.39 0 0 1 1,-1.61 z"
+           fill="#fbc179" /><path
+           id="rect5765"
+           d="m 350.12985,232.46831 5.41,-3.88 c 0.61,-0.44 1.11,-0.32 1.11,0.27 v 5.31 a 2.73,2.73 0 0 1 -1.11,1.86 l -5.39,3.89 c -0.62,0.45 -1.12,0.32 -1.12,-0.27 v -5.3 a 2.72,2.72 0 0 1 1.11,-1.88 z"
+           fill="#fbc179" /><path
+           id="rect5767"
+           d="m 349.65985,223.58831 6.32,-4.55 c 0.36,-0.26 0.65,0.25 0.65,1.14 v 4.23 a 3,3 0 0 1 -0.65,2.08 l -6.32,4.6 c -0.35,0.26 -0.65,-0.26 -0.65,-1.15 v -4.23 a 3,3 0 0 1 0.65,-2.12 z"
+           fill="#fbc179" /><path
+           id="rect5769"
+           d="m 358.72985,217.03831 5.66,-4.05 c 0.56,-0.4 1,-0.1 1,0.67 v 4.67 a 2.85,2.85 0 0 1 -1,2.11 l -5.66,4 c -0.56,0.4 -1,0.1 -1,-0.67 v -4.61 a 2.87,2.87 0 0 1 1,-2.12 z"
+           fill="#fbc179" /><path
+           id="rect5771"
+           d="m 358.53985,226.30831 6.1,-4.36 c 0.44,-0.31 0.79,0.18 0.79,1.1 v 4.12 a 3.08,3.08 0 0 1 -0.79,2.23 l -6.1,4.37 c -0.43,0.31 -0.79,-0.18 -0.79,-1.1 v -4.08 a 3.12,3.12 0 0 1 0.79,-2.28 z"
+           fill="#fbc179" /><path
+           id="rect5773"
+           d="m 358.64985,235.22831 5.44,-3.9 c 0.62,-0.44 1.12,0 1.12,1 v 3.86 a 3.53,3.53 0 0 1 -1.12,2.6 l -5.44,3.89 c -0.62,0.44 -1.12,0 -1.12,-1 v -3.85 a 3.51,3.51 0 0 1 1.12,-2.6 z"
+           fill="#fbc179" /><path
+           id="rect5775"
+           d="m 367.23985,228.74831 5.66,-4 c 0.56,-0.4 1,-0.09 1,0.68 v 4.65 a 2.89,2.89 0 0 1 -1,2.13 l -5.66,4 c -0.56,0.39 -1,0.09 -1,-0.68 v -4.66 a 2.92,2.92 0 0 1 1,-2.12 z"
+           fill="#fbc179" /><path
+           id="rect5777"
+           d="m 367.25985,220.22831 5.88,-4.2 c 0.49,-0.36 0.9,0 0.9,0.78 v 4.6 a 2.8,2.8 0 0 1 -0.9,2.07 l -5.88,4.21 c -0.5,0.35 -0.9,0 -0.9,-0.79 v -4.6 a 2.8,2.8 0 0 1 0.9,-2.07 z"
+           fill="#fbc179" /><path
+           id="rect5779"
+           d="m 367.25985,211.01831 5.88,-4.2 c 0.49,-0.36 0.9,-0.24 0.9,0.27 v 5.63 a 2.2,2.2 0 0 1 -0.9,1.55 l -5.88,4.21 c -0.5,0.36 -0.9,0.24 -0.9,-0.27 v -5.62 a 2.2,2.2 0 0 1 0.9,-1.55 z"
+           fill="#fbc179" /><path
+           id="rect8055"
+           d="m 340.75985,237.85831 5.69,3.82 a 2.9,2.9 0 0 1 1,2.23 v 4.29 c 0,0.87 -0.43,1.29 -1,0.93 l -5.69,-3.82 a 3,3 0 0 1 -1,-2.23 v -4.29 c 0,-0.87 0.43,-1.29 1,-0.93 z"
+           fill="#fbc179" /><path
+           id="rect8815"
+           d="m 340.88985,228.58831 5.65,3.85 a 2.17,2.17 0 0 1 1,1.48 v 5.8 c 0,0.46 -0.44,0.54 -1,0.18 l -5.69,-3.82 a 2.16,2.16 0 0 1 -1,-1.48 v -5.79 c 0,-0.46 0.43,-0.54 1,-0.19 z"
+           fill="#fbc179" /><path
+           id="rect8817"
+           d="m 340.88985,219.80831 5.65,3.78 a 2.35,2.35 0 0 1 1,1.72 v 5.3 c 0,0.6 -0.44,0.79 -1,0.43 l -5.69,-3.82 a 2.36,2.36 0 0 1 -1,-1.72 v -5.27 c 0,-0.59 0.43,-0.78 1,-0.42 z"
+           fill="#fbc179" /><path
+           id="rect8819"
+           d="m 332.18985,232.08831 5.69,3.82 a 2.66,2.66 0 0 1 1,2 v 4.72 c 0,0.76 -0.43,1.08 -1,0.72 l -5.69,-3.76 a 2.68,2.68 0 0 1 -1,-2 v -4.79 c 0,-0.75 0.44,-1.07 1,-0.71 z"
+           fill="#fbc179" /><path
+           id="rect8821"
+           d="m 332.18985,223.05831 5.69,3.82 a 2.79,2.79 0 0 1 1,2.11 v 4.53 c 0,0.81 -0.43,1.17 -1,0.82 l -5.69,-3.82 a 2.82,2.82 0 0 1 -1,-2.12 v -4.52 c 0,-0.81 0.44,-1.18 1,-0.82 z"
+           fill="#fbc179" /><path
+           id="rect8823"
+           d="m 332.24985,214.36831 5.69,3.82 a 2.43,2.43 0 0 1 1,1.82 v 5.1 c 0,0.65 -0.43,0.89 -1,0.53 l -5.69,-3.82 a 2.45,2.45 0 0 1 -1,-1.82 v -5.11 c 0,-0.65 0.43,-0.88 1,-0.52 z"
+           fill="#fbc179" /><path
+           id="rect8825"
+           d="m 323.41985,226.22831 5.69,3.82 a 2.29,2.29 0 0 1 1,1.65 v 5.46 c 0,0.55 -0.43,0.71 -1,0.35 l -5.69,-3.82 a 2.29,2.29 0 0 1 -1,-1.65 v -5.45 c 0,-0.56 0.43,-0.71 1,-0.36 z"
+           fill="#fbc179" /><path
+           id="rect8827"
+           d="m 323.53985,217.58831 5.69,3.82 a 2.26,2.26 0 0 1 1,1.61 v 5.57 c 0,0.53 -0.43,0.67 -1,0.32 l -5.69,-3.87 a 2.27,2.27 0 0 1 -1,-1.61 v -5.54 c 0,-0.53 0.44,-0.67 1,-0.31 z"
+           fill="#fbc179" /><path
+           id="rect8829"
+           d="m 323.53985,208.67831 5.69,3.82 a 2.17,2.17 0 0 1 1,1.5 v 5.75 c 0,0.47 -0.43,0.56 -1,0.2 l -5.69,-3.82 a 2.17,2.17 0 0 1 -1,-1.49 v -5.76 c 0,-0.47 0.44,-0.56 1,-0.2 z"
+           fill="#fbc179" /><g
+           id="g11205"
+           transform="translate(288.53985,175.58831)"><path
+             id="rect10429"
+             d="m 42.59,26.3 6.33,4 c 0.31,0.2 0.07,0.71 -0.54,1.14 l -5,3.51 a 1.91,1.91 0 0 1 -1.67,0.42 l -6.34,-4 c -0.31,-0.2 -0.07,-0.71 0.54,-1.14 l 5,-3.51 a 1.86,1.86 0 0 1 1.67,-0.41 z"
+             fill="#fbc179" /><path
+             id="rect11189"
+             d="m 51.2,32 6.34,4 c 0.31,0.2 0.07,0.7 -0.54,1.13 l -5,3.51 c -0.61,0.43 -1.35,0.62 -1.67,0.42 l -6.33,-4 c -0.31,-0.2 -0.07,-0.71 0.54,-1.13 l 5,-3.52 C 50.15,31.99 50.9,31.8 51.21,32 Z"
+             fill="#fbc179" /><path
+             id="rect11191"
+             d="m 60.05,37.62 6.33,4 c 0.32,0.2 0.08,0.71 -0.53,1.14 l -5,3.51 c -0.61,0.43 -1.36,0.61 -1.67,0.41 l -6.33,-4 c -0.32,-0.19 -0.08,-0.7 0.53,-1.13 l 5,-3.51 c 0.61,-0.43 1.36,-0.61 1.67,-0.41 z"
+             fill="#fbc179" /><path
+             id="rect11193"
+             d="m 51.31,20.24 6.34,4 c 0.31,0.2 0.07,0.71 -0.54,1.14 l -5,3.51 c -0.6,0.43 -1.35,0.61 -1.66,0.41 l -6.34,-4 c -0.31,-0.2 -0.07,-0.71 0.54,-1.14 l 5,-3.51 c 0.61,-0.43 1.36,-0.61 1.67,-0.41 z"
+             fill="#fbc179" /><path
+             id="rect11195"
+             d="m 60,25.79 6.33,4 c 0.32,0.2 0.08,0.7 -0.53,1.13 l -5,3.51 c -0.61,0.43 -1.35,0.62 -1.67,0.42 l -6.33,-4 c -0.32,-0.2 -0.08,-0.71 0.53,-1.14 l 5,-3.51 A 1.86,1.86 0 0 1 60,25.79 Z"
+             fill="#fbc179" /><path
+             id="rect11197"
+             d="m 69.07,31.53 6.34,4 c 0.31,0.2 0.07,0.71 -0.54,1.14 l -5,3.51 c -0.6,0.43 -1.35,0.61 -1.66,0.41 l -6.34,-4 c -0.31,-0.19 -0.07,-0.7 0.54,-1.13 l 5,-3.51 a 1.91,1.91 0 0 1 1.67,-0.42 z"
+             fill="#fbc179" /><path
+             id="rect11199"
+             d="m 59.79,14.29 6.33,4 c 0.31,0.2 0.07,0.7 -0.54,1.13 l -5,3.51 c -0.61,0.43 -1.36,0.62 -1.67,0.42 l -6.34,-4 c -0.31,-0.2 -0.07,-0.71 0.54,-1.14 l 5,-3.51 a 1.86,1.86 0 0 1 1.67,-0.41 z"
+             fill="#fbc179" /><path
+             id="rect11201"
+             d="m 68.76,19.83 6.33,4 c 0.32,0.2 0.08,0.71 -0.53,1.14 l -5,3.51 a 1.86,1.86 0 0 1 -1.67,0.41 l -6.33,-4 c -0.31,-0.2 -0.07,-0.71 0.53,-1.14 l 5,-3.51 c 0.61,-0.43 1.36,-0.61 1.67,-0.41 z"
+             fill="#fbc179" /><path
+             id="rect11203"
+             d="m 77.55,25.57 6.34,4 c 0.31,0.2 0.07,0.71 -0.54,1.14 l -5,3.51 a 1.86,1.86 0 0 1 -1.67,0.41 l -6.33,-4 c -0.31,-0.2 -0.07,-0.71 0.54,-1.14 l 5,-3.51 a 1.91,1.91 0 0 1 1.67,-0.42 z"
+             fill="#fbc179" /></g><path
+           d="m 338.32643,218.44316 -34.85,-29.94 a 0.86,0.86 0 0 0 -1.42,0.65 v 46 a 0.86,0.86 0 0 0 1.47,0.6 l 9.43,-9.56 a 0.85,0.85 0 0 1 1.38,0.23 l 11.79,24.72 a 0.86,0.86 0 0 0 1.14,0.41 l 9.31,-4.43 a 0.85,0.85 0 0 0 0.4,-1.14 l -11.42,-24 a 0.85,0.85 0 0 1 0.71,-1.22 l 11.56,-0.8 a 0.85,0.85 0 0 0 0.5,-1.52 z"
+           id="path2" /></g></g></g></svg>
diff --git a/plugin/openstudio/lib/resources/icons/InfoToolCursor.tiff b/plugin/openstudio/lib/resources/icons/InfoToolCursor.tiff
new file mode 100644
index 0000000..968f863
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/InfoToolCursor.tiff differ
diff --git a/plugin/openstudio/lib/resources/icons/OriginToolCursor-14x20.tiff b/plugin/openstudio/lib/resources/icons/OriginToolCursor-14x20.tiff
deleted file mode 100644
index f478e34..0000000
Binary files a/plugin/openstudio/lib/resources/icons/OriginToolCursor-14x20.tiff and /dev/null differ
diff --git a/plugin/openstudio/lib/resources/icons/OriginToolCursor.png b/plugin/openstudio/lib/resources/icons/OriginToolCursor.png
new file mode 100644
index 0000000..c105a6d
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OriginToolCursor.png differ
diff --git a/plugin/openstudio/lib/resources/icons/OriginToolCursor.svg b/plugin/openstudio/lib/resources/icons/OriginToolCursor.svg
new file mode 100644
index 0000000..a940011
--- /dev/null
+++ b/plugin/openstudio/lib/resources/icons/OriginToolCursor.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="32"
+   height="32"
+   viewBox="0 0 8.4666662 8.4666662"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><g
+       id="g1"
+       transform="matrix(0.26458333,0,0,0.26458333,-98.522403,-58.72818)"><g
+         id="layer1-1"
+         transform="matrix(1.4761039,0,0,1.5211548,372.25894,221.96749)"><g
+           id="g1-4"
+           transform="matrix(0.248627,-0.09049283,0.09049283,0.248627,-12.047452,5.9201024)"><path
+             d="m 100.74313,53.893292 -34.849998,-29.94 a 0.86,0.86 0 0 0 -1.42,0.65 v 46 a 0.86,0.86 0 0 0 1.47,0.6 l 9.43,-9.56 a 0.85,0.85 0 0 1 1.38,0.23 l 11.79,24.72 a 0.86,0.86 0 0 0 1.14,0.41 l 9.31,-4.43 a 0.85,0.85 0 0 0 0.4,-1.14 l -11.42,-24 a 0.85,0.85 0 0 1 0.71,-1.22 l 11.559998,-0.8 a 0.85,0.85 0 0 0 0.5,-1.52 z"
+             id="path2-2" /></g><g
+           id="g2"
+           transform="matrix(0.26458333,0,0,0.26458333,-4.2311869,3.885158)"><path
+             d="m 28.344693,7.0666799 h -11.8 v -8.87 h 11.8 V -14.04332 h 9.7 v 12.2399999 h 11.86 v 8.87 h -11.86 V 19.25668 h -9.7 z"
+             fill="#0d4973"
+             stroke="#ffffff"
+             stroke-linecap="round"
+             stroke-linejoin="round"
+             stroke-width="0.79"
+             id="path9" /></g></g></g></g></svg>
diff --git a/plugin/openstudio/lib/resources/icons/OriginToolCursor.tiff b/plugin/openstudio/lib/resources/icons/OriginToolCursor.tiff
new file mode 100644
index 0000000..47d010c
Binary files /dev/null and b/plugin/openstudio/lib/resources/icons/OriginToolCursor.tiff differ
diff --git a/plugin/openstudio/lib/tools/InfoTool.rb b/plugin/openstudio/lib/tools/InfoTool.rb
index 6585fa9..72024e8 100644
--- a/plugin/openstudio/lib/tools/InfoTool.rb
+++ b/plugin/openstudio/lib/tools/InfoTool.rb
@@ -16,7 +16,7 @@ class InfoTool < Tool
     #   with Ctrl key down, it displays construction objects!  --- used to work
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/InfoToolCursor-16x17.tiff", 1, 1)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/InfoToolCursor.svg", 1, 1)
       @flags = 0
     end
 
diff --git a/plugin/openstudio/lib/tools/NewDaylightingControlTool.rb b/plugin/openstudio/lib/tools/NewDaylightingControlTool.rb
index a95cb26..0f0fa5c 100644
--- a/plugin/openstudio/lib/tools/NewDaylightingControlTool.rb
+++ b/plugin/openstudio/lib/tools/NewDaylightingControlTool.rb
@@ -11,7 +11,7 @@ module OpenStudio
   class NewDaylightingControlTool < Tool
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor-14x20.tiff", 3, 3)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor.svg", 7, 7)
     end
 
     def onMouseMove(flags, x, y, view)
diff --git a/plugin/openstudio/lib/tools/NewGlareSensorTool.rb b/plugin/openstudio/lib/tools/NewGlareSensorTool.rb
index a9af8d2..b1e076c 100644
--- a/plugin/openstudio/lib/tools/NewGlareSensorTool.rb
+++ b/plugin/openstudio/lib/tools/NewGlareSensorTool.rb
@@ -11,7 +11,7 @@ module OpenStudio
   class NewGlareSensorTool < Tool
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor-14x20.tiff", 3, 3)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor.svg", 7, 7)
     end
 
     def onMouseMove(flags, x, y, view)
diff --git a/plugin/openstudio/lib/tools/NewGroupTool.rb b/plugin/openstudio/lib/tools/NewGroupTool.rb
index 45b40a2..c76076e 100644
--- a/plugin/openstudio/lib/tools/NewGroupTool.rb
+++ b/plugin/openstudio/lib/tools/NewGroupTool.rb
@@ -11,7 +11,7 @@ module OpenStudio
   class NewGroupTool < Tool
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor-14x20.tiff", 3, 3)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor.svg", 7, 7)
     end
 
 
diff --git a/plugin/openstudio/lib/tools/NewIlluminanceMapTool.rb b/plugin/openstudio/lib/tools/NewIlluminanceMapTool.rb
index 371d7e4..49a0d5b 100644
--- a/plugin/openstudio/lib/tools/NewIlluminanceMapTool.rb
+++ b/plugin/openstudio/lib/tools/NewIlluminanceMapTool.rb
@@ -11,7 +11,7 @@ module OpenStudio
   class NewIlluminanceMapTool < Tool
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor-14x20.tiff", 3, 3)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor.svg", 7, 7)
     end
 
     def onMouseMove(flags, x, y, view)
diff --git a/plugin/openstudio/lib/tools/NewLuminaireTool.rb b/plugin/openstudio/lib/tools/NewLuminaireTool.rb
index 8d5a44c..6a0fb26 100644
--- a/plugin/openstudio/lib/tools/NewLuminaireTool.rb
+++ b/plugin/openstudio/lib/tools/NewLuminaireTool.rb
@@ -11,7 +11,7 @@ module OpenStudio
   class NewLuminaireTool < Tool
 
     def initialize
-      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor-14x20.tiff", 3, 3)
+      @cursor = UI.create_cursor(Plugin.dir + "/lib/resources/icons/OriginToolCursor.svg", 7, 7)
     end
 
     def onMouseMove(flags, x, y, view)