diff --git a/src/media/kunena/core/js/ckeditor.js b/src/media/kunena/core/js/ckeditor.js
index 1dac56e7fa4..19b2c302434 100644
--- a/src/media/kunena/core/js/ckeditor.js
+++ b/src/media/kunena/core/js/ckeditor.js
@@ -1397,7 +1397,7 @@ CKEDITOR.plugins.add( 'ebay', {
         editor.ui.addButton( 'Ebay', {
             label: Joomla.JText._('COM_KUNENA_EDITOR_EBAY'),
             command: 'insertEbay',
-            toolbar: 'insert'
+            toolbar: 'social'
         });
     }
 });
@@ -1412,7 +1412,7 @@ CKEDITOR.plugins.add( 'instagram', {
         editor.ui.addButton( 'Instagram', {
             label: Joomla.JText._('COM_KUNENA_EDITOR_INSTAGRAM'),
             command: 'insertInstagram',
-            toolbar: 'insert'
+            toolbar: 'social'
         });
     }
 });
@@ -1427,7 +1427,7 @@ CKEDITOR.plugins.add( 'soundcloud', {
         editor.ui.addButton( 'Soundcloud', {
             label: Joomla.JText._('COM_KUNENA_EDITOR_SOUNDCLOUD'),
             command: 'insertSoundcloud',
-            toolbar: 'insert'
+            toolbar: 'social'
         });
     }
 });
@@ -1442,7 +1442,7 @@ CKEDITOR.plugins.add( 'twitter', {
         editor.ui.addButton( 'Twitter', {
             label: Joomla.JText._('COM_KUNENA_EDITOR_TWEET'),
             command: 'insertTwitter',
-            toolbar: 'others'
+            toolbar: 'social'
         });
     }
 });
diff --git a/src/media/kunena/core/js/ckeditor_config.js b/src/media/kunena/core/js/ckeditor_config.js
index f2f7717e6dd..58e020f5d76 100644
--- a/src/media/kunena/core/js/ckeditor_config.js
+++ b/src/media/kunena/core/js/ckeditor_config.js
@@ -18,6 +18,7 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi', 'paragraph' ] },
 		{ name: 'links', groups: [ 'links' ] },
 		{ name: 'insert', groups: [ 'insert' ] },
+		{ name: 'social', groups: [ 'social' ] },
 		'/',
 		{ name: 'styles', groups: [ 'styles' ] },
 		{ name: 'colors', groups: [ 'colors' ] },
@@ -26,7 +27,7 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'about', groups: [ 'about' ] }
 	];
 
-	config.removeButtons = 'Save,NewPage,Preview,Print,Templates,Form,Radio,Checkbox,TextField,Textarea,Select,Button,ImageButton,HiddenField,Flash,Language';
+	config.removeButtons = 'Save,NewPage,Preview,Print,Templates,Form,Radio,Checkbox,TextField,Textarea,Select,Button,ImageButton,HiddenField,Flash,Language,PageBreak,Blockquote,Anchor,CreateDiv,ShowBlocks';
 
 	config.smiley_path = '/media/kunena/emoticons/';
 	config.smiley_images = [