diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index 9936ec861d..fabf725412 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -79,7 +79,7 @@
 					
 					var ios = Components.classes["@mozilla.org/network/io-service;1"].
 						getService(Components.interfaces.nsIIOService);
-					var uri = ios.newURI("chrome://zotero/content/tiny_mce/" + this.mode + ".html", null, null);
+					var uri = ios.newURI("chrome://zotero/content/tinymce/" + this.mode + ".html", null, null);
 					var chromeReg = Components.classes["@mozilla.org/chrome/chrome-registry;1"].
 						getService(Components.interfaces.nsIChromeRegistry);
 					var fileURI = chromeReg.convertChromeURL(uri);
diff --git a/chrome/content/zotero/tinymce/note.html b/chrome/content/zotero/tinymce/note.html
index 3341b936b8..c84d53efb6 100755
--- a/chrome/content/zotero/tinymce/note.html
+++ b/chrome/content/zotero/tinymce/note.html
@@ -19,7 +19,7 @@ html, body {
 table.mceLayout > tbody > tr.mceLast {
 	position: absolute;
 	display: block;
-	top: 82px;
+	top: 54px;
 	bottom: 2px;
 	left: 1px;
 	right: 1px;
@@ -65,9 +65,10 @@ td.mceIframeContainer {
 		/*plugins : "xhtmlxtras",*/
 		
 		// Theme options
-		theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,sub,sup,|,forecolor,backcolor,|,removeformat,code",
-		theme_advanced_buttons2 : "justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,blockquote,|,link,unlink",
-		theme_advanced_buttons3 : "formatselect,fontselect,fontsizeselect",
+		theme_advanced_layout_manager : "SimpleLayout",
+		theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,sub,sup,|,forecolor,backcolor,|,blockquote,|,link,unlink",
+		theme_advanced_buttons2 : "formatselect,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,outdent,indent,|,removeformat,code",
+		theme_advanced_buttons3 : "",
 		theme_advanced_toolbar_location : "top",
 		theme_advanced_toolbar_align : "left",
 		theme_advanced_resizing : true
diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css b/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css
index 7e202a71a3..e2aec12e3b 100755
--- a/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css
+++ b/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css
@@ -49,8 +49,10 @@
 /* ListBox */
 .defaultSkin .mceListBox {direction:ltr}
 .defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
-.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
-.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
+/* width changed to 65px by Dan S./Zotero */
+.defaultSkin .mceListBox .mceText {padding-left:4px; width:65px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+/* margin-right changed to 1px by Dan S./Zotero */
+.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:1px; border:1px solid #CCC;}
 .defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
 .defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
 .defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index b168509fa2..fc6a12770a 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -82,8 +82,8 @@
 
 #zotero-item-pane
 {
-	width: 330px;
-	min-width: 330px;
+	width: 335px;
+	min-width: 335px;
 }
 
 #zotero-pane toolbar
diff --git a/chrome/skin/default/zotero/report/detail.css b/chrome/skin/default/zotero/report/detail.css
index 0b109c8b6c..4fc0e83620 100644
--- a/chrome/skin/default/zotero/report/detail.css
+++ b/chrome/skin/default/zotero/report/detail.css
@@ -56,7 +56,7 @@ td {
 }
 
 
-ul {
+ul.report, ul.notes, ul.tags {
 	list-style: none;
 	margin-left: 0;
 	padding-left: 0;
@@ -111,8 +111,18 @@ ul.notes > li p:last-child {
 	margin-bottom: 0;
 }
 
+/* Add quotation marks around blockquote */
+ul.notes > li blockquote p:not(:empty):before,
+li.note blockquote p:not(:empty):before {
+	content: '“';
+}
 
-/* Preserve whitespace on notes */
+ul.notes > li blockquote p:not(:empty):last-child:after,
+li.note blockquote p:not(:empty):last-child:after {
+	content: '”';
+}
+
+/* Preserve whitespace on plaintext notes */
 ul.notes li p.plaintext, li.note p.plaintext {
 	white-space: pre-wrap;
 }
diff --git a/chrome/skin/default/zotero/tinymce/note-content.css b/chrome/skin/default/zotero/tinymce/note-content.css
index 8b4b8d87e3..6d4ef23565 100644
--- a/chrome/skin/default/zotero/tinymce/note-content.css
+++ b/chrome/skin/default/zotero/tinymce/note-content.css
@@ -1,14 +1,21 @@
-body {
+body, td, pre {
 	font-size: 11px;
 	font-family: Lucida Grande, Tahoma, Verdana, Helvetica, sans-serif;
 }
 
-/*
-blockquote p:not(:empty):before  {
-	content: '“'
+pre {
+	font-family: -moz-fixed;
 }
 
-blockquote p:not(:empty):after {
-	content: '”'
+blockquote {
+	margin-left: 2em;
+}
+
+/* Add quotation marks around blockquote */
+blockquote p:not(:empty):before {
+	content: '“';
+}
+
+blockquote p:not(:empty):last-child:after {
+	content: '”';
 }
-*/