Index: /CKEditor/branches/prototype/_source/core/config.js
===================================================================
--- /CKEditor/branches/prototype/_source/core/config.js	(revision 2648)
+++ /CKEditor/branches/prototype/_source/core/config.js	(revision 2649)
@@ -159,5 +159,5 @@
 	 * config.plugins = 'elementspath,toolbar,wysiwygarea';
 	 */
-	plugins : 'basicstyles,button,dialog,elementspath,htmldataprocessor,keystrokes,removeformat,smiley,sourcearea,tab,toolbar,wysiwygarea,horizontalrule',
+	plugins : 'basicstyles,button,dialog,elementspath,horizontalrule,htmldataprocessor,keystrokes,removeformat,smiley,sourcearea,tab,toolbar,wysiwygarea',
 
 	/**
Index: /CKEditor/branches/prototype/_source/lang/en.js
===================================================================
--- /CKEditor/branches/prototype/_source/lang/en.js	(revision 2648)
+++ /CKEditor/branches/prototype/_source/lang/en.js	(revision 2649)
@@ -51,5 +51,5 @@
 	selectAll		: 'Select All',
 	removeFormat	: 'Remove Format',
-	horizontalrule		: "Insert Horizontal Line",
+	horizontalrule	: "Insert Horizontal Line",
 
 	elementsPath :
Index: /CKEditor/branches/prototype/_source/plugins/horizontalrule/plugin.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/horizontalrule/plugin.js	(revision 2648)
+++ /CKEditor/branches/prototype/_source/plugins/horizontalrule/plugin.js	(revision 2649)
@@ -21,5 +21,5 @@
 
 /**
- * @fileHorizontal Line plugin.
+ * @file Horizontal Rule plugin.
  */
 
@@ -32,12 +32,11 @@
 
 		editor.addCommand( 'horizontalrule', horizontalrule );
-		editor.ui.addButton( 'horizontalrule',
+		editor.ui.addButton( 'HorizontalRule',
 			{
 				label : editor.lang.horizontalrule,
 				command : 'horizontalrule'
 			});
-	},
+	}
 });
-
 
 CKEDITOR.plugins.horizontalrule =
@@ -45,6 +44,6 @@
 	exec : function( editor )
 	{
-		var element= editor.document.createElement('hr');
+		var element = editor.document.createElement('hr');
 		editor.insertElement( element );
 	}
-}
+};
Index: /CKEditor/branches/prototype/_source/skins/default/toolbar.css
===================================================================
--- /CKEditor/branches/prototype/_source/skins/default/toolbar.css	(revision 2648)
+++ /CKEditor/branches/prototype/_source/skins/default/toolbar.css	(revision 2649)
@@ -172,11 +172,11 @@
 }
 
+.cke_skin_default a.cke_button_horizontalrule .cke_icon
+{
+	background-position: 0 -624px;
+}
+
 .cke_skin_default a.cke_button_smiley .cke_icon
 {
 	background-position: 0 -640px;
 }
-
-.cke_skin_default a.cke_button_horizontalrule .cke_icon
-{
-	background-position: 0 -624px;
-}