diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index 80cf305d1..f35fc6afa 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -142,7 +142,7 @@ ScholarItemPane = new function()
 					label.setAttribute('crop','end');
 				
 					var box = document.createElement('box');
-					box.setAttribute('onclick',"ScholarPane.openNoteWindow("+notes[i].getID()+");");
+					box.setAttribute('onclick',"ScholarPane.selectItem("+notes[i].getID()+");");
 					box.setAttribute('class','clicky');
 					box.appendChild(icon);
 					box.appendChild(label);
@@ -174,7 +174,24 @@ ScholarItemPane = new function()
 				for(var i = 0; i < files.length; i++)
 				{
 					var icon = document.createElement('image');
-					icon.setAttribute('src','chrome://scholar/skin/treeitem-file.png');
+					var linkMode = files[i].getFileLinkMode();
+					if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_FILE)
+					{
+						itemType = "-file";
+					}
+					else if(linkMode == Scholar.Files.LINK_MODE_LINKED_FILE)
+					{
+						itemType = "-link";
+					}
+					else if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_URL)
+					{
+						itemType = "-snapshot";
+					}
+					else if(linkMode == Scholar.Files.LINK_MODE_LINKED_URL)
+					{
+						itemType = "-web-link";
+					}
+					icon.setAttribute('src','chrome://scholar/skin/treeitem-file'+itemType+'.png');
 				
 					var label = document.createElement('label');
 					label.setAttribute('value',files[i].getField('title'));
@@ -182,7 +199,7 @@ ScholarItemPane = new function()
 					label.setAttribute('crop','end');
 				
 					var box = document.createElement('box');
-//					box.setAttribute('onclick',"window.open('"+files[i].getFileURL()+"')");
+					box.setAttribute('onclick',"ScholarPane.selectItem('"+files[i].getID()+"')");
 					box.setAttribute('class','clicky');
 					box.appendChild(icon);
 					box.appendChild(label);
diff --git a/chrome/chromeFiles/content/scholar/itemTreeView.js b/chrome/chromeFiles/content/scholar/itemTreeView.js
index 0cfa33dc0..3face4f9b 100644
--- a/chrome/chromeFiles/content/scholar/itemTreeView.js
+++ b/chrome/chromeFiles/content/scholar/itemTreeView.js
@@ -198,7 +198,28 @@ Scholar.ItemTreeView.prototype.getImageSrc = function(row, col)
 {
 	if(col.id == 'title')
 	{
-		var itemType = Scholar.ItemTypes.getName(this._getItemAtRow(row).getType());
+		var item = this._getItemAtRow(row);
+		var itemType = Scholar.ItemTypes.getName(item.getType());
+		if(itemType == 'file')
+		{
+			var linkMode = item.ref.getFileLinkMode();
+			if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_FILE)
+			{
+				itemType = itemType + "-file";
+			}
+			else if(linkMode == Scholar.Files.LINK_MODE_LINKED_FILE)
+			{
+				itemType = itemType + "-link";
+			}
+			else if(linkMode == Scholar.Files.LINK_MODE_IMPORTED_URL)
+			{
+				itemType = itemType + "-snapshot";
+			}
+			else if(linkMode == Scholar.Files.LINK_MODE_LINKED_URL)
+			{
+				itemType = itemType + "-web-link";
+			}
+		}
 		
 		return "chrome://scholar/skin/treeitem-"+itemType+".png";
 	}
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png b/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png
deleted file mode 100755
index d5bfa0719..000000000
Binary files a/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png and /dev/null differ
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 1bca80244..d9dff0cd7 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -96,27 +96,22 @@
 
 #tb-item-files-file
 {
-	list-style-image: url('chrome://scholar/skin/item-files-add.png');
+	list-style-image: url('chrome://scholar/skin/treeitem-file-file.png');
 }
 
 #tb-item-files-link
 {
-	list-style-image: url('chrome://scholar/skin/item-files-link.png');
+	list-style-image: url('chrome://scholar/skin/treeitem-file-link.png');
 }
 
 #tb-item-files-snapshot
 {
-	list-style-image: url('chrome://scholar/skin/item-files-snapshot.png');
+	list-style-image: url('chrome://scholar/skin/treeitem-file-snapshot.png');
 }
 
 #tb-item-files-web-link
 {
-	list-style-image: url('chrome://scholar/skin/item-files-web-link.png');
-}
-
-#tb-item-menu
-{
-	list-style-image: url('chrome://scholar/skin/cog.png');
+	list-style-image: url('chrome://scholar/skin/treeitem-file-web-link.png');
 }
 
 #tb-fullscreen
@@ -156,11 +151,6 @@
 	margin-left: 5px;
 }
 
-#scholar-view-item tabpanels
-{
-	padding: 8px 0px 0px 0px;
-}
-
 #scholar-splitter
 {
 	border-top: none;
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png
new file mode 100755
index 000000000..8b8b1ca00
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-file-file.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-link.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-link.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/item-files-link.png
rename to chrome/chromeFiles/skin/default/scholar/treeitem-file-link.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png
new file mode 100755
index 000000000..03ddd799f
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/treeitem-file-snapshot.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-web-link.png b/chrome/chromeFiles/skin/default/scholar/treeitem-file-web-link.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/item-files-web-link.png
rename to chrome/chromeFiles/skin/default/scholar/treeitem-file-web-link.png