diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js
index 308f597bf5..8cb4f80aca 100644
--- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js
+++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js
@@ -16613,7 +16613,7 @@ window.StatisticsCollection = Backbone.Collection.extend({
           tempColor = "red";
         }
         else {
-          tempColor = "green";
+          tempColor = "#7da817";
           p = "+";
         }
         $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
index 8497e1cb81..71987cd1c1 100644
--- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
+++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
@@ -1876,7 +1876,7 @@ a.inactive.coordinator, a.inactive.dbserver {
     fill: #d3d3d3; }
 
 ul.link-dropdown-menu, ul.user-dropdown-menu, ul.script-dropdown-menu, ul.gv-dropdown-menu {
-  background-color: #e4ecd9;
+  background-color: #F5F8F0;
   border-color: #666;
   border-style: solid;
   border-width: 1px;
@@ -1915,7 +1915,8 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, ul.script-dropdown-menu, ul.gv-dro
     background: #788f3d; }
 
 nav.navbar {
-  height: 38px;
+  padding-top: 6px;
+  height: 44px;
   margin-bottom: 3px;
   top: 0; }
   nav.navbar .arangodbLogo {
@@ -2400,7 +2401,7 @@ div .tile, div .bigtile {
   box-shadow: none;
   background-color: #fff;
   border-radius: 3px;
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   font-size: 14px;
   list-style: none;
   margin-bottom: 13px;
@@ -4661,10 +4662,11 @@ input.search-input {
 div.headerBar {
   background-color: #fff;
   border-radius: 3px;
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   color: #fff;
   font-size: 16px;
   height: 36px;
+  margin-top: 6px;
   margin-bottom: 5px;
   padding-left: 5px;
   padding-right: 5px;
@@ -4726,11 +4728,11 @@ div.headerBar > div.headerButtonBar {
   border-radius: 0;
   padding: 8px 0; }
   .breadcrumb .disabledBread {
-    color: #c2c2c2;
+    color: #666;
     float: left;
     padding-left: 5px; }
   .breadcrumb .activeBread {
-    color: #b9d375;
+    color: #7da817;
     float: left;
     padding-left: 5px; }
 
@@ -5100,7 +5102,7 @@ div .tile, div .bigtile {
   box-shadow: none;
   background-color: #fff;
   border-radius: 3px;
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   font-size: 14px;
   list-style: none;
   margin-bottom: 13px;
@@ -5274,7 +5276,7 @@ div .bigtile {
 
 .dashboard-large-chart {
   margin-right: 12px;
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   border-radius: 3px; }
   .dashboard-large-chart .dashboard-large-chart-inner {
     background-color: #fff;
@@ -5287,7 +5289,7 @@ div .bigtile {
       margin-bottom: 0; }
 
 .dashboard-small-chart {
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   border-radius: 3px; }
   .dashboard-small-chart .dashboard-small-chart-inner {
     background-color: #fff;
@@ -5315,7 +5317,7 @@ div .bigtile {
   .dashboard-medium-chart .dashboard-interior-chart {
     margin-bottom: 0; }
   .dashboard-medium-chart .dashboard-medium-chart-outer {
-    border: 1px solid rgba(243, 247, 237, 0.75);
+    border: 1px solid rgba(104, 103, 102, 0.1);
     border-radius: 3px; }
   .dashboard-medium-chart .dashboard-medium-chart-menu {
     -moz-border-radius: 2px;
@@ -5337,7 +5339,7 @@ div .bigtile {
     stroke-width: 1.5px; }
 
 .dashboard-tendency-container {
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   border-radius: 3px; }
   .dashboard-tendency-container .dashboard-tendency-chart {
     background-color: #fff;
@@ -5361,7 +5363,7 @@ div .bigtile {
         text-align: center; }
 
 .dashboard-bar-chart-container {
-  border: 1px solid rgba(243, 247, 237, 0.75);
+  border: 1px solid rgba(125, 168, 23, 0.01);
   border-radius: 3px; }
   .dashboard-bar-chart-container .dashboard-bar-chart {
     background-color: #fff;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentView.ejs
index dc25674d5c..c40a948ad5 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentView.ejs
@@ -42,7 +42,7 @@
 
   </div>
 
-  <div id="tableDiv" class="innerContent">
+  <div id="tableDiv" class="innerContent document-content-div">
 
     <div id="documentEditor" class="document-editor"></div>
     <div class="bottomButtonBar">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
index fcc797787a..3404dc35c9 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
@@ -209,7 +209,7 @@
           tempColor = "red";
         }
         else {
-          tempColor = "green";
+          tempColor = "#7da817";
           p = "+";
         }
         $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
index f2dd92aef6..a5b87647bc 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
@@ -949,7 +949,12 @@
         );
         total = $('#totalDocuments');
       }
-      total.html(this.collection.getTotal() + " document(s)");
+      if (this.type === 'document') {
+        total.html(this.collection.getTotal() + " document(s)");
+      }
+      if (this.type === 'edge') {
+        total.html(this.collection.getTotal() + " edge(s)");
+      }
     },
 
     breadcrumb: function () {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_abstracts.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_abstracts.scss
index 65a70c3f3f..ff758cd976 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_abstracts.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_abstracts.scss
@@ -219,7 +219,7 @@
 %dropdown-menu {
   @extend %pull-left;
 
-  background-color: #e4ecd9;
+  background-color: $c-lightgreen-transp-bg;
   border: {
     color: $c-darker-grey;
     style: solid;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_arangoTable.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_arangoTable.scss
index 37778ec82d..89287af1a6 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_arangoTable.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_arangoTable.scss
@@ -18,7 +18,7 @@
     }
 
     tr:nth-child(odd) {
-      background: $c-lightgreen-transp-bg;
+      background: $c-table-odd-color;
     }
 
     td {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_colors.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_colors.scss
index fb1aef4835..efa2dab3fb 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_colors.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_colors.scss
@@ -13,6 +13,8 @@ $c-lightgreen-2-transp-bg: #F5F8F0;
 $c-positive: #8aa051;
 $c-positive-hover: #788f3d;
 
+$c-table-odd-color: rgba(104, 103, 102, 0.05);
+
 $c-negative: #da4f49;
 $c-negative-hover: #be342e;
 $c-negative-bg: desaturate(lighten($c-negative-hover, 40%), 50%);
@@ -126,7 +128,7 @@ $c-api-docs-bg: #f4f3f3;
 $c-api-docs-bg-input: #8f8d8c;
 
 $c-breadcrumb-bg: #f5f5f5;
-$c-breadcrumb-a-active-bread: rgba(185, 211, 117, 1);
+$c-breadcrumb-a-active-bread: #7da817;
 $c-breadcrumb-a-active-bread-transp: rgba(185, 211, 117, 0.2);
 
 $c-logs-table-id-thead-bg: #f9f9f9;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss
index f635faf85b..532091928d 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss
@@ -67,7 +67,7 @@ table.arangoDataTable tr.even {
 
 .api-container #resources > li.resource:nth-child(odd),
 table.arangoDataTable tr.odd {
-  background-color: $c-breadcrumb-a-active-bread-transp;
+  background-color: $c-table-odd-color;
 }
 
 // TODO Hard cleanup
@@ -114,7 +114,7 @@ table.arangoDataTable tr.odd {
   color: $c-darker-grey;
   font-weight: 100;
   float: left;
-  margin-top: -56px !important;
+  margin-top: -37px !important;
   padding-left: 10px;
 }
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentView.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentView.scss
index 1da21e5c03..56d36200df 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentView.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentView.scss
@@ -3,6 +3,10 @@
   min-height: 0;
 }
 
+.document-content-div {
+  margin-top: 10px;
+}
+
 .document-info {
 
   background-color: #fff;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
index 54bb7c38a5..b1a801d0dc 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
@@ -13,7 +13,7 @@
   min-height: 200px;
   background-color: $c-white;
   border-radius: 3px;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.10);
   padding-top: 13px;
 }
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_headerBar.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_headerBar.scss
index 460b9fddad..4b7e1636a4 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_headerBar.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_headerBar.scss
@@ -74,10 +74,11 @@ input.search-input {
 div.headerBar {
   background-color: $c-white;
   border-radius: 3px;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.10);
   color: $c-white;
   font-size: 16px;
   height: 36px;
+  margin-top: 6px;
   margin-bottom: 5px;
   padding-left: 5px;
   padding-right: 5px;
@@ -172,7 +173,7 @@ div.headerBar > div.headerButtonBar {
 
   // Disabled breadcrumb
   .disabledBread {
-    color: $c-c2grey;
+    color: $c-darker-grey;
     float: left;
     padding-left: 5px;
   }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
index 513309878f..2a0764985c 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
@@ -15,7 +15,8 @@
 
 nav.navbar {
   @extend %fixedbar;
-  height: 38px;
+  padding-top: 6px;
+  height: 44px;
   margin-bottom: 3px;
   top: 0;
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss
index 560e252760..52a0e829b7 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss
@@ -42,7 +42,7 @@
 .dashboard-large-chart {
   @extend %dashboard-chart-basic;
   margin-right: 12px;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.10);
   border-radius: 3px;
 
   .dashboard-large-chart-inner {
@@ -65,7 +65,7 @@
 
 .dashboard-small-chart {
   @extend %dashboard-chart-basic;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.10);
   border-radius: 3px;
 
   .dashboard-small-chart-inner {
@@ -114,7 +114,7 @@
   }
 
   .dashboard-medium-chart-outer {
-    border: 1px solid rgba(243,247,237,0.75);
+    border: 1px solid rgba(104, 103, 102, 0.10);
     border-radius: 3px;
   }
 
@@ -151,7 +151,7 @@
 .dashboard-tendency-container {
   @extend %dashboard-chart-box;
   @extend %dashboard-chart-basic;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.10);
   border-radius: 3px;
 
   .dashboard-tendency-chart {
@@ -193,7 +193,7 @@
 .dashboard-bar-chart-container {
   @extend %dashboard-chart-box;
   @extend %dashboard-chart-basic;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(125, 168, 23, 0.01);
   border-radius: 3px;
 
   .dashboard-bar-chart {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_pagination.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_pagination.scss
index 3b197e30e9..0cd0cbfe71 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_pagination.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_pagination.scss
@@ -7,6 +7,7 @@
 
 .pagination-line {
   margin: 20px 0;
+  margin-bottom: 0;
   padding-top: 12px;
   text-align: center;
   margin-top: 0;
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss
index f2b19c1935..693fa15764 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss
@@ -16,7 +16,7 @@ $iconsize: 50px;
 
   background-color: $c-white;
   border-radius: 3px;
-  border: 1px solid rgba(243,247,237,0.75);
+  border: 1px solid rgba(104, 103, 102, 0.1);
   font-size: 14px;
   list-style: none;
   margin: {