diff --git a/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_big.png b/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_big.png
new file mode 100644
index 0000000000..8c64dc459e
Binary files /dev/null and b/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_big.png differ
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_small.png b/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_small.png
index 50c615ab1d..4851a1bd06 100644
Binary files a/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_small.png and b/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/arangodb_logo_small.png differ
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part b/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part
index 6bc3fca657..b5388886b2 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part
+++ b/js/apps/system/_admin/aardvark/APP/frontend/html/body.html.part
@@ -3,7 +3,8 @@
     <nav class="navbar">
       <div class="primary">
           <div class="navlogo">
-            <a class="logo" href="#"><img class="arangodbLogo" src="img/DEVLOGO.png"/></a>
+            <a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"/></a>
+            <a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"/></a>
           </div>
           <!-- <div id="progressPlaceholderIcon"></div> -->
             <div class="statmenu" id="statisticBar">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/img/DEVLOGO.png b/js/apps/system/_admin/aardvark/APP/frontend/img/DEVLOGO.png
deleted file mode 100644
index 41636f3751..0000000000
Binary files a/js/apps/system/_admin/aardvark/APP/frontend/img/DEVLOGO.png and /dev/null differ
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_big.png b/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_big.png
new file mode 100644
index 0000000000..6e610bf0bc
Binary files /dev/null and b/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_big.png differ
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_small.png b/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_small.png
index 08f22d4fc6..a9fc0a498e 100644
Binary files a/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_small.png and b/js/apps/system/_admin/aardvark/APP/frontend/img/arangodb_logo_small.png differ
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs
index 7befe4f0dc..f05e0d966f 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs
@@ -1,6 +1,7 @@
 <script id="collectionsItemView.ejs" type="text/template">
 <div class="paddingBox">
   <div class="borderBox"></div>
+<!--
   <div class="iconSet">
     <span id="editCollection_<%=model.get('name')%>" class="icon_arangodb_settings2" alt="Edit collection properties" title="Edit collection properties"></span>
     <% if(model.get('status') === "loaded") { %>
@@ -9,7 +10,7 @@
       <span class="icon_arangodb_info disabled" alt="disabled"></span>
     <%}%>
   </div>
-
+-->
   <i class="collection-type-icon fa <%= model.get('picture') %>"></i>
   <!--<img src="<%= model.get('picture') %>" height="50" width="50" alt="" class="icon">-->
   <div class="tileBadge">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js
index dfc87c0a02..5ca3301aef 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsView.js
@@ -27,7 +27,8 @@
         var callback = function(error, lockedCollections) {
           var self = this;
           if (error) {
-            arangoHelper.arangoError("Collections", "Could not check locked collections");
+            //arangoHelper.arangoError("Collections", "Could not check locked collections");
+            console.log("Could not check locked collections");
           }
           else {
             this.collection.each(function(model) {
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 824f39ac61..03a5a50aa9 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
@@ -91,6 +91,10 @@ $navbar-size: 150px;
   @extend %pull-left;
   height: 60px;
   width: 100%;
+
+  .small {
+    display: none;
+  }
 }
 
 .navmenu {
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_screenSizes.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_screenSizes.scss
index c3c23440a1..ac50b303a6 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_screenSizes.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_screenSizes.scss
@@ -29,6 +29,19 @@
   }
 
   // NAVIGATION LEFT
+
+  .navlogo {
+    .big {
+      display: none;
+    }
+
+    .small {
+      display: block;
+      height: auto;
+      width: 28px;
+    }
+  }
+
   .navbar,
   .navmenu,
   .primary,