5 files changed, 22 insertions, 8 deletions
diff --git a/css/ninja.css b/css/ninja.css
index d309b34e..a65e826f 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -677,7 +677,7 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul
 nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; }
-.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); }
+.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; }
 .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); }
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html
index 01f2b1da..43dae547 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.html
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.html
@@ -75,7 +75,6 @@
    <body>
        <div data-montage-id="rectProperties" class="rectProperties">
-            <!--<button id="lockButton" class="unselectable subToolButton button LockToolUp" style=" margin-left:20px"></button>-->
            <button data-montage-id="lockButton" id="lockButton" class="unlock" style="margin-left:20px"></button>
            <div id="TLRadiusLabel" class="unselectable subToolButton cornerRadius topLeft"></div>
            <div data-montage-id="TLRadiusControl" class="label"></div>
@@ -87,5 +86,4 @@
            <div data-montage-id="BRRadiusControl" class="label"></div>
        </div>
    </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css
index 1100bc70..4dc64d66 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.css
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css
@@ -5,17 +5,26 @@
 </copyright> */
 
 .optionsShapeTool {
-    padding: 4px;
+    padding: 6px;
 }
 .optionsShapeTool > * {
    float:left;
 }
+.optionsShapeTool select.nj-skinned {
+    margin-top: 2px;
+}
+.optionsShapeTool .shapeCustomProps {
+    margin-top: -3px;
+    margin-left: -31px;
+}
 .optionsShapeTool .fillColorCtrl,  .optionsShapeTool .strokeColorCtrl {
    width: 20px;
    height: 18px;
-    margin: 2px 6px;
+    margin: 1px 6px;
    border: 1px black solid;
 }
@@ -25,4 +34,8 @@
    margin-top: 2px;
    -webkit-transform: scale(0.8);
    background-color: rgb(40, 40, 40);
-}
-\ No newline at end of file
+}
+.optionsShapeTool checkbox {
+    padding: 6px;
+}
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 9363365e..c54f8b25 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -136,6 +136,7 @@
            <div data-montage-id="shapeToolsList">
                <div data-montage-id="toolbutton"></div>
            </div>
+            <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
            <div class="colorCtrlIcon PencilTool"></div>
            <div data-montage-id="strokeColorCtrl" class="strokeColorCtrl"></div>
            <div data-montage-id="fillColorCtrlIcon" class="colorCtrlIcon FillTool"></div>
@@ -143,7 +144,7 @@
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label">Stroke:</label>
            <div data-montage-id="strokeControl" class="label"></div>
-            <div id="customProperties">
+            <div id="customProperties" class="shapeCustomProps">
                <div data-montage-id="ovalProperties" class="label"></div>
                <div data-montage-id="rectProperties" class="label"></div>
                <div data-montage-id="lineProperties" class="label"></div>
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 57519043..637828a4 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -17,6 +17,7 @@
 .subToolHolderPanel .toolbutton {
    float:left;
    -webkit-transform: scale(0.6);
+        margin-top: -4px;
 }
 .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active {
@@ -27,6 +28,7 @@
    margin-right: 9px;
 }
+/* These appear to be unused
 .toolSeparator {
    height:1px;
    width:30px;
@@ -61,10 +63,10 @@
   opacity: 1.0;
   }
 .drawingMode {
    outline:blue solid thin;
 }
+*/
 //  Added new styling Sub Tool Shape Options