Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r92525f17be9db4e57a8551ff92d004f319fb4b73 -ra906a0a0effcbe50cb7ffcb7b58f9b408d771f1d
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 92525f17be9db4e57a8551ff92d004f319fb4b73)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision a906a0a0effcbe50cb7ffcb7b58f9b408d771f1d)
@@ -64,32 +64,6 @@
   	['Format','Font','FontSize']
 ];
 
-CKEDITOR.config.toolbar_CustomWiki = [
-	['Source','-','Preview'],
-	['Undo','Redo'],
-	['Bold','Italic','Underline', '-','Subscript','Superscript'],
-	['NumberedList','BulletedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	['wikilink','Link','Image'],
-	['Jlatexmath'],
-	['TextColor','BGColor'],
-	['Table','HorizontalRule'],
-	['Format','Font','FontSize']
-];
-
-CKEDITOR.config.toolbar_CustomWikiInline = [
-  	['Sourcedialog'],
-  	['Undo','Redo'],
-  	['Bold','Italic','Underline', '-','Subscript','Superscript'],
-  	['NumberedList','BulletedList','-','Outdent','Indent'],
-  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-  	['wikilink','Link','Image'],
-  	['Jlatexmath'],
-  	['TextColor','BGColor'],
-  	['Table','HorizontalRule'],
-  	['Format','Font','FontSize']
-];
-
 CKEDITOR.config.toolbar_LessonDescription = [
     ['Bold','Italic','Underline', '-','Subscript','Superscript'],
 	['NumberedList','BulletedList','-','Outdent','Indent'],
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -rd923db963ae2a37800bbd1ca4e3ebc9a7de1a41e -ra906a0a0effcbe50cb7ffcb7b58f9b408d771f1d
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision d923db963ae2a37800bbd1ca4e3ebc9a7de1a41e)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision a906a0a0effcbe50cb7ffcb7b58f9b408d771f1d)
@@ -382,7 +382,7 @@
                           </div>
                           <lams:CKEditor id="wikiBody"
                                          value="${currentWikiPage.currentWikiContentDTO.body}"
-                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWiki"
+                                         contentFolderID="${contentFolderID}" toolbarSet="DefaultLearner"
                                          height="400px">
                           </lams:CKEditor>
                         </td>
@@ -422,7 +422,7 @@
                             <fmt:message key="label.wiki.body"></fmt:message>
                           </div>
                           <lams:CKEditor id="newPageWikiBody" value="" height="400px"
-                                         contentFolderID="${contentFolderID}" toolbarSet="CustomWiki">
+                                         contentFolderID="${contentFolderID}" toolbarSet="DefaultLearner">
                           </lams:CKEditor>
 
                           <a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary pull-right voffset5"><fmt:message key="label.wiki.savechanges"></fmt:message></a>