diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index 8619ccee50..3d9a67ae70 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -180,7 +180,7 @@ ScholarItemPane = new function()
 					label.setAttribute('crop','end');
 				
 					var box = document.createElement('box');
-//					box.setAttribute('onclick',"ScholarPane.openNoteWindow("+files[i].getID()+");");
+//					box.setAttribute('onclick',"window.open('"+files[i].getFileURL()+"')");
 					box.setAttribute('class','clicky');
 					box.appendChild(icon);
 					box.appendChild(label);
@@ -440,7 +440,7 @@ ScholarItemPane = new function()
 				file.erase();
 	}
 	
-	function addFileFromDialog()
+	function addFileFromDialog(link)
 	{
 		var nsIFilePicker = Components.interfaces.nsIFilePicker;
 		var fp = Components.classes["@mozilla.org/filepicker;1"]
@@ -448,12 +448,20 @@ ScholarItemPane = new function()
 		fp.init(window, "Select a File", nsIFilePicker.modeOpen);
 		
 		if(fp.show() == nsIFilePicker.returnOK)
-			Scholar.Files.importFromFile(fp.file, _itemBeingEdited.getID());
+		{
+			if(link)
+				Scholar.Files.linkFromFile(fp.file, _itemBeingEdited.getID());
+			else
+				Scholar.Files.importFromFile(fp.file, _itemBeingEdited.getID());
+		}
 	}
 	
-	function addFileFromPage()
+	function addFileFromPage(link)
 	{
-		Scholar.Files.importFromDocument(window.content.document, _itemBeingEdited.getID());
+		if(link)
+			Scholar.Files.linkFromDocument(window.content.document, _itemBeingEdited.getID());
+		else
+			Scholar.Files.importFromDocument(window.content.document, _itemBeingEdited.getID());
 	}
 }
 
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index 23f0eeb591..89fc9f029c 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -37,8 +37,10 @@
 			<vbox flex="1">
 				<hbox align="center">
 					<label id="editpane-files-label"/>
-					<button label="Add File..." oncommand="ScholarItemPane.addFileFromDialog();"/>
-					<button label="Save Page" oncommand="ScholarItemPane.addFileFromPage();"/>
+					<toolbarbutton id="tb-item-files-add" tooltiptext="Add File..." oncommand="ScholarItemPane.addFileFromDialog();"/>
+					<toolbarbutton id="tb-item-files-link" tooltiptext="Link to File..." oncommand="ScholarItemPane.addFileFromDialog(true);"/>
+					<toolbarbutton id="tb-item-files-snapshot" tooltiptext="Save Snapshot" oncommand="ScholarItemPane.addFileFromPage();"/>
+					<toolbarbutton id="tb-item-files-web-link" tooltiptext="Link to Page" oncommand="ScholarItemPane.addFileFromPage(true);"/>
 				</hbox>
 				<grid flex="1">
 					<columns>
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-add.png b/chrome/chromeFiles/skin/default/scholar/item-files-add.png
new file mode 100755
index 0000000000..aa23dde374
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/item-files-add.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-link.png b/chrome/chromeFiles/skin/default/scholar/item-files-link.png
new file mode 100755
index 0000000000..bf7bd1c9bf
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/item-files-link.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png b/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png
new file mode 100755
index 0000000000..d5bfa0719b
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/item-files-snapshot.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/item-files-web-link.png b/chrome/chromeFiles/skin/default/scholar/item-files-web-link.png
new file mode 100755
index 0000000000..312eab0914
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/item-files-web-link.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 4cd25b57f6..7f3032c3c2 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -89,6 +89,26 @@
 	list-style-image: url('chrome://scholar/skin/toolbar-note-add.png');
 }
 
+#tb-item-files-add
+{
+	list-style-image: url('chrome://scholar/skin/item-files-add.png');
+}
+
+#tb-item-files-link
+{
+	list-style-image: url('chrome://scholar/skin/item-files-link.png');
+}
+
+#tb-item-files-snapshot
+{
+	list-style-image: url('chrome://scholar/skin/item-files-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');