diff --git a/blocks/site_main_menu/styles.css b/blocks/site_main_menu/styles.css
index 271eca54e54..dd8f92fcaad 100644
--- a/blocks/site_main_menu/styles.css
+++ b/blocks/site_main_menu/styles.css
@@ -1,7 +1,7 @@
 .block_site_main_menu li { clear: both; }
 .block_site_main_menu li .column { width: 100%; }
-.block_site_main_menu li .buttons { float: right; margin-top: 3px;}
+.block_site_main_menu li .buttons { float: right; margin: 0; }
 .dir-rtl .block_site_main_menu li .buttons { float: left; }
-.block_site_main_menu li .buttons a img{ vertical-align: text-bottom; margin: 0 3px;}
+.block_site_main_menu li .buttons a img{ vertical-align: text-bottom;}
 .block_site_main_menu .footer { margin-top: 1em; }
 .block_site_main_menu .section_add_menus noscript div { display: inline;}
diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index 96f7a9038fe..a23dc012ff8 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -91,8 +91,10 @@ class block_social_activities extends block_list {
                 }
                 if (!$ismoving) {
                     $actions = course_get_cm_edit_actions($mod, -1);
-                    $editbuttons = '<br />'.
-                            $courserenderer->course_section_cm_edit_actions($actions, $mod);
+                    $editbuttons = html_writer::tag('div',
+                        $courserenderer->course_section_cm_edit_actions($actions, $mod, array('donotenhance' => true)),
+                        array('class' => 'buttons')
+                    );
                 } else {
                     $editbuttons = '';
                 }
diff --git a/blocks/social_activities/styles.css b/blocks/social_activities/styles.css
new file mode 100644
index 00000000000..003155a832f
--- /dev/null
+++ b/blocks/social_activities/styles.css
@@ -0,0 +1,5 @@
+.block_social_activities li { clear: both; }
+.block_social_activities li .column { width: 100%; }
+.block_social_activities li .buttons { float: right; margin: 0; }
+.dir-rtl .block_social_activities li .buttons { float: left; }
+.block_social_activities li .buttons a img{ vertical-align: text-bottom;}