11 files changed, 26 insertions, 17 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 7d99a42a..8753e921 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -82,7 +82,7 @@
    <body>
        <div data-montage-id="brushProperties" class="subToolHolderPanel toolOptionsFloatChildren">
            <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label"> Width:</label>
            <div data-montage-id="strokeSize" class="label"></div>
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 cf68520f..e5df9bd3 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -66,7 +66,7 @@
        <div data-montage-id="fillProperties" class="subToolHolderPanel optionsFillTool toolOptionsFloatChildren">
            <input data-montage-id="useFillColor" type="checkbox" name="useFillColorControl" class="nj-skinned"/>
            <div class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
            <input data-montage-id="useWebGL" type="checkbox" name="useWebGLControl" class="nj-skinned"/>
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 579930f0..c7fcc523 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -151,7 +151,7 @@
                <input data-montage-id="useStrokeColor" type="checkbox" name="useStrokeColor" class="nj-skinned" title="Apply stroke or border-color"/>
                <div class="toolColorChipIcon PencilTool"></div>
-                <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+                <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <input data-montage-id="useBorderWidth" type="checkbox" name="useBorderWidthControl" class="nj-skinned" title="Apply border-width"/>
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index adb5cd7d..c77ac660 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -51,9 +51,9 @@
        <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
        <div class="toolColorChipIcon PencilTool"></div>
-        <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+        <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
        <div class="toolColorChipIcon FillTool"></div>
-        <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+        <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
        <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label"> Stroke:</label>
            <div data-montage-id="strokeSize" class="label"></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 ea246ea8..5f93b556 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -112,6 +112,7 @@
                    "_fillColorCtrlIcon": {"#": "fillColorCtrlIcon"},
                    "_fillColorCtrl": {"#": "fillColorCtrl"},
                    "_strokeColorCtrl": {"#": "strokeColorCtrl"},
+                    "_fillColorCtrlContainer": {"#": "fillColorCtrlContainer"},
                    "_strokeSize": {"@": "_strokeSize1"},
                    "ovalProperties": {"@": "ovalProperties1"},
@@ -135,9 +136,9 @@
            </div>
            <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
            <div class="toolColorChipIcon PencilTool"></div>
-            <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer"><div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div></div>
            <div data-montage-id="fillColorCtrlIcon" class="toolColorChipIcon FillTool"></div>
-            <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+            <div data-montage-id="fillColorCtrlContainer" class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="nj-divider divider-vertical">&nbsp;</div>
            <label class="label">Stroke:</label>
            <div data-montage-id="strokeControl" class="label"></div>
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 5829634c..7306275a 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -179,14 +179,14 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                this[this._selectedSubTool.properties].visible = true;
                if (this._selectedSubTool.id === "LineTool") {
-                    this._fillColorCtrl.style["display"] = "none";
+                    this._fillColorCtrlContainer.style["display"] = "none";
-                    this._fillColorCtrl.visible = false;
+                    this._fillColorCtrlContainer.visible = false;
                    this._fillColorCtrlIcon.style["display"] = "none";
                    this._fillColorCtrlIcon.visible = false;                    
                    this.endDivider.style["display"] = "none";
                } else {
-                    this._fillColorCtrl.style["display"] = "";
+                    this._fillColorCtrlContainer.style["display"] = "";
-                    this._fillColorCtrl.visible = true;
+                    this._fillColorCtrlContainer.visible = true;
                    this._fillColorCtrlIcon.style["display"] = "";
                    this._fillColorCtrlIcon.visible = true;
                    this.endDivider.style["display"] = "";
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index 87f87aff..082384db 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -48,7 +48,7 @@
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <div class="toolColorChipIcon FillTool"></div>
-                <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
+                <div class="toolColorChipContainer"><div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div></div>
                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <div id="classNameContainer">
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 218105a7..586cdcd5 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -39,7 +39,7 @@
    width: 160px;
 }
-.optionsTextTool .toolColorChipCtrl {
+.fontColorChipContainer {
-    margin-left: 6px;
+    margin-left: 10px !important;
    margin-right: 0px;
 }
 \ No newline at end of file
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html
index e7fafd0d..f47ca0c8 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -290,7 +290,7 @@
            <button data-montage-id="fontSettings" style="display: none"></button>
            <label class="label">Size:</label>
            <select data-montage-id="fontSize" class="nj-skinned"></select>
-            <div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div>
+            <div class="toolColorChipContainer fontColorChipContainer"><div data-montage-id="fontColorCtrl" class="toolColorChipCtrl"></div></div>
            <div class="btnGroup toolOptionsFloatChildren">
                <button data-montage-id="btnBold" class="btnBold nj-skinned textButton" style="font-weight:bold" title="Bold"></button>
                <button data-montage-id="btnItalic" class="btnItalic nj-skinned textButton" style="font-style: italic;"></button>
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index c75e105d..66f39b5a 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -17,7 +17,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
        value:function(){
            this.element.addEventListener("click", this, false);
            this.trackID = this.parentComponent.parentComponen