3 files changed, 65 insertions, 82 deletions
diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
index 7a00ec5..3e43828 100644
--- a/common/gnome-shell/3.18/gnome-shell-dark.css
+++ b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -394,10 +394,11 @@ StScrollBar {
   spacing: 20px; }
 
 .audio-selection-device {
-  border: 1px solid red;
-  border-radius: 12px; }
+  border: 1px solid #2b2e39;
+  border-radius: 3px; }
   .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
-    background-color: #5294E2; }
+    background-color: #5294E2;
+    border-color: #5294E2; }
 
 .audio-selection-device-box {
   padding: 20px;
@@ -408,22 +409,17 @@ StScrollBar {
 
 .geolocation-dialog {
   spacing: 30px; }
-
-.geolocation-dialog-main-layout {
-  spacing: 12px; }
-
-.geolocation-dialog-content {
-  spacing: 20px; }
-
-.geolocation-dialog-icon {
-  icon-size: 48px; }
-
-.geolocation-dialog-title {
-  font-weight: bold; }
-
-.geolocation-dialog-reason {
-  color: #5b728f;
-  font-weight: bold; }
+  .geolocation-dialog-main-layout {
+    spacing: 12px; }
+  .geolocation-dialog-content {
+    spacing: 20px; }
+  .geolocation-dialog-icon {
+    icon-size: 48px; }
+  .geolocation-dialog-title {
+    font-weight: bold; }
+  .geolocation-dialog-reason {
+    color: #D3DAE3;
+    font-weight: bold; }
 
 .network-dialog-secret-table {
   spacing-rows: 15px;
diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css
index 0883e02..9660c38 100644
--- a/common/gnome-shell/3.18/gnome-shell.css
+++ b/common/gnome-shell/3.18/gnome-shell.css
@@ -394,10 +394,11 @@ StScrollBar {
   spacing: 20px; }
 
 .audio-selection-device {
-  border: 1px solid red;
-  border-radius: 12px; }
+  border: 1px solid #dcdfe3;
+  border-radius: 3px; }
   .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
-    background-color: #5294E2; }
+    background-color: #5294E2;
+    border-color: #5294E2; }
 
 .audio-selection-device-box {
   padding: 20px;
@@ -408,22 +409,17 @@ StScrollBar {
 
 .geolocation-dialog {
   spacing: 30px; }
-
-.geolocation-dialog-main-layout {
-  spacing: 12px; }
-
-.geolocation-dialog-content {
-  spacing: 20px; }
-
-.geolocation-dialog-icon {
-  icon-size: 48px; }
-
-.geolocation-dialog-title {
-  font-weight: bold; }
-
-.geolocation-dialog-reason {
-  color: black;
-  font-weight: bold; }
+  .geolocation-dialog-main-layout {
+    spacing: 12px; }
+  .geolocation-dialog-content {
+    spacing: 20px; }
+  .geolocation-dialog-icon {
+    icon-size: 48px; }
+  .geolocation-dialog-title {
+    font-weight: bold; }
+  .geolocation-dialog-reason {
+    color: #5c616c;
+    font-weight: bold; }
 
 .network-dialog-secret-table {
   spacing-rows: 15px;
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 16588f1..9351847 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -505,37 +505,39 @@ StScrollBar {
 //
 // Audio selection dialog
 //
-.audio-device-selection-dialog {
-  spacing: 30px;
-}
+.audio-device-selection-dialog { spacing: 30px; }
 
-.audio-selection-content {
-  spacing: 20px;
-  padding: 24px;
-}
+.audio-selection {
 
-.audio-selection-title {
-  font-weight: bold;
-  text-align: center;
-}
+  &-content {
+    spacing: 20px;
+    padding: 24px;
+  }
 
-.audio-selection-box {
-  spacing: 20px;
-}
+  &-title {
+    font-weight: bold;
+    text-align: center;
+  }
 
-.audio-selection-device {
-  border: 1px solid red;
-  border-radius: 12px;
-  &:active,&:hover,&:focus { background-color: $selected_bg_color; }
-}
+  &-box { spacing: 20px; }
 
-.audio-selection-device-box {
-  padding: 20px;
-  spacing: 20px;
-}
+  &-device {
+    border: 1px solid $borders_color;
+    border-radius: 3px;
 
-.audio-selection-device-icon {
-  icon-size: 64px;
+    &:active,&:hover,&:focus {
+      background-color: $selected_bg_color;
+      border-color: $selected_bg_color;
+    }
+  }
+
+  &-device-box {
+    padding: 20px;
+    spacing: 20px;
+  }
+
+  &-device-icon { icon-size: 64px; }
+  
 }
 
 //
@@ -543,27 +545,16 @@ StScrollBar {
 //
 .geolocation-dialog {
   spacing: 30px;
-}
-
-.geolocation-dialog-main-layout {
-  spacing: 12px;
-}
 
-.geolocation-dialog-content {
-  spacing: 20px;
-}
-
-.geolocation-dialog-icon {
-  icon-size: 48px;
-}
-
-.geolocation-dialog-title {
-  font-weight: bold;
-}
+  &-main-layout { spacing: 12px; }
+  &-content { spacing: 20px; }
+  &-icon { icon-size: 48px; }
+  &-title { font-weight: bold; }
 
-.geolocation-dialog-reason {
-  color: darken($fg_color,40%);
-  font-weight: bold;
+  &-reason {
+    color: $fg_color;
+    font-weight: bold;
+  }
 }
 
 //