diff --git a/main/css/base.css b/main/css/base.css
index 2e7e6257cf..a5b96f8d0d 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -3395,6 +3395,23 @@ a:active{
     margin-right: 4px;
 }
 
+.teacher_online {
+    background: url("teacher.png") no-repeat scroll right center transparent;
+    height: 16px;
+    width: 17px;
+    display: inline-block;
+    margin-right: 4px;
+}
+
+.student_online {
+    background: url("student.png") no-repeat scroll right center transparent;
+    height: 16px;
+    width: 17px;
+    display: inline-block;
+    margin-right: 4px;
+}
+
+
 #online_grid_container .thumbnail .caption {
     text-align:center;
 }
diff --git a/main/css/student.png b/main/css/student.png
new file mode 100644
index 0000000000..666c496583
Binary files /dev/null and b/main/css/student.png differ
diff --git a/main/css/teacher.png b/main/css/teacher.png
new file mode 100644
index 0000000000..5987a0042a
Binary files /dev/null and b/main/css/teacher.png differ
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index ec84bad73b..ad93f6d629 100644
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -782,7 +782,7 @@ class SocialManager extends UserManager {
                 // reduce image
                 $name = $user_info['complete_name'];
                 $status_icon = Display::span('', array('class' => 'online_user_in_text'));
-                //$user_status = $user_info['status'] == 1 ? Display::return_icon('teacher.png', get_lang('Teacher'), array('height' => '22px', 'width' => '22px')) : null;
+                $user_status = $user_info['status'] == 1 ? Display::span('', array('class' => 'teacher_online')) : Display::span('', array('class' => 'student_online'));
                 
                 if ($image_array['file'] == 'unknown.jpg' || !file_exists($image_array['dir'].$image_array['file'])) {
                     $friends_profile['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg';