diff --git a/Dockerfile b/Dockerfile
index 8d62ec2e4..9e6831997 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.14.0-alpine
+FROM node:10.15.0-alpine
 
 # Create app directory
 WORKDIR /usr/src/app
diff --git a/bin/build-server.sh b/bin/build-server.sh
index dfc0d9e7f..ee743c587 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=10.14.1
+NODE_VERSION=10.15.0
 
 rm -r $PKG_DIR
 mkdir $PKG_DIR
diff --git a/src/public/stylesheets/desktop.css b/src/public/stylesheets/desktop.css
index 6ac8cdcea..f5702870a 100644
--- a/src/public/stylesheets/desktop.css
+++ b/src/public/stylesheets/desktop.css
@@ -61,4 +61,18 @@
 
 #context-menu-container .dropdown-item {
     padding: 0 7px 0 10px;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 16px;
+    height: 16px;
+    margin-left: 6px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 12px;
+    height: 12px;
+    margin-top: 2px;
+    border-width: 1px;
+    border-style: solid;
 }
\ No newline at end of file
diff --git a/src/public/stylesheets/mobile.css b/src/public/stylesheets/mobile.css
index a37804c60..1655572d8 100644
--- a/src/public/stylesheets/mobile.css
+++ b/src/public/stylesheets/mobile.css
@@ -88,4 +88,18 @@ kbd {
 
 .dropdown-menu {
     font-size: larger;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 32px;
+    height: 32px;
+    margin-left: 4px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 20px;
+    height: 20px;
+    margin: 4px;
+    border-width: 2px;
+    border-style: solid;
 }
\ No newline at end of file
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 057946c0f..5e44ee9ed 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -16,13 +16,13 @@ body {
     flex-grow: 100;
 }
 
-.fancytree-node .fancytree-expander {
+.fancytree-node:not(.fancytree-loading) .fancytree-expander {
     background: none;
     width: auto;
     height: auto;
 }
 
-.fancytree-node .fancytree-expander:before {
+.fancytree-node:not(.fancytree-loading) .fancytree-expander:before {
     font-family: 'jam-icons' !important;
     speak: none;
     font-style: normal;
@@ -687,4 +687,26 @@ div[data-notify="container"] {
     margin: var(--ck-spacing-large) 0;
 
     color: #aaa;
+}
+
+.fancytree-loading span.fancytree-expander {
+    background-image: none !important;
+    display: inline-block;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    content: " ";
+    display: block;
+    border-radius: 50%;
+    border-color: #000 transparent #000 transparent;
+    animation: lds-dual-ring 1.2s linear infinite;
+}
+
+@keyframes lds-dual-ring {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
 }
\ No newline at end of file