diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss
index d269d64..d067207 100644
--- a/gnome-shell/_common.scss
+++ b/gnome-shell/_common.scss
@@ -988,7 +988,8 @@ StScrollBar {
       &:active,&:selected {
         color: $selected_fg_color;
         background-color: $selected_bg_color;
-        border-color: transparent; //avoid jumparound due to today
+        @include gradient();
+        border-color: black; //avoid jumparound due to today
       }
       &.calendar-day-heading {  //day of week heading
         color: darken($fg_color, 10%);
@@ -1078,7 +1079,7 @@ StScrollBar {
           &:hover,&:focus { 
             background-color: darken($bg_color, 1%);
             //@include gradient();
-            box-shadow: 3px 0px 0px 0px $selected_bg_color inset;
+            box-shadow: 2px 0px 0px 0px $g2 inset;
            }
           border-radius: 1px;
           background: transparent;
@@ -1389,6 +1390,7 @@ StScrollBar {
     color: $topbar_color;
     background-color: $topbar_bg_color;
     text-align: center;
+    border: 1px solid $borders_color;
     -x-offset: 8px;
   }
 
diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css
index 6f24e68..fb20f49 100644
--- a/gnome-shell/gnome-shell.css
+++ b/gnome-shell/gnome-shell.css
@@ -906,7 +906,10 @@ StScrollBar {
   .calendar-day-base:active, .calendar-day-base:selected {
     color: #f7f7f7;
     background-color: #F67E7D;
-    border-color: transparent; }
+    background-gradient-start: #F67E7D;
+    background-gradient-end: #E1DD8F;
+    background-gradient-direction: horizontal;
+    border-color: black; }
   .calendar-day-base.calendar-day-heading {
     color: #5d5e60;
     margin-top: 1em;
@@ -994,7 +997,7 @@ StScrollBar {
   background: transparent; }
   .message:hover, .message:focus {
     background-color: #181b1e;
-    box-shadow: 3px 0px 0px 0px #F67E7D inset; }
+    box-shadow: 2px 0px 0px 0px #E1DD8F inset; }
 
 .message-icon-bin {
   padding: 10px 3px 10px 10px; }
@@ -1282,6 +1285,7 @@ StScrollBar {
   color: #aaaaac;
   background-color: rgba(30, 35, 38, 0.65);
   text-align: center;
+  border: 1px solid #161819;
   -x-offset: 8px; }
 
 /* App Vault/Grid */