diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js
index 066dfface..ebbc1779d 100644
--- a/chrome/chromeFiles/content/scholar/overlay.js
+++ b/chrome/chromeFiles/content/scholar/overlay.js
@@ -56,6 +56,8 @@ var ScholarPane = new function()
 			newSplitter.setAttribute('resizeafter','closest');
 			appContent.removeChild(oldSplitter);
 			appContent.insertBefore(newSplitter, document.getElementById('content'));
+			
+			document.getElementById('tb-fullscreen').setAttribute('scholartop','true');
 		}
 		
 		//Initialize collections view
@@ -100,7 +102,10 @@ var ScholarPane = new function()
 		document.getElementById('scholar-splitter').setAttribute('collapsed',!visible);
 		
 		if(!visible)
+		{
 			document.getElementById('content').setAttribute('collapsed', false);
+			document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', false);
+		}
 	}
 	
 	function fullScreen()
@@ -108,6 +113,7 @@ var ScholarPane = new function()
 		var visible = document.getElementById('content').getAttribute('collapsed') == 'true';
 		document.getElementById('content').setAttribute('collapsed', !visible);
 		document.getElementById('scholar-splitter').setAttribute('collapsed', !visible);
+		document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', !visible);
 	}
 		
 	/*
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index f26a12b13..f38bf8d2d 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -81,7 +81,7 @@
 					<toolbarbutton id="tb-add" tooltiptext="&toolbar.newItem.label;" type="menu">
 						<menupopup/>
 					</toolbarbutton>
-					<toolbarbutton label="New Note" oncommand="ScholarPane.newNote();"/>
+					<toolbarbutton id="tb-note-add" tooltiptext="New Standalone Note" oncommand="ScholarPane.newNote();"/>
 					<spacer flex="1"/>
 					<label value="&toolbar.search.label;" control="tb-search"/>
 					<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search"/>
@@ -152,7 +152,7 @@
 			<splitter id="scholar-view-splitter" resizebefore="closest" resizeafter="closest"/>
 			<vbox>
 				<toolbar align="right">
-					<toolbarbutton id="tb-fullscreen" label="Toggle Fullscreen" oncommand="ScholarPane.fullScreen();"/>
+					<toolbarbutton id="tb-fullscreen" tooltiptext="Toggle Fullscreen Mode" oncommand="ScholarPane.fullScreen();"/>
 					<toolbarbutton class="tabs-closebutton" oncommand="ScholarPane.toggleDisplay()"/>
 				</toolbar>
 				<groupbox flex="1">
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/scholar/overlay.css
index 7b5fc90f6..4cd25b57f 100644
--- a/chrome/chromeFiles/skin/default/scholar/overlay.css
+++ b/chrome/chromeFiles/skin/default/scholar/overlay.css
@@ -84,11 +84,32 @@
 	list-style-image: url('chrome://scholar/skin/toolbar-item-add.png');
 }
 
+#tb-note-add
+{
+	list-style-image: url('chrome://scholar/skin/toolbar-note-add.png');
+}
+
 #tb-item-menu
 {
 	list-style-image: url('chrome://scholar/skin/cog.png');
 }
 
+#tb-fullscreen
+{
+	list-style-image: url('chrome://scholar/skin/toolbar-fullscreen-bottom.png');
+}
+
+#tb-fullscreen[scholartop="true"]
+{
+	list-style-image: url('chrome://scholar/skin/toolbar-fullscreen-top.png');
+}
+
+#tb-fullscreen[fullscreenmode="true"]
+{
+	background: #666666;
+	-moz-border-radius: 6px;
+}
+
 #tb-search
 {
 	width: 150px;
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-bottom.png b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-bottom.png
new file mode 100755
index 000000000..28e41ea2b
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-bottom.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-top.png b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-top.png
new file mode 100755
index 000000000..c30cf5989
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-top.png differ
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png b/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png
deleted file mode 100755
index a91c78a5c..000000000
Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen.png and /dev/null differ
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-note-add.png b/chrome/chromeFiles/skin/default/scholar/toolbar-note-add.png
new file mode 100755
index 000000000..abdad91eb
Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/toolbar-note-add.png differ