diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index 3f4401db32..3fcd3206e9 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -1214,13 +1214,13 @@ function generateSettingsForm($settings, $settings_by_access_list)
     );
 
     $url_id = api_get_current_access_url_id();
-
+    /* 
     if (!empty($_configuration['multiple_access_urls']) && api_is_global_platform_admin() && $url_id == 1) {
         $group = array();
         $group[] = $form->createElement('button', 'mark_all', get_lang('MarkAll'));
         $group[] = $form->createElement('button', 'unmark_all', get_lang('UnmarkAll'));
         $form->addGroup($group, 'buttons_in_action_right');
-    }
+    }*/
 
     $default_values = array();
     $url_info = api_get_access_url($url_id);
@@ -1244,28 +1244,28 @@ function generateSettingsForm($settings, $settings_by_access_list)
                         if ($row['access_url_changeable'] == '1') {
                             $form->addElement(
                                 'html',
-                                '<div style="float: right;"><a class="share_this_setting" data_status = "0"  data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
-                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</a></div>'
+                                '<div class="pull-right"><a class="share_this_setting" data_status = "0"  data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
+                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting') , null, ICON_SIZE_MEDIUM).'</a></div>'
                             );
                         } else {
                             $form->addElement(
                                 'html',
-                                '<div style="float: right;"><a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
-                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</a></div>'
+                                '<div class="pull-right"><a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
+                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</a></div>'
                             );
                         }
                     } else {
                         if ($row['access_url_changeable'] == '1') {
                             $form->addElement(
                                 'html',
-                                '<div style="float: right;">'.
-                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</div>'
+                                '<div class="pull-right">'.
+                                Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</div>'
                             );
                         } else {
                             $form->addElement(
                                 'html',
-                                '<div style="float: right;">'.
-                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</div>'
+                                '<div class="pull-right">'.
+                                Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting'), null, ICON_SIZE_MEDIUM ).'</div>'
                             );
                         }
                     }
diff --git a/main/admin/settings.php b/main/admin/settings.php
index 504a6e2d36..a040221a60 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -360,8 +360,9 @@ if (!empty($_GET['category']) &&
 }
 
 $htmlHeadXtra[] = '<script>
-    var hide_icon = "'.api_get_path(WEB_IMG_PATH).'shared_setting_na.png";
-    var show_icon = "'.api_get_path(WEB_IMG_PATH).'shared_setting.png";
+    
+    var hide_icon = "'.api_get_path(WEB_IMG_PATH).'/icons/32/shared_setting_na.png";
+    var show_icon = "'.api_get_path(WEB_IMG_PATH).'/icons/32/shared_setting.png";
     var url       = "'.api_get_path(WEB_AJAX_PATH).'admin.ajax.php?a=update_changeable_setting";
 
     $(function() {
diff --git a/main/img/icons/32/shared_setting.png b/main/img/icons/32/shared_setting.png
new file mode 100644
index 0000000000..4d75a179cf
Binary files /dev/null and b/main/img/icons/32/shared_setting.png differ
diff --git a/main/img/icons/32/shared_setting_na.png b/main/img/icons/32/shared_setting_na.png
new file mode 100644
index 0000000000..fe04ea2624
Binary files /dev/null and b/main/img/icons/32/shared_setting_na.png differ