diff --git a/public/images/icons/code-folder.png b/public/images/icons/code-folder.png
new file mode 100644
index 000000000..2a33cd909
Binary files /dev/null and b/public/images/icons/code-folder.png differ
diff --git a/public/images/icons/code.png b/public/images/icons/code.png
new file mode 100644
index 000000000..8a8c722dd
Binary files /dev/null and b/public/images/icons/code.png differ
diff --git a/public/images/icons/file-shaded.png b/public/images/icons/file-shaded.png
deleted file mode 100644
index 3dd43563a..000000000
Binary files a/public/images/icons/file-shaded.png and /dev/null differ
diff --git a/public/images/icons/folder-shaded.png b/public/images/icons/folder-shaded.png
deleted file mode 100644
index c8eccd7a5..000000000
Binary files a/public/images/icons/folder-shaded.png and /dev/null differ
diff --git a/public/javascripts/note_tree.js b/public/javascripts/note_tree.js
index 52dbe1eca..7831e46e2 100644
--- a/public/javascripts/note_tree.js
+++ b/public/javascripts/note_tree.js
@@ -150,6 +150,10 @@ const noteTree = (function() {
             extraClasses.push("multiple-parents");
         }
 
+        if (note.type === 'code') {
+            extraClasses.push("code");
+        }
+
         return extraClasses.join(" ");
     }
 
diff --git a/public/javascripts/protected_session.js b/public/javascripts/protected_session.js
index 6465f1f1e..a903fecdc 100644
--- a/public/javascripts/protected_session.js
+++ b/public/javascripts/protected_session.js
@@ -4,6 +4,7 @@ const protected_session = (function() {
     const dialogEl = $("#protected-session-password-dialog");
     const passwordFormEl = $("#protected-session-password-form");
     const passwordEl = $("#protected-session-password");
+    const noteDetailWrapperEl = $("#note-detail-wrapper");
 
     let protectedSessionDeferred = null;
     let lastProtectedSessionOperationDate = null;
@@ -24,6 +25,8 @@ const protected_session = (function() {
         if (requireProtectedSession && !isProtectedSessionAvailable()) {
             protectedSessionDeferred = dfd;
 
+            noteDetailWrapperEl.hide();
+
             dialogEl.dialog({
                 modal: modal,
                 width: 400,
@@ -63,6 +66,8 @@ const protected_session = (function() {
         if (protectedSessionDeferred !== null) {
             ensureDialogIsClosed(dialogEl, passwordEl);
 
+            noteDetailWrapperEl.show();
+
             protectedSessionDeferred.resolve();
 
             protectedSessionDeferred = null;
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 9c62d9083..8ae07963e 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -30,7 +30,7 @@
     overflow: auto;
 }
 
-#note-detail-wrapper.protected {
+#note-detail-wrapper.protected, #note-detail-wrapper.protected .CodeMirror {
     background-color: #eee;
 }
 
@@ -56,14 +56,18 @@ span.fancytree-node.fancytree-folder > span.fancytree-icon {
     background-image: url("../images/icons/folder.png");
 }
 
-span.fancytree-node.protected > span.fancytree-icon {
+span.fancytree-node.code > span.fancytree-icon {
     background-position: 0 0;
-    background-image: url("../images/icons/file-shaded.png");
+    background-image: url("../images/icons/code.png");
 }
 
-span.fancytree-node.protected.fancytree-folder > span.fancytree-icon {
+span.fancytree-node.fancytree-folder.code > span.fancytree-icon {
     background-position: 0 0;
-    background-image: url("../images/icons/folder-shaded.png");
+    background-image: url("../images/icons/code-folder.png");
+}
+
+span.fancytree-node.protected > span.fancytree-icon {
+    filter: drop-shadow(2px 2px 2px black);
 }
 
 span.fancytree-node.multiple-parents .fancytree-title {
diff --git a/routes/api/tree.js b/routes/api/tree.js
index 28ec177d1..36962c90b 100644
--- a/routes/api/tree.js
+++ b/routes/api/tree.js
@@ -15,7 +15,8 @@ router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
       SELECT 
         notes_tree.*, 
         notes.note_title, 
-        notes.is_protected
+        notes.is_protected,
+        notes.type
       FROM 
         notes_tree 
       JOIN 
diff --git a/services/tree.js b/services/tree.js
index 9a6ee257b..4daf18bc0 100644
--- a/services/tree.js
+++ b/services/tree.js
@@ -2,7 +2,6 @@
 
 const sql = require('./sql');
 const sync_table = require('./sync_table');
-const data_encryption = require('./data_encryption');
 
 async function validateParentChild(res, parentNoteId, childNoteId, noteTreeId = null) {
     const existing = await getExistingNoteTree(parentNoteId, childNoteId);