32 files changed, 80 insertions, 60 deletions

diff --git a/css/ninja.css b/css/ninja.css
index b281632e..a7aab886 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -701,13 +701,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul
 
 .cornerRadius:hover, .cornerRadius:active { opacity: 1; }
 
-.cornerRadius.topLeft { -webkit-transform: rotate(0deg); }
+.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; }
 
-.cornerRadius.topRight { -webkit-transform: rotate(90deg); }
+.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: 3px; margin-top: 1px; }
 
-.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); }
+.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); margin-right: 2px; margin-top: -1px; }
 
-.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); }
+.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); margin-right: 4px; margin-top: -1px; }
 
 #toolOptionsContainer { display: inline; float: left; }
 
@@ -819,37 +819,37 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 
 .selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; }
 
-.alignTopIcon { background-image: url("../images/tools/AlignTop.png"); }
+.alignTopIcon { background-image: url("../images/optionsbar/selection/AlignTop.png"); }
 
-.alignMiddleIcon { background-image: url("../images/tools/AlignMiddle.png"); }
+.alignMiddleIcon { background-image: url("../images/optionsbar/selection/AlignMiddle.png"); }
 
-.alignBottomIcon { background-image: url("../images/tools/AlignBottom.png"); }
+.alignBottomIcon { background-image: url("../images/optionsbar/selection/AlignBottom.png"); }
 
-.alignLeftIcon { background-image: url("../images/tools/AlignLeft.png"); }
+.alignLeftIcon { background-image: url("../images/optionsbar/selection/AlignLeft.png"); }
 
-.alignCenterIcon { background-image: url("../images/tools/AlignCenter.png"); }
+.alignCenterIcon { background-image: url("../images/optionsbar/selection/AlignCenter.png"); }
 
-.alignRightIcon { background-image: url("../images/tools/AlignRight.png"); }
+.alignRightIcon { background-image: url("../images/optionsbar/selection/AlignRight.png"); }
 
-.arrangeBringForwardIcon { background-image: url("../images/tools/ArrangeBringForward.png"); }
+.arrangeBringForwardIcon { background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); }
 
-.arrangeSendBackwardIcon { background-image: url("../images/tools/ArrangeSendBackward.png"); }
+.arrangeSendBackwardIcon { background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); }
 
-.arrangeBringToFrontIcon { background-image: url("../images/tools/ArrangeBringToFront.png"); }
+.arrangeBringToFrontIcon { background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); }
 
-.arrangeSendToBackIcon { background-image: url("../images/tools/ArrangeSendToBack.png"); }
+.arrangeSendToBackIcon { background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); }
 
-.distTopIcon { background-image: url("../images/tools/DistTop.png"); }
+.distTopIcon { background-image: url("../images/optionsbar/selection/DistTop.png"); }
 
-.distMiddleIcon { background-image: url("../images/tools/DistMiddle.png"); }
+.distMiddleIcon { background-image: url("../images/optionsbar/selection/DistMiddle.png"); }
 
-.distBottomIcon { background-image: url("../images/tools/DistBottom.png"); }
+.distBottomIcon { background-image: url("../images/optionsbar/selection/DistBottom.png"); }
 
-.distLeftIcon { background-image: url("../images/tools/DistLeft.png"); }
+.distLeftIcon { background-image: url("../images/optionsbar/selection/DistLeft.png"); }
 
-.distCenterIcon { background-image: url("../images/tools/DistCenter.png"); }
+.distCenterIcon { background-image: url("../images/optionsbar/selection/DistCenter.png"); }
 
-.distRightIcon { background-image: url("../images/tools/DistRight.png"); }
+.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); }
 
 #toolsPanelContent { width: 40px; }
 
diff --git a/images/optionsbar/link.png b/images/optionsbar/link.png
index 7a3f166a..dc834675 100755
--- a/images/optionsbar/link.png
+++ b/images/optionsbar/link.png
diff --git a/images/optionsbar/rectangle/cornerRadius.png b/images/optionsbar/rectangle/cornerRadius.png
index 106c530b..d7bb2d44 100755
--- a/images/optionsbar/rectangle/cornerRadius.png
+++ b/images/optionsbar/rectangle/cornerRadius.png
diff --git a/images/optionsbar/selection/AlignBottom.png b/images/optionsbar/selection/AlignBottom.png
index 842cb057..f68d62c8 100755
--- a/images/optionsbar/selection/AlignBottom.png
+++ b/images/optionsbar/selection/AlignBottom.png
diff --git a/images/tools/AlignCenter.png b/images/optionsbar/selection/AlignCenter.png
index 64bb4014..64bb4014 100644
--- a/images/tools/AlignCenter.png
+++ b/images/optionsbar/selection/AlignCenter.png
diff --git a/images/tools/AlignMiddle.png b/images/optionsbar/selection/AlignMiddle.png
index 03dffad5..03dffad5 100644
--- a/images/tools/AlignMiddle.png
+++ b/images/optionsbar/selection/AlignMiddle.png
diff --git a/images/tools/ArrangeBringForward.png b/images/optionsbar/selection/ArrangeBringForward.png
index 55861b5a..55861b5a 100644
--- a/images/tools/ArrangeBringForward.png
+++ b/images/optionsbar/selection/ArrangeBringForward.png
diff --git a/images/tools/ArrangeBringToFront.png b/images/optionsbar/selection/ArrangeBringToFront.png
index 1344e618..1344e618 100644
--- a/images/tools/ArrangeBringToFront.png
+++ b/images/optionsbar/selection/ArrangeBringToFront.png
diff --git a/images/tools/ArrangeSendBackward.png b/images/optionsbar/selection/ArrangeSendBackward.png
index 2e8ea0ad..2e8ea0ad 100644
--- a/images/tools/ArrangeSendBackward.png
+++ b/images/optionsbar/selection/ArrangeSendBackward.png
diff --git a/images/tools/ArrangeSendToBack.png b/images/optionsbar/selection/ArrangeSendToBack.png
index 699ae5ba..699ae5ba 100644
--- a/images/tools/ArrangeSendToBack.png
+++ b/images/optionsbar/selection/ArrangeSendToBack.png
diff --git a/images/tools/DistBottom.png b/images/optionsbar/selection/DistBottom.png
index c7ed75ce..c7ed75ce 100644
--- a/images/tools/DistBottom.png
+++ b/images/optionsbar/selection/DistBottom.png
diff --git a/images/tools/DistMiddle.png b/images/optionsbar/selection/DistMiddle.png
index bb32a441..bb32a441 100644
--- a/images/tools/DistMiddle.png
+++ b/images/optionsbar/selection/DistMiddle.png
diff --git a/images/optionsbar/selection/alignHcenter.png b/images/optionsbar/selection/alignHcenter.png
deleted file mode 100755
index 64bb4014..00000000
--- a/images/optionsbar/selection/alignHcenter.png
+++ /dev/null
diff --git a/images/optionsbar/selection/alignVcenter.png b/images/optionsbar/selection/alignVcenter.png
deleted file mode 100755
index 03dffad5..00000000
--- a/images/optionsbar/selection/alignVcenter.png
+++ /dev/null
diff --git a/images/optionsbar/selection/distVcenter.png b/images/optionsbar/selection/distVcenter.png
deleted file mode 100755
index bb32a441..00000000
--- a/images/optionsbar/selection/distVcenter.png
+++ /dev/null
diff --git a/images/optionsbar/unlinked.png b/images/optionsbar/unlinked.png
index c209dc7d..49a6efa0 100755
--- a/images/optionsbar/unlinked.png
+++ b/images/optionsbar/unlinked.png
diff --git a/images/tools/AlignBottom.png b/images/tools/AlignBottom.png
deleted file mode 100644
index f68d62c8..00000000
--- a/images/tools/AlignBottom.png
+++ /dev/null
diff --git a/images/tools/AlignLeft.png b/images/tools/AlignLeft.png
deleted file mode 100644
index 822c5243..00000000
--- a/images/tools/AlignLeft.png
+++ /dev/null
diff --git a/images/tools/AlignRight.png b/images/tools/AlignRight.png
deleted file mode 100644
index 07d6d7ef..00000000
--- a/images/tools/AlignRight.png
+++ /dev/null
diff --git a/images/tools/AlignTop.png b/images/tools/AlignTop.png
deleted file mode 100644
index 378d8aab..00000000
--- a/images/tools/AlignTop.png
+++ /dev/null
diff --git a/images/tools/DistCenter.png b/images/tools/DistCenter.png
deleted file mode 100644
index cf8f2bf5..00000000
--- a/images/tools/DistCenter.png
+++ /dev/null
diff --git a/images/tools/DistLeft.png b/images/tools/DistLeft.png
deleted file mode 100644
index 3849e9e6..00000000
--- a/images/tools/DistLeft.png
+++ /dev/null
diff --git a/images/tools/DistRight.png b/images/tools/DistRight.png
deleted file mode 100644
index e350b53e..00000000
--- a/images/tools/DistRight.png
+++ /dev/null
diff --git a/images/tools/DistTop.png b/images/tools/DistTop.png
deleted file mode 100644
index 1d474b3c..00000000
--- a/images/tools/DistTop.png
+++ /dev/null
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.css b/js/components/tools-properties/oval-properties.reel/oval-properties.css
index 7f1b0f7f..ea0d92fc 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.css
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.css
@@ -4,3 +4,14 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+.ovalProperties{
+}
+
+.ovalProperties  hottextunit {
+    width: 22px;
+}   
+
+.ovalProperties  label {
+    margin-left: 6px;
+    margin-right: 6px;
+}  
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html
index c76e8c39..21308be6 100755
--- a/js/components/tools-properties/oval-properties.reel/oval-properties.html
+++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html
@@ -35,9 +35,9 @@
     </head>
 
     <body>
-        <div data-montage-id="ovalProperties">
-            <label class="label">Inner Radius:</label>
-            <div data-montage-id="innerRadiusControl" class="label"></div>
+        <div data-montage-id="ovalProperties" class="ovalProperties toolOptionsFloatChildren">
+            <label>Inner Radius:</label>
+            <div data-montage-id="innerRadiusControl"></div>
         </div>
     </body>
 
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.css b/js/components/tools-properties/rect-properties.reel/rect-properties.css
index c186d895..dcb478e7 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.css
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.css
@@ -12,7 +12,9 @@
     opacity: 0.7;
     width: 17px;
     height: 18px;
-    margin-right: 10px;
+    margin-right: 8px;
+    margin-left: 8px;
+    margin-top: 1px;
 }
 
 .rectProperties .subToolButton {
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 6caef4b3..42746caa 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,7 @@