diff --git a/app/scripts/const/icon-map.js b/app/scripts/const/icon-map.js
index ef57e545..eadbec52 100644
--- a/app/scripts/const/icon-map.js
+++ b/app/scripts/const/icon-map.js
@@ -2,6 +2,8 @@ const IconMap = [
     'key',
     'globe',
     'triangle-exclamation',
+    'note-sticky',
+    'lightbulb',
     'server',
     'thumbtack',
     'comments',
@@ -10,6 +12,7 @@ const IconMap = [
     'plug',
     'address-card',
     'paperclip',
+    'markdown',
     'camera',
     'wifi',
     'link',
diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js
index 4a6db7f2..f47399d0 100644
--- a/app/scripts/views/fields/field-view-text.js
+++ b/app/scripts/views/fields/field-view-text.js
@@ -24,7 +24,7 @@ class FieldViewText extends FieldView {
             if (value && value.isProtected) {
                 value = value.getText();
             }
-            const converted = MdToHtml.convert(value);
+            const converted = MdToHtml.convert(value, true, false);
             if (converted.html) {
                 return converted.html;
             }
diff --git a/app/styles/areas/_generator.scss b/app/styles/areas/_generator.scss
index 10fb7f15..d4665a16 100644
--- a/app/styles/areas/_generator.scss
+++ b/app/styles/areas/_generator.scss
@@ -117,7 +117,7 @@
 
 /*
     Required if user hides / shows passphrases.
-    dots need to be wrapped in textfarea
+    dots need to be wrapped in textarea
 */
 
 .__pass-hidden {
diff --git a/app/styles/base/_icon-font.scss b/app/styles/base/_icon-font.scss
index dda8809a..28f46bf5 100644
--- a/app/styles/base/_icon-font.scss
+++ b/app/styles/base/_icon-font.scss
@@ -141,6 +141,9 @@ $fa-var-info: next-fa-glyph();
 $fa-var-circle-info: next-fa-glyph();
 $fa-var-key: next-fa-glyph();
 $fa-var-globe: next-fa-glyph();
+$fa-var-note-sticky: next-fa-glyph();
+$fa-var-note-sticky-o: next-fa-glyph();
+$fa-var-lightbulb: next-fa-glyph();
 $fa-var-triangle-exclamation: next-fa-glyph();
 $fa-var-circle-exclamation: next-fa-glyph();
 $fa-var-thumbtack: next-fa-glyph();
@@ -149,6 +152,7 @@ $fa-var-pen-to-square: next-fa-glyph();
 $fa-var-plug: next-fa-glyph();
 $fa-var-newspaper: next-fa-glyph();
 $fa-var-paperclip: next-fa-glyph();
+$fa-var-markdown: next-fa-glyph();
 $fa-var-camera: next-fa-glyph();
 $fa-var-wifi: next-fa-glyph();
 $fa-var-link: next-fa-glyph();
@@ -182,8 +186,6 @@ $fa-var-clock: next-fa-glyph();
 $fa-var-magnifying-glass: next-fa-glyph();
 $fa-var-flask: next-fa-glyph();
 $fa-var-gamepad: next-fa-glyph();
-$fa-var-note-sticky: next-fa-glyph();
-$fa-var-note-sticky-o: next-fa-glyph();
 $fa-var-circle-question: next-fa-glyph();
 $fa-var-cube: next-fa-glyph();
 $fa-var-folder-o: next-fa-glyph();
diff --git a/build/webpack.config.js b/build/webpack.config.js
index 19cb2294..77ac3176 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -186,7 +186,9 @@ module.exports = function (options) {
                             options: {
                                 esModule: false,
                                 importLoaders: 2,
-                                sourceMap: !devMode
+                                sourceMap: !devMode,
+                                url: true,
+                                import: true
                             }
                         },
                         {