diff --git a/main/forum/viewforum.php b/main/forum/viewforum.php
index 44a87666f5..4d6f1ba97e 100755
--- a/main/forum/viewforum.php
+++ b/main/forum/viewforum.php
@@ -442,7 +442,7 @@ if(is_array($threads)) {
 					$iconnotify = 'send_mail_checked.gif';
 				}
 			}
-			$icon_liststd = 'group.gif';
+			$icon_liststd = 'lp_users.png';
 			if (!api_is_anonymous() && api_is_allowed_to_session_edit(false,true)) {
 				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&amp;forum=".Security::remove_XSS($my_forum)."&origin=".$origin."&amp;action=notify&amp;content=thread&amp;gidReq=".$_SESSION['toolgroup']."&amp;id=".$row['thread_id']."\">".icon('../img/'.$iconnotify,get_lang('NotifyMe'))."</a>";
 			}
diff --git a/main/img/icons/32/chat.png b/main/img/icons/32/chat.png
new file mode 100644
index 0000000000..49fbaf32a1
Binary files /dev/null and b/main/img/icons/32/chat.png differ
diff --git a/main/img/icons/32/discuss.png b/main/img/icons/32/discuss.png
new file mode 100644
index 0000000000..0bac0595fe
Binary files /dev/null and b/main/img/icons/32/discuss.png differ
diff --git a/main/img/icons/32/history.png b/main/img/icons/32/history.png
new file mode 100644
index 0000000000..1e54d01ff2
Binary files /dev/null and b/main/img/icons/32/history.png differ
diff --git a/main/img/icons/32/page.png b/main/img/icons/32/page.png
new file mode 100644
index 0000000000..09780e1156
Binary files /dev/null and b/main/img/icons/32/page.png differ
diff --git a/main/img/icons/32/preview_view.png b/main/img/icons/32/preview_view.png
index 7d5ac6fd94..418a8ad2c3 100644
Binary files a/main/img/icons/32/preview_view.png and b/main/img/icons/32/preview_view.png differ
diff --git a/main/img/icons/32/search.png b/main/img/icons/32/search.png
index de5ef3a1b4..af1e0651ad 100644
Binary files a/main/img/icons/32/search.png and b/main/img/icons/32/search.png differ
diff --git a/main/img/icons/32/what_link_here.png b/main/img/icons/32/what_link_here.png
new file mode 100644
index 0000000000..4f41decbd4
Binary files /dev/null and b/main/img/icons/32/what_link_here.png differ
diff --git a/main/img/icons/32/wiki.png b/main/img/icons/32/wiki.png
new file mode 100644
index 0000000000..455018c086
Binary files /dev/null and b/main/img/icons/32/wiki.png differ
diff --git a/main/img/icons/48/discuss.png b/main/img/icons/48/discuss.png
new file mode 100644
index 0000000000..ec66921183
Binary files /dev/null and b/main/img/icons/48/discuss.png differ
diff --git a/main/img/icons/48/history.png b/main/img/icons/48/history.png
new file mode 100644
index 0000000000..b1f4d8ed9b
Binary files /dev/null and b/main/img/icons/48/history.png differ
diff --git a/main/img/icons/48/page.png b/main/img/icons/48/page.png
new file mode 100644
index 0000000000..ffa36d0352
Binary files /dev/null and b/main/img/icons/48/page.png differ
diff --git a/main/img/icons/48/preview_view.png b/main/img/icons/48/preview_view.png
deleted file mode 100644
index e414dd5724..0000000000
Binary files a/main/img/icons/48/preview_view.png and /dev/null differ
diff --git a/main/img/icons/48/search.png b/main/img/icons/48/search.png
deleted file mode 100644
index 848275d27e..0000000000
Binary files a/main/img/icons/48/search.png and /dev/null differ
diff --git a/main/img/icons/48/what_link_here.png b/main/img/icons/48/what_link_here.png
new file mode 100644
index 0000000000..d26fd4dfe1
Binary files /dev/null and b/main/img/icons/48/what_link_here.png differ
diff --git a/main/img/icons/48/wiki.png b/main/img/icons/48/wiki.png
new file mode 100644
index 0000000000..1c16253c05
Binary files /dev/null and b/main/img/icons/48/wiki.png differ
diff --git a/main/wiki/index.php b/main/wiki/index.php
index 506729f394..254c4c82e5 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -428,25 +428,25 @@ if (!in_array($_GET['action'], array('addnew', 'searchpages', 'allpages', 'recen
 	echo "<div class='actions'>";
 
 	//menu show page
-	echo '<a href="index.php?cidReq='.$_course[id].'&action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('showpage').'>'.Display::display_icon('lp_document.png',get_lang('ShowThisPage')).' '.get_lang('Page').'</a>';
+	echo '<a href="index.php?cidReq='.$_course[id].'&action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('showpage').'>'.Display::return_icon('page.png',get_lang('ShowThisPage'),'','32').'</a>';
 
 	if (api_is_allowed_to_session_edit(false,true) ) {
 		//menu edit page
-		echo '<a href="index.php?cidReq='.$_course[id].'&action=edit&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('edit').'>'.Display::display_icon('lp_quiz.png',get_lang('EditThisPage')).' '.get_lang('EditPage').'</a>';
+		echo '<a href="index.php?cidReq='.$_course[id].'&action=edit&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('edit').'>'.Display::return_icon('edit.png',get_lang('EditThisPage'),'','32').'</a>';
 
 		//menu discuss page
-		echo '<a href="index.php?action=discuss&amp;title='.api_htmlentities(urlencode($page)).'"'.is_active_navigation_tab('discuss').'>'.Display::display_icon('comment_bubble.gif',get_lang('DiscussThisPage')).' '.get_lang('Discuss').'</a>';
+		echo '<a href="index.php?action=discuss&amp;title='.api_htmlentities(urlencode($page)).'"'.is_active_navigation_tab('discuss').'>'.Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'','32').'</a>';
  	}
 
 	//menu history
-	echo '<a href="index.php?cidReq='.$_course[id].'&action=history&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('history').'>'.Display::display_icon('history.gif',get_lang('ShowPageHistory')).' '.get_lang('History').'</a>';
+	echo '<a href="index.php?cidReq='.$_course[id].'&action=history&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('history').'>'.Display::return_icon('history.png',get_lang('ShowPageHistory'),'','32').'</a>';
 	//menu linkspages
-	echo '<a href="index.php?action=links&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('links').'>'.Display::display_icon('lp_link.png',get_lang('ShowLinksPages')).' '.get_lang('LinksPages').'</a>';
+	echo '<a href="index.php?action=links&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$_clean['group_id'].'"'.is_active_navigation_tab('links').'>'.Display::return_icon('what_link_here.png',get_lang('LinksPages'),'','32').'</a>';
 
 	//menu delete wikipage
 	if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
-		echo '<a href="index.php?action=delete&amp;title='.api_htmlentities(urlencode($page)).'"'.is_active_navigation_tab('delete').'>'.Display::display_icon('delete.gif',get_lang('DeleteThisPage')).' '.get_lang('Delete').'</a>';
+		echo '<a href="index.php?action=delete&amp;title='.api_htmlentities(urlencode($page)).'"'.is_active_navigation_tab('delete').'>'.Display::return_icon('delete.png',get_lang('DeleteThisPage'),'','32').'</a>';
 	}
 	echo '</div>';
 }