3 files changed, 5 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/valo/components/_panel.scss b/WebContent/VAADIN/themes/valo/components/_panel.scss
index 6ccd5139da..07e21cccbf 100644
--- a/WebContent/VAADIN/themes/valo/components/_panel.scss
+++ b/WebContent/VAADIN/themes/valo/components/_panel.scss
@@ -162,6 +162,8 @@ $v-panel-border: $v-border !default;
       left: 0;
       height: 0;
       border-top: $border-width solid first-color(valo-border($color: $v-app-background-color, $strength: 0.5));
+      $border-color: first-color(valo-border($color: $v-app-background-color, $strength: 1));
+      border-color: rgba($border-color, .5);
     }
   }
 
diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
index 020eb1cae7..9a9e597888 100644
--- a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
+++ b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
@@ -87,7 +87,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
       img.v-icon {
         width: round($v-unit-size * 1.5);
         height: round($v-unit-size * 1.5);
-        border-radius: ceil($v-unit-size * 1.5 / 2);
+        border-radius: ceil($v-unit-size * 1.5 / 2 + first-number($v-border));
         box-shadow: valo-bevel-and-shadow($bevel: null, $shadow: $v-shadow);
         display: block;
         margin: 0 auto .3em;
diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/WebContent/VAADIN/themes/valo/components/_window.scss
index 97859a62b2..b958be79da 100644
--- a/WebContent/VAADIN/themes/valo/components/_window.scss
+++ b/WebContent/VAADIN/themes/valo/components/_window.scss
@@ -96,6 +96,8 @@ $v-window-modality-curtain-background-color: #222 !default;
       height: 0;
       $_bg: $v-window-background-color;
       border-top: $scroll-divider-width solid first-color(valo-border($strength: 0.5));
+      $border-color: first-color(valo-border($strength: 1));
+      border-color: rgba($border-color, .5);
     }
   }