diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index a6e6deb3b..b26bf5d29 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -165,9 +165,10 @@ Zotero.CollectionTreeView.prototype.refresh = function()
 	}
 	
 	var deletedItems = Zotero.Items.getDeleted();
-	if (deletedItems) {
+	if (deletedItems || Zotero.Prefs.get("showTrashWhenEmpty")) {
 		this._showItem(new Zotero.ItemGroup('trash', null), 0, this._dataItems.length);
 	}
+	this.trashNotEmpty = !!deletedItems;
 	
 	this._refreshHashMap();
 	
@@ -375,6 +376,9 @@ Zotero.CollectionTreeView.prototype.getCellText = function(row, column)
 Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col)
 {
 	var collectionType = this._getItemAtRow(row).type;
+	if (collectionType == 'trash' && this.trashNotEmpty) {
+		collectionType += "-full";
+	}
 	return "chrome://zotero/skin/treesource-" + collectionType + ".png";
 }
 
diff --git a/chrome/skin/default/zotero/treesource-trash-full.png b/chrome/skin/default/zotero/treesource-trash-full.png
new file mode 100644
index 000000000..ebad933c8
Binary files /dev/null and b/chrome/skin/default/zotero/treesource-trash-full.png differ
diff --git a/chrome/skin/default/zotero/treesource-trash.png b/chrome/skin/default/zotero/treesource-trash.png
new file mode 100644
index 000000000..afe22ba99
Binary files /dev/null and b/chrome/skin/default/zotero/treesource-trash.png differ
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index da2b0247a..94ae19358 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -33,6 +33,7 @@ pref("extensions.zotero.capitalizeTitles", true);
 pref("extensions.zotero.launchNonNativeFiles", false);
 pref("extensions.zotero.sortNotesChronologically", false);
 pref("extensions.zotero.sortAttachmentsChronologically", false);
+pref("extensions.zotero.showTrashWhenEmpty", true);
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
 pref("extensions.zotero.lastAbstractExpand",0);