diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 6fb8118..0cdf25d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1184,6 +1184,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
         $rootScope.isLoading = false;
         $('#spinner').css('visibility', 'hidden');
+        $(".tooltip-custom").removeClass("btn-primary");
+        $(".tooltip-custom").addClass("btn-black");
+        $("#hidePinBtn").addClass("btn-primary");
     }
 
     $scope.showAllPinsAfterHide = function (event) {
@@ -1204,6 +1207,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.showSystemPins($scope.aaPinData, false);
         }
         $scope.showSpeechBubble();
+        $(".tooltip-custom").removeClass("btn-primary");
+        $(".tooltip-custom").addClass("btn-black");
+        $("#allPinBtn").addClass("btn-primary");
     };
 
  
@@ -1224,7 +1230,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
             }
             $scope.showSpeechBubble();
-
+            $(".tooltip-custom").removeClass("btn-primary");
+            $(".tooltip-custom").addClass("btn-black");
+            $("#selectedPin").addClass("btn-primary");
     };
 
 
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
index 215f9bc..857a765 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -71,9 +71,9 @@
     <div class="tools pull-left" style="top:44px;">
         <div class="toggle-icon toggleBar toggleHeadingButton" id="sideBarToggle" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
         <div class="">
-            <div class="col-sm-6"><button onclick="hidePins(event)" class="btn btn-black btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Hide Pins"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt=""></button> </div>
-            <div class="col-sm-6"><button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="showSelectedPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show Selected Pins"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt=""></button></div>
-            <div class="col-sm-6"><button class="btn btn-primary btn-sm marginTop5 tooltip-custom" onclick="showAllPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show All Pins in System(s)"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt=""></button></div>
+            <div class="col-sm-6"><button onclick="hidePins(event)" id="hidePinBtn" class="btn btn-black btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Hide Pins"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt=""></button> </div>
+            <div class="col-sm-6"><button class="btn btn-black btn-sm pull-right tooltip-custom" id="selectedPin" onclick="showSelectedPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show Selected Pins"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt=""></button></div>
+            <div class="col-sm-6"><button class="btn btn-primary btn-sm marginTop5 tooltip-custom" id="allPinBtn" onclick="showAllPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show All Pins in System(s)"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt=""></button></div>
             <div class="col-sm-6">
                 <div class="custom-tooltip">Select System</div>
                   <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" ></button>