diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx
index 8dbb55fe4e..5028afb2ac 100644
--- a/chrome/content/zotero/itemTree.jsx
+++ b/chrome/content/zotero/itemTree.jsx
@@ -2616,7 +2616,12 @@ var ItemTree = class ItemTree extends LibraryTree {
 		textSpan.dir = 'auto';
 		textSpan.setAttribute('aria-label', textSpanAriaLabel);
 
-		span.append(retracted, textSpan, ...tagSpans);
+		if (Zotero.Prefs.get('ui.tagsAfterTitle')) {
+			span.append(retracted, textSpan, ...tagSpans);
+		}
+		else {
+			span.append(retracted, ...tagSpans, textSpan);
+		}
 
 		return span;
 	}
diff --git a/scss/components/_item-tree.scss b/scss/components/_item-tree.scss
index 6472155160..89c27ddddf 100644
--- a/scss/components/_item-tree.scss
+++ b/scss/components/_item-tree.scss
@@ -103,6 +103,11 @@
 				transform: scaleX(-1);
 				display: flex;
 			}
+
+			.icon-item-type + .tag-swatch,
+			.icon-item-type + .colored-tag-swatches {
+				margin-left: 4px;
+			}
 			
 			.tag-swatch {
 				display: inline-block;