diff --git a/main/admin/access_url_add_courses_to_url.php b/main/admin/access_url_add_courses_to_url.php
old mode 100755
new mode 100644
index 72042346e7..50c1429fd8
--- a/main/admin/access_url_add_courses_to_url.php
+++ b/main/admin/access_url_add_courses_to_url.php
@@ -46,7 +46,7 @@ $interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('Mult
 Display :: display_header($tool_name);
 
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php">'.Display::return_icon('edit.gif',get_lang('AddUserToURL'),'').' '.get_lang('EditCoursesToURL').'</a>';
+echo Display::url(Display::return_icon('edit.gif',get_lang('EditCoursesToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_edit_courses_to_url.php"'); 
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_url_add_sessions_to_url.php b/main/admin/access_url_add_sessions_to_url.php
old mode 100755
new mode 100644
index f53587c5f1..7e5b913477
--- a/main/admin/access_url_add_sessions_to_url.php
+++ b/main/admin/access_url_add_sessions_to_url.php
@@ -45,7 +45,7 @@ $interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('Mult
 
 Display :: display_header($tool_name);
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_sessions_to_url.php">'.Display::return_icon('edit.gif',get_lang('EditSessionToURL'),'').' '.get_lang('EditSessionToURL').'</a>';
+echo Display::url(Display::return_icon('edit.gif',get_lang('EditSessionToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_edit_sessions_to_url.php');
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php
old mode 100755
new mode 100644
index bc46c901b1..da7e05508c
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
@@ -46,7 +46,7 @@ $interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('Mult
 Display :: display_header($tool_name);
 
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php">'.Display::return_icon('edit.gif',get_lang('EditUsersToURL'),'').' '.get_lang('EditUsersToURL').'</a>';
+echo Display::url(Display::return_icon('edit.gif',get_lang('EditUsersToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php">');
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_url_check_user_session.php b/main/admin/access_url_check_user_session.php
index dc0c7977bf..a4e4e9ce3d 100644
--- a/main/admin/access_url_check_user_session.php
+++ b/main/admin/access_url_check_user_session.php
@@ -99,8 +99,8 @@ foreach($session_list  as $session_item) {
 
             if ($multiple_url_is_on) {
                 if ($user['access_url_id'] != $url_id) {            
-                    $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), 22);
-                    $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), 22);                    
+                    $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_MEDIUM);
+                    $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), ICON_SIZE_MEDIUM);                    
                     $link_to_add_user_in_url = '<a href="'.api_get_self().'?'.Security::remove_XSS($_SERVER['QUERY_STRING']).'&action=add_user_to_url&id_session='.$id_session.'&user_id='.$user['user_id'].'">'.$add.'</a>';
                 }                
             }
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
old mode 100755
new mode 100644
index 183dbfdc6c..c0fd98925e
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -114,7 +114,7 @@ if($_POST['form_sent']) {
 Display::display_header($tool_name);
 
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_add_courses_to_url.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),'').' '.get_lang('AddCoursesToURL').'</a>';
+echo Display::url( Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_courses_to_url.php');
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_url_edit_sessions_to_url.php b/main/admin/access_url_edit_sessions_to_url.php
old mode 100755
new mode 100644
index 1c3a9134c6..23942b40ea
--- a/main/admin/access_url_edit_sessions_to_url.php
+++ b/main/admin/access_url_edit_sessions_to_url.php
@@ -119,7 +119,7 @@ if($_POST['form_sent']) {
 Display::display_header($tool_name);
 
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_add_sessions_to_url.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddSessionsToURL'),'').' ' .get_lang('AddSessionsToURL').'</a>';
+echo Display::url(Display::return_icon('view_more_stats.gif',get_lang('AddSessionsToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_sessions_to_url.php');
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php
index b8b5355e41..cbd764bf12 100644
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@@ -153,7 +153,7 @@ if (!empty($message)) {
 }
 
 echo '<div class="actions" style="height:22px;">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),'').' '.get_lang('AddUsersToURL').'</a>';
+echo Display::url(Display::return_icon('view_more_stats.gif',get_lang('AddUserToURL'),''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php">');
 echo '</div>';
 
 api_display_tool_title($tool_name);
diff --git a/main/admin/access_urls.php b/main/admin/access_urls.php
index 5e825a3ae8..d968c79818 100644
--- a/main/admin/access_urls.php
+++ b/main/admin/access_urls.php
@@ -135,9 +135,9 @@ foreach($sortable_data as $row)  {
     }    
     //Actions
     $url_id = $row['id'];
-    $actions = '<a href="access_url_edit.php?url_id='.$url_id.'">'.Display::return_icon('edit.png', get_lang('Edit'), array(), 22).'</a>&nbsp;';
+    $actions = Display::url(Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_MEDIUM), "access_url_edit.php?url_id='.$url_id.'");
     if ($url_id != '1') {
-        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'&amp;sec_token='.$_SESSION['sec_token'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), 22).'</a>';
+        $actions .= '<a href="access_urls.php?action=delete_url&amp;url_id='.$url_id.'&amp;sec_token='.$_SESSION['sec_token'].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_MEDIUM).'</a>';
     }    
     $urls[] = array($url, $description, $status, $actions);
 }