diff --git a/CHANGELOG b/CHANGELOG
index f6a77a9e0d..ed6003a797 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* fixed issue #5943: misplaced database ui icon and wrong cursor type were used
+
 * fixed issue #5354: updated the web UI JSON editor, improved usability
 
 * fixed issue #5648: fixed error message when saving unsupported document types
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/databaseIcon.svg b/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/databaseIcon.svg
deleted file mode 100644
index 2fb6d81e74..0000000000
--- a/js/apps/system/_admin/aardvark/APP/frontend/compressed-img/databaseIcon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- The icon can be used freely in both personal and commercial projects with no attribution required, but always appreciated. 
-You may NOT sub-license, resell, rent, redistribute or otherwise transfer the icon without express written permission from iconmonstr.com -->
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<path id="database-icon" d="M422.122,355.606v46.524C422.122,435.196,347.747,462,256,462c-91.747,0-166.122-26.804-166.122-59.869
-	v-46.524c10.283,7.391,23.186,13.907,38.485,19.422C162.918,387.481,208.248,394.34,256,394.34
-	c47.753,0,93.082-6.858,127.638-19.312C398.938,369.514,411.839,362.997,422.122,355.606z M383.638,277.788
-	c-34.556,12.454-79.885,19.312-127.638,19.312c-47.752,0-93.082-6.858-127.638-19.312c-15.299-5.514-28.201-12.03-38.484-19.421
-	v46.104c0,33.065,74.375,59.869,166.122,59.869c91.747,0,166.122-26.804,166.122-59.869v-46.104
-	C411.839,265.758,398.938,272.274,383.638,277.788z M256,50c-91.747,0-166.122,26.805-166.122,59.87
-	c0,33.066,74.375,59.871,166.122,59.871c91.747,0,166.122-26.805,166.122-59.871C422.122,76.805,347.747,50,256,50z
-	 M383.638,180.428C349.082,192.881,303.753,199.74,256,199.74c-47.752,0-93.082-6.859-127.638-19.312
-	c-15.299-5.514-28.201-12.031-38.484-19.422v46.225c0,33.065,74.375,59.87,166.122,59.87c91.747,0,166.122-26.805,166.122-59.87
-	v-46.224C411.839,168.397,398.938,174.914,383.638,180.428z"/>
-</svg>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/databaseView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/databaseView.ejs
index 3876a375c5..9b1f1ae4f3 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/databaseView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/databaseView.ejs
@@ -51,7 +51,7 @@
       %>
 
       <% if (name !== '_system') { %>
-        <div class="tile pure-u-1-1 pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4 pure-u-xl-1-6">
+        <div class="tile pure-u-1-1 pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4 pure-u-xl-1-6 defaultCursor">
           <div class="fullBorderBox" style="border: 0;">
             <div class="borderBox"></div>
             <div class="iconSet">
@@ -59,7 +59,7 @@
                 <span class="icon_arangodb_settings2 editDatabase" id="<%=name %>_edit-database" alt="Edit database" title="Edit database"></span>
               <% } %>
             </div>
-            <img src="img/databaseIcon.svg" class="tile-icon-svg svgToReplace"/>
+            <i class="collection-type-icon fa fa-database defaultCursor"></i>
             <div class="tileBadge">
             </div>
             <h5 class="collectionName" style="margin-left: 0; margin-right: 0;"><%=name %></h5>
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 cbf73a8b8a..1d95faa2da 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
@@ -90,7 +90,10 @@
     position: absolute;
     right: -1px;
   }
+}
 
+.defaultCursor {
+  cursor: default !important;
 }
 
 //still in use???