diff --git a/public/controllers/management/groups.js b/public/controllers/management/groups.js
index cd69fa9e2..05adae833 100644
--- a/public/controllers/management/groups.js
+++ b/public/controllers/management/groups.js
@@ -566,6 +566,10 @@ export function GroupsController(
     return;
   };
 
+  $scope.clearFailedErrors = () => {
+    $scope.failedErrors = false;
+  };
+
   $scope.checkLimit = () => {
     if ($scope.firstSelectedList) {
       const itemsToSave = getItemsToSave();
diff --git a/public/directives/wz-list-manage/wz-list-manage.html b/public/directives/wz-list-manage/wz-list-manage.html
index d1bbc6477..c77948b9c 100644
--- a/public/directives/wz-list-manage/wz-list-manage.html
+++ b/public/directives/wz-list-manage/wz-list-manage.html
@@ -1,6 +1,6 @@
 <div layout="column" layout-align="start">
     <div layout="row" ng-class="hideClose ? ['wz-margin-top-8', 'md-padding-h'] : ''">
-        <span ng-if="!hideClose" ng-click='closeFn()' class='btn btn-info wz-margin-right-8'>Cancel</span>
+        <span ng-if="!hideClose" ng-click='closeFn()' class='wz-margin-top-3 kuiButton kuiButton--hollow wz-margin-right-8'>Cancel</span>
         <button ng-if='adminMode'
             ng-disabled='!(currentItems || []).length || (currentList.new && !currentList.newName) || doingSaving || overwriteError'
             ng-click='saveList()' class='btn wz-button pull-right'>
diff --git a/public/directives/wz-menu/wz-menu.less b/public/directives/wz-menu/wz-menu.less
index a8f6333e2..dcdfdf71d 100644
--- a/public/directives/wz-menu/wz-menu.less
+++ b/public/directives/wz-menu/wz-menu.less
@@ -69,9 +69,13 @@ wz-menu {
 /* Style for index-pattern selector */
 .wz-menu-select {
     border: none;
-    color: #373a42;
+    color: white;
     cursor: pointer;
-    background-color: #FFF;
+    background: transparent url("../../img/icons/arrow_down.svg") no-repeat center right;
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    padding-right: 20px;
+    filter: invert(1);
 }
 
 /* Style for index-pattern selector options */
diff --git a/public/directives/wz-multiple-selector/wz-multiple-selector.html b/public/directives/wz-multiple-selector/wz-multiple-selector.html
index a884ba48f..a059e9e65 100644
--- a/public/directives/wz-multiple-selector/wz-multiple-selector.html
+++ b/public/directives/wz-multiple-selector/wz-multiple-selector.html
@@ -20,7 +20,7 @@
                     </div>
                     <select size='10' multiple ng-model='availableItem' ng-change='selectedElement=null;doCheckLimit()'
                         class='width-100' ng-dblclick='moveItem(availableItem, availableItems, selectedItems);availableItem=null'>
-                        <option ng-repeat='item in availableItems | orderBy:sort' ng-style='{"background-color":(item.type === "a" ? "#c6ffc6": item.type === "r" ? "#ffe7e7" : "")}'
+                        <option ng-repeat='item in availableItems | orderBy:sort' ng-class="item.type === 'a' ? 'wzMultipleSelectorAdding' : item.type === 'r' ? 'wzMultipleSelectorRemoving' : ''"
                             ng-value="{{item}}">{{item.key + " - " + item.value}}</option>
                     </select>
                 </div>
@@ -53,7 +53,7 @@
                         ng-change='selectedElement=null' style='padding: 8px 15px'>
                     <select size='10' multiple ng-model='selectedElement' ng-change='availableItem=null;doCheckLimit()'
                         class='width-100' ng-dblclick='moveItem(selectedElement, selectedItems, availableItems);selectedElement=null'>
-                        <option ng-repeat='item in selectedItems | filter: selectedFilter | orderBy:sort' ng-style='{"background-color":(item.type === "a" ? "#c6ffc6": item.type === "r" ? "#ffe7e7" : "")}'
+                        <option ng-repeat='item in selectedItems | filter: selectedFilter | orderBy:sort' ng-class="item.type === 'a' ? 'wzMultipleSelectorAdding' : item.type === 'r' ? 'wzMultipleSelectorRemoving' : ''"
                             ng-value="{{item}}">{{item.key + " - " + item.value}}</option>
                     </select>
                 </div>
diff --git a/public/directives/wz-multiple-selector/wz-multiple-selector.less b/public/directives/wz-multiple-selector/wz-multiple-selector.less
index 8dd1b3cdb..05b3bfd40 100644
--- a/public/directives/wz-multiple-selector/wz-multiple-selector.less
+++ b/public/directives/wz-multiple-selector/wz-multiple-selector.less
@@ -64,4 +64,12 @@
     position: absolute;
     right: 15px;
     padding: 15px;
+}
+
+.wzMultipleSelectorAdding{
+    background-color: #c6ffc6;
+}
+
+.wzMultipleSelectorRemoving{
+    background-color: #ffe7e7;
 }
\ No newline at end of file
diff --git a/public/img/icons/arrow_down.svg b/public/img/icons/arrow_down.svg
new file mode 100644
index 000000000..45cf8ab70
--- /dev/null
+++ b/public/img/icons/arrow_down.svg
@@ -0,0 +1,18 @@
+<svg width="40" height="30" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style>.cls-1{fill:#fff;}</style>
+ </defs>
+ <title>Asset 1</title>
+ <g>
+  <title>background</title>
+  <rect fill="none" id="canvas_background" height="32" width="42" y="-1" x="-1"/>
+ </g>
+ <g>
+  <title>Layer 1</title>
+  <g id="Layer_2">
+   <g id="Artwork">
+    <polygon id="svg_1" points="25,13 30.049999237060547,19.510000228881836 35.099998474121094,13 25,13 " class="cls-1"/>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/public/less/common.less b/public/less/common.less
index f21cd5a7e..8c022209a 100644
--- a/public/less/common.less
+++ b/public/less/common.less
@@ -1091,6 +1091,10 @@ md-toolbar.md-default-theme:not(.md-menu-toolbar), md-toolbar:not(.md-menu-toolb
   margin: 10px;
 }
 
+.wz-margin-top-3 {
+  margin-top: 3px !important;
+}
+
 .wz-margin-left-10 {
   margin-left: 10px;
 }
diff --git a/public/less/dark_theme/wz_theme_dark.css b/public/less/dark_theme/wz_theme_dark.css
index 55f312be1..4438debc4 100644
--- a/public/less/dark_theme/wz_theme_dark.css
+++ b/public/less/dark_theme/wz_theme_dark.css
@@ -294,4 +294,43 @@ md-divider.md-default-theme, md-divider {
   background-color: #16171c !important;
   border: 1px solid #343741 !important;
   color: #dfe5ef !important;
+}
+
+.extraHeader {
+  border-bottom: 1px solid #2e2f34!important;
+}
+
+.wzMultipleSelectorAdding{
+  background-color: #037200!important;
+}
+
+.wzMultipleSelectorRemoving{
+  background-color: #990000!important;
+
+}
+
+.wz-button {
+  background-color: #1BA9F5 !important;
+  border-color: #1BA9F5 !important;
+  color: #000 !important;
+}
+
+.wz-button-groups.active, .wz-button-groups:not([disabled]):hover, .wz-button.active, .wz-button:not([disabled]):hover, .wz-button-flat:not([disabled]):hover {
+  background-color: #0a9dec !important;
+  border-color: #0a9dec !important;
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.15), 0 2px 2px -1px rgba(0, 0, 0, 0.3) !important;
+  color: #000 !important;
+}
+
+.kuiButton--hollow:hover {
+  color: #006E8A !important;
+  text-decoration: underline !important;
+}
+
+discover-app-w > main.container-fluid {
+  background: #1a1b20 !important;
+}
+
+.wz-menu-select {
+  filter: invert(0) !important; 
 }
\ No newline at end of file
diff --git a/public/templates/management/groups/groups.html b/public/templates/management/groups/groups.html
index af7c5b03c..164c6b045 100644
--- a/public/templates/management/groups/groups.html
+++ b/public/templates/management/groups/groups.html
@@ -49,7 +49,7 @@
             <!-- XML editor for group agents -->
             <div ng-show="editingFile">
                 <div layout="row" class="md-padding-h wz-margin-top-10">
-                    <span ng-click='closeEditingFile()' class='btn btn-info'>Cancel</span>
+                    <span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Cancel</span>
                     <button ng-disabled='xmlHasErrors' ng-click='doSaveGroupAgentConfig()' class='height-35 kuiButton kuiButton--secondary wz-margin-left-8'>
                         <span ng-show='!xmlHasErrors'>
                             <svg class="euiIcon euiIcon--medium" focusable="false" xmlns="http://www.w3.org/2000/svg"
@@ -72,7 +72,7 @@
 
             <div ng-if="!editingFile">
                 <div layout="row" class="md-padding" ng-if="lookingGroup && currentGroup && addingAgents">
-                    <span ng-click='addMultipleAgents(false)' class='btn btn-info'>
+                    <span ng-click='addMultipleAgents(false)' class='wz-margin-top-3 kuiButton kuiButton--hollow'>
                         Cancel</span>
                     <span ng-hide='moreThan500' ng-click='saveAddAgents()' class='btn wz-button wz-margin-left-8'><i
                             aria-hidden='true' class='fa fa-fw fa-save'></i>
@@ -153,7 +153,7 @@
                                 </md-list-item>
                             </md-list>
                             <span flex></span>
-                            <a class='md-padding md-padding-top-10' ng-click='failedErrors = false'><i class="fa fa-times"
+                            <a class='md-padding md-padding-top-10' ng-click='clearFailedErrors()'><i class="fa fa-times"
                                     aria-hidden="true"></i></a>
                         </div>
                         <md-card-content>
diff --git a/public/templates/management/ruleset/decoders/decoders-detail.html b/public/templates/management/ruleset/decoders/decoders-detail.html
index f7202f786..5760bf8ac 100644
--- a/public/templates/management/ruleset/decoders/decoders-detail.html
+++ b/public/templates/management/ruleset/decoders/decoders-detail.html
@@ -150,7 +150,7 @@
     <!-- XML editor for rules -->
     <div layout="column" layout-align="start" ng-show="dctrl.editingFile">
         <div layout="row">
-            <span ng-click='dctrl.closeEditingFile()' class='btn btn-info'>Close</span>
+            <span ng-click='dctrl.closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
             <button ng-disabled='dctrl.xmlHasErrors || dctrl.doingSaving' ng-click='dctrl.doSaveConfig()'
                 class='btn wz-button pull-right wz-margin-left-8'>
                 <span ng-show='!dctrl.xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'
diff --git a/public/templates/management/ruleset/files/files.html b/public/templates/management/ruleset/files/files.html
index 094222623..f28c99b15 100644
--- a/public/templates/management/ruleset/files/files.html
+++ b/public/templates/management/ruleset/files/files.html
@@ -63,7 +63,7 @@
     <div flex layout="column">
         <div layout="row" class="wz-padding-bottom-14">
             <div ng-if="!newFile && !editorReadOnly">
-                <span ng-click='closeEditingFile()' class='btn btn-info'>Cancel</span>
+                <span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Cancel</span>
                 <button ng-if='mctrl.adminMode' ng-disabled='xmlHasErrors || doingSaving' ng-click='doSaveConfig(false)'
                     class='btn wz-button pull-right wz-margin-left-8'>
                     <span ng-show='!xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save'
@@ -76,11 +76,11 @@
             </div>
             <div ng-if="editorReadOnly">
                 <div layout="row" layout-align="start center">
-                    <span ng-click='closeEditingFile()' class='btn btn-info'>Close</span>
+                    <span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
                 </div>
             </div>
             <div ng-if="newFile" layout="row" class="wz-width-100">
-                <button ng-click="closeEditingFile()" class="height-35 kuiButton kuiButton--hollow">Cancel</button>
+                <button ng-click="closeEditingFile()" class="wz-margin-top-3 kuiButton kuiButton--hollow">Cancel</button>
                 <button ng-if='mctrl.adminMode' ng-disabled='xmlHasErrors || newFileName === "" || doingSaving || overwriteError'
                     ng-click='doSaveConfig(true,newFileName)'
                     class="kuiButton kuiButton--secondary height-35 wz-margin-left-8">
diff --git a/public/templates/management/ruleset/rules/rules-detail.html b/public/templates/management/ruleset/rules/rules-detail.html
index 5e68b3123..c3523db32 100644
--- a/public/templates/management/ruleset/rules/rules-detail.html
+++ b/public/templates/management/ruleset/rules/rules-detail.html
@@ -181,7 +181,7 @@
     <!-- XML editor for rules -->
     <div layout="column" layout-align="start" ng-show="editingFile">
         <div layout="row">
-            <span ng-click='closeEditingFile()' class='btn btn-info'>Close</span>
+            <span ng-click='closeEditingFile()' class='wz-margin-top-3 kuiButton kuiButton--hollow'>Close</span>
             <button ng-disabled='xmlHasErrors || doingSaving' ng-click='doSaveConfig()' class='btn wz-button pull-right wz-margin-left-8'>
                 <span ng-show='!xmlHasErrors'><i aria-hidden='true' class='fa fa-fw fa-save' ng-class="doingSaving ? 'fa-spin fa-spinner' : ''"></i>Save
                     file</span>