Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 4 insertions, 2 deletions

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 cbd9dde8..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,11 +12,13 @@
     opacity: 0.7;
     width: 17px;
     height: 18px;
-    margin-right: 10px;
+    margin-right: 8px;
+    margin-left: 8px;
+    margin-top: 1px;
 }
 
 .rectProperties .subToolButton {
-    float:left;
+    margin-right: 7px;
 }
 
 .rectProperties .button:hover