diff --git a/NEWS b/NEWS
index b24eb8483..d692e45ea 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Enhancements
  - [web] add date picker to change date, week, or month of current Calendar view
  - [web] style cancelled events in Calendar module
  - [web] replace sortable library for better support with Firefox
+ - [web] stage-1 tuning of sgColorPicker directive
  - [oc] better handling of nested attachments with OpenChange
 
 Bug fixes
diff --git a/UI/WebServerResources/js/Common/sgColorPicker.directive.js b/UI/WebServerResources/js/Common/sgColorPicker.directive.js
index 27f707080..a855bc092 100644
--- a/UI/WebServerResources/js/Common/sgColorPicker.directive.js
+++ b/UI/WebServerResources/js/Common/sgColorPicker.directive.js
@@ -31,9 +31,9 @@
         '    <md-content class="md-padding">',
         '      <md-grid-list class="sg-color-picker" md-cols="7" md-row-height="1:1" md-gutter="0.5em">',
         '        <md-grid-tile ng-repeat="color in ::sgColors track by $index"',
-        '                      ng-style="{ \'background-color\': color }"',
-        '                      ng-class="{ selected: color == sgColor }"',
-        '                      ng-click="setColor(color)"><md-icon ng-style="{ color: color }">check_box</md-icon></md-grid-tile>',
+        '                      ng-style="::{ \'background-color\': color }"',
+        '                      ng-class="::{ selected: color == sgColor }"',
+        '                      ng-click="setColor($event, color)"><md-icon ng-style="::{ color: color }">check_box</md-icon></md-grid-tile>',
         '      </md-grid-list>',
         '    </md-content>',
         '  </md-menu-content>',
@@ -61,7 +61,13 @@
     var ngModelController = $element.controller('ngModel');
 
     $scope.sgColors = sgColors.selection;
-    $scope.setColor = function(color) {
+    $scope.setColor = function(event, color) {
+      if (event) {
+        _.forEach(event.currentTarget.parentElement.children, function(tile) {
+          tile.classList.remove('selected');
+        });
+        event.currentTarget.classList.add('selected');
+      }
       // Update scope value and ng-model
       $scope.sgColor = color;
       $scope.sgIconColor = contrast(color);
diff --git a/UI/WebServerResources/scss/components/gridList/grid-list.scss b/UI/WebServerResources/scss/components/gridList/grid-list.scss
index 928171207..3627986c6 100644
--- a/UI/WebServerResources/scss/components/gridList/grid-list.scss
+++ b/UI/WebServerResources/scss/components/gridList/grid-list.scss
@@ -11,9 +11,9 @@
     }
     &.selected {
       background-color: transparent !important;
+      transform: scale(1.3);
       md-icon {
         display: inline-block;
-        font-size: 32px;
         margin: 0;
       }
     }