diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html
index a068494e80..1574f201ef 100644
--- a/mayan/apps/appearance/templates/appearance/base.html
+++ b/mayan/apps/appearance/templates/appearance/base.html
@@ -84,6 +84,11 @@
                 .document-page-content-divider {
                     text-align: center;
                 }
+
+                .label-tag {
+                    text-shadow: 0px 0px 2px #000
+                }
+
             </style>
             {% block stylesheets %}{% endblock %}
 
diff --git a/mayan/apps/tags/widgets.py b/mayan/apps/tags/widgets.py
index fca5b93112..8c3232f845 100644
--- a/mayan/apps/tags/widgets.py
+++ b/mayan/apps/tags/widgets.py
@@ -12,22 +12,17 @@ def get_tags_inline_widget_simple(document):
 
     tag_count = document.tags.count()
     if tag_count:
-        tags_template.append('<div class="bs-component">')
         for tag in document.tags.all():
             tags_template.append(get_single_tag_template(tag))
 
-        tags_template.append('</div>')
-
     return mark_safe(''.join(tags_template))
 
 
 def single_tag_widget(tag):
     tags_template = []
-    tags_template.append('<div class="bs-component">')
     tags_template.append(get_single_tag_template(tag))
-    tags_template.append('</div>')
     return mark_safe(''.join(tags_template))
 
 
 def get_single_tag_template(tag):
-    return '<span class="label" style="background: %s">%s</span>' % (tag.get_color_code(), escape(tag.label).replace(' ', '&nbsp;'))
+    return '<span class="label label-tag" style="background: %s">%s</span>' % (tag.get_color_code(), escape(tag.label).replace(' ', '&nbsp;'))