diff --git a/app/assets/images/folder-black.png b/app/assets/images/folder-black.png
deleted file mode 100644
index 6f29a0286..000000000
Binary files a/app/assets/images/folder-black.png and /dev/null differ
diff --git a/app/assets/images/folder-black.svg b/app/assets/images/folder-black.svg
deleted file mode 100644
index b621fb099..000000000
--- a/app/assets/images/folder-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="26" height="20" viewBox="0 0 26 20"><path d="M10.3 0H0v20h26V4H12l-1.5-4h-.2z" fill="#dee0e2"/><path d="M9.1 2l1 2.7.5 1.3H24v12H2V2h7.1m1.4-2H0v20h26V4H12l-1.5-4z" fill="#0b0c0c"/></svg>
diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index ef867af2b..c4833d8dc 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -121,12 +121,13 @@
   white-space: nowrap;
 
 
-  a:first-child,
-  &-folder {
+  a,
+  &-folder,
+  &-subfolder {
 
     display: inline-block;
     vertical-align: top;
-    padding: 5px 0 0 60px;
+    padding: 5px 0 0 0;
     background-repeat: no-repeat;
     background-size: 38px auto;
     background-position: 0 1px;
@@ -139,8 +140,9 @@
     display: inline-block;
     vertical-align: top;
 
-    &:first-child {
+    &.folder-heading-folder {
 
+      padding: 5px 0 0 60px;
       background-image: file-url('folder-blue.svg');
       max-width: 33%;
       overflow: hidden;
@@ -154,23 +156,6 @@
 
   }
 
-  &-folder {
-
-    padding-left: 0;
-
-    &:first-child {
-
-      background-image: file-url('folder-black.svg');
-      padding-left: $gutter * 2;
-
-      @include ie-lte(8) {
-        background-image: file-url('folder-black.png');
-      }
-
-    }
-
-  }
-
   &-separator {
 
     display: inline-block;
diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html
index d342465b5..bfcadd3bc 100644
--- a/app/templates/components/folder-path.html
+++ b/app/templates/components/folder-path.html
@@ -17,7 +17,7 @@
           <span class="folder-heading-folder">{{ folder.name }}</span>
         {% else %}
           {% if folder.id %}
-            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
+            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}" class="folder-heading-folder">{{ folder.name }}</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% else %}
             <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type) }}">Templates</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% endif %}