diff --git a/lib/rte/README_MOODLE b/lib/rte/README_MOODLE
index 90871218159..d42a940a88f 100644
--- a/lib/rte/README_MOODLE
+++ b/lib/rte/README_MOODLE
@@ -1,4 +1,7 @@
 This version of the Richtext editor started out as 0.3 beta 1,
 and I've hacked richedit.html to make the toolbars more compact.
 
+I've also changed the smilies to refer to Moodle smilies, and 
+added/removed some.
+
 Martin Dougiamas, 10/10/2002
diff --git a/lib/rte/richedit.html b/lib/rte/richedit.html
index 7d71422dd6a..21d3ad51ca7 100644
--- a/lib/rte/richedit.html
+++ b/lib/rte/richedit.html
@@ -164,8 +164,9 @@ var tEdit = null;
 		<img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>
 		<img id="btnOutdent"  onmousedown="doStyle('Outdent')" alt="@{DecreaseIndent}" src="images/icon_outdent.gif" align="absMiddle" width="20" height="20">
 		<img id="btnIndent"   onmousedown="doStyle('Indent')" alt="@{IncreaseIndent}" src="images/icon_indent.gif" align="absMiddle" width="20" height="20">
+		<img id="btnSelect" onclick="doStyle('SelectAll')" alt="@{SelectAll}" src="images/icon_select_all.gif" align="absMiddle" width="20" height="20">
 		<span id="featureHistory">
-		<img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>
+		<img class="spacer" src="images/spacer.gif" width="10"><span class="sep"></span>
 		<img id="btnPrev" onmousedown="document.execCommand('Undo')" alt="@{HistoryBack}"    src="images/icon_undo.gif" align="absMiddle" width="20" height="20">
 		<img id="btnNext" onmousedown="document.execCommand('Redo')"  alt="@{HistoryForward}" src="images/icon_redo.gif" align="absMiddle" width="20" height="20">
 	</span></nobr></td>
@@ -181,8 +182,6 @@ var tEdit = null;
 		<img id="btnRule"   onclick="doStyle('InsertHorizontalRule')" alt="@{InsertLine}" src="images/icon_rule.gif" align="absMiddle" width="20" height="20">
 		<img id="btnSmile"  onclick="insert('smile')" alt="@{InsertSmily}" src="images/em.icon.smile.gif" align="absMiddle" width="15" height="15">
 		<img id="btnChar"	onclick="insert('char')" alt="@{InsertCharacter}" src="images/icon_ins_char.gif" align="absMiddle" width="20" height="20" border="0">
-		<img class="spacer" src="images/spacer.gif" width="2"><span class="sep"></span>
-		<img id="btnAbout"  onclick="insert('about')" alt="@{About}" src="images/icon_about.gif" align="absMiddle" width="16" height="16">
     </span></nobr></td></tr>
 	<tr id="featureStyleBar" ondragstart="handleDrag(0)" onmouseup="press(false)" onmousedown="press(true)" onmouseover="hover(true)" onmouseout="hover(false)">
     <td colspan=2 class="rebar"><nobr><span class="toolbar">
diff --git a/lib/rte/rte.js b/lib/rte/rte.js
index 6734d2ea831..01c0d0c3014 100644
--- a/lib/rte/rte.js
+++ b/lib/rte/rte.js
@@ -326,7 +326,7 @@ function pickColor(fg)
       setState(el, true);
    }
    color.style.top = window.event.clientY + 10;
-   color.style.left = window.event.clientX - 100;
+   color.style.left = window.event.clientX - 250;
    color.style.display = 'block';
    color._fg = fg;
 }