diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 981b419..c648467 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -422,9 +422,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             document.getElementById('modeleditstyle').style.display = "none";
 
             $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
+            $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
             $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
+            $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
             $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
+            $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
             $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
+            $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
             var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
             var intPart = pixelSeparation.split("p");
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 2eb8138..d4f04bf 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -504,12 +504,16 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="well-popup well">
+                            <div class="well-popup well blankshapediv">
                                 <!--#7931-->
-                                
+
                                 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
-                                <img id="OnEdtShape" src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
-                            
+                                <div class="outlinediv">
+                                    <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
+
+                                    </div>
+
+                                </div>
                             </div>
                             <div class="well well-popup">
                                 <div class="" role="group" aria-label="...">