5 files changed, 22 insertions, 12 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.css b/js/components/tools-properties/fill-properties.reel/fill-properties.css
index 7f1b0f7f..58b1c1e8 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.css
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.css
@@ -4,3 +4,10 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
+.optionsFillTool {
+    padding: 6px;
+}
+ .optionsFillTool > * {
+    float:left;
+}
+\ No newline at end of file
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index 6532907e..abc2e843 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -34,9 +34,8 @@
    </head>
    <body>
-        <div id="fillProperties" class="subToolHolderPanel">
+        <div id="fillProperties" class="subToolHolderPanel optionsFillTool">
-            <label class="label subOption"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/> Use WebGL</label>
+            <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label>
            <div id="materialsContainer" class="leftLabel" style="padding-top: 3px;">
                <label class="label"> Materials:</label>
                <div id="fillIcon" class="bucketToolUp" style="float: left;"></div>
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.css b/js/components/tools-properties/selection-properties.reel/selection-properties.css
index e3fe1755..1d5eb513 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.css
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.css
@@ -4,6 +4,10 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
-.selectionProperties {
+.optionsSelectionTool {
-    margin-top: -6px;
+    padding: 6px;
+}
+ .optionsSelectionTool > * {
+    float:left;
 }
 \ No newline at end of file
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html
index f0b907af..3d2456c6 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.html
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html
@@ -25,18 +25,18 @@
    </head>
    <body>
-        <div id="selectionProperties" class="subToolHolderPanel">
+        <div id="selectionProperties" class="subToolHolderPanel optionsSelectionTool">
-            <label class="label subOption optionLabel"><input id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label>
+            <input id="transformCheck" type="checkbox" name="transformControl" class="nj-skinned"/><label class="label">Transform Controls&nbsp&nbsp</label>
            <div id="toolPropertiesPanel-selectionDivOptions">
                <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div>
                <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div>
-                <div class="subOption"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div>
+                <div class="subOption subOptionSpacer"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div>
-                <div class="subOption"><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div>
+                <div class="subOption "><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div>
                <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div>
-                <div class="subOption"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div>
+                <div class="subOption subOptionSpacer"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div>
                <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div>
                <div class="subOption"><div id="distCenter" class="distCenterUp" title="Distance Center"></div></div>
-                <div class="subOption"><div id="distBottom" class="distBottomUp" title="Distance Bottom"></div></div>
+                <div class="subOption subOptionSpacer"><div id="distBottom" class="distBottomUp" title="Distance Bottom"></div></div>
                <div class="subOption"><div id="distLeft" class="distLeftUp" title="Distance Left"></div></div>
                <div class="subOption"><div id="distVCenter" class="distVCenterUp" title="Distance Center"></div></div>
                <div class="subOption"><div id="distRight" class="distRightUp" title="Distance Right"></div></div>
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 3c492e6e..cc3534f2 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -149,7 +149,7 @@
                <div id="lineProperties" class="label"></div>
            </div>
-            <label class="label subOption optionLabel"><input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/>Use WebGL</label>
+            <input id="useWebGLCH" type="checkbox" name="useWebGLControl" class="nj-skinned"/><label class="label">Use WebGL</label>
            <label id="materialLabel" class="label">Material:</label>
            <div id="strokeIcon" class="pencilToolUp" style="float: left;"></div>