diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 04ac5738..5db3f555 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -47,13 +47,17 @@
   padding: 0;
 
   &:first-child a {
-    border-top-right-radius: 10px;
-    border-top-left-radius: 10px;
+    border-top-right-radius: $fallback--panelRadius;
+    border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
+    border-top-left-radius: $fallback--panelRadius;
+    border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
   }
 
   &:last-child a {
-    border-bottom-right-radius: 10px;
-    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: $fallback--panelRadius;
+    border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
+    border-bottom-left-radius: $fallback--panelRadius;
+    border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
   }
 }
 
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 5fefe714..071e0380 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -16,7 +16,7 @@
   width: 100%;
   height: 100%
 
-  &:hover canvas {
+            &:hover canvas {
     display: none;
   }
 
@@ -46,7 +46,8 @@
       color: #FFF;
       display: block;
       padding: 2px 4px;
-      border-radius: 3px;
+      border-radius: $fallback--tooltipRadius;
+      border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
       z-index: 2;
     }
   }