diff --git a/app/Resources/public/css/chat.css b/app/Resources/public/css/chat.css
index 8578b287e3..31358818c6 100644
--- a/app/Resources/public/css/chat.css
+++ b/app/Resources/public/css/chat.css
@@ -97,8 +97,9 @@
 	-moz-border-radius: 10px;
 	border-radius: 10px;
 	color: #666;
-	margin-bottom: -1px;
+	margin-bottom: 5px;
 	padding: 10px;
+        cursor: pointer;
 }
 .chat-user .user-image-chat {
 	-webkit-border-radius: 10px;
diff --git a/app/Resources/public/css/themes/cool_blue/default.css b/app/Resources/public/css/themes/cool_blue/default.css
index bf2df4cb1c..d485f4148d 100644
--- a/app/Resources/public/css/themes/cool_blue/default.css
+++ b/app/Resources/public/css/themes/cool_blue/default.css
@@ -81,14 +81,7 @@ a:hover{
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-background: #fe9700; /* Old browsers */
-background: -moz-linear-gradient(top, #fe9700 0%, #fd6800 100%); /* FF3.6+ */
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fe9700), color-stop(100%,#fd6800)); /* Chrome,Safari4+ */
-background: -webkit-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Chrome10+,Safari5.1+ */
-background: -o-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* Opera 11.10+ */
-background: -ms-linear-gradient(top, #fe9700 0%,#fd6800 100%); /* IE10+ */
-background: linear-gradient(to bottom, #fe9700 0%,#fd6800 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fe9700', endColorstr='#fd6800',GradientType=0 ); /* IE6-9 */
+    background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/corporate/default.css b/app/Resources/public/css/themes/corporate/default.css
index 3ee7f7d0b1..468b15e1aa 100644
--- a/app/Resources/public/css/themes/corporate/default.css
+++ b/app/Resources/public/css/themes/corporate/default.css
@@ -74,7 +74,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#2eaebb', end
   background: #3A4751;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #FE9A2E; ;
+  background-color: #FFF; ;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/cosmic_campus/default.css b/app/Resources/public/css/themes/cosmic_campus/default.css
index f118433288..92e56c72f2 100644
--- a/app/Resources/public/css/themes/cosmic_campus/default.css
+++ b/app/Resources/public/css/themes/cosmic_campus/default.css
@@ -78,7 +78,7 @@ header{
   color: #9DD0F1;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #E48A1D;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/delicious_bordeaux/default.css b/app/Resources/public/css/themes/delicious_bordeaux/default.css
index b32560c478..a3bfd0911e 100644
--- a/app/Resources/public/css/themes/delicious_bordeaux/default.css
+++ b/app/Resources/public/css/themes/delicious_bordeaux/default.css
@@ -74,7 +74,7 @@ color: #FFFFFF;
 background: #800020;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #800020;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/fruity_orange/default.css b/app/Resources/public/css/themes/fruity_orange/default.css
index 84b665deef..acee74b458 100644
--- a/app/Resources/public/css/themes/fruity_orange/default.css
+++ b/app/Resources/public/css/themes/fruity_orange/default.css
@@ -78,14 +78,7 @@ color: #FFFFFF;
 background: #FF650D;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background: #ff670f; 
-background: -moz-linear-gradient(top, #ff670f 0%, #fc3200 100%);
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff670f), color-stop(100%,#fc3200));
-background: -webkit-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: -o-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: -ms-linear-gradient(top, #ff670f 0%,#fc3200 100%);
-background: linear-gradient(to bottom, #ff670f 0%,#fc3200 100%);
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff670f', endColorstr='#fc3200',GradientType=0 );
+  background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/medical/default.css b/app/Resources/public/css/themes/medical/default.css
index af99a4a1fd..e49888018d 100644
--- a/app/Resources/public/css/themes/medical/default.css
+++ b/app/Resources/public/css/themes/medical/default.css
@@ -89,7 +89,7 @@ color: #FFFFFF;
 background: #F38A1E;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background: #2C9BB6;
+  background: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #fff;
diff --git a/app/Resources/public/css/themes/royal_purple/default.css b/app/Resources/public/css/themes/royal_purple/default.css
index d6d7b273d0..4ea0967534 100644
--- a/app/Resources/public/css/themes/royal_purple/default.css
+++ b/app/Resources/public/css/themes/royal_purple/default.css
@@ -81,7 +81,7 @@ background: linear-gradient(to bottom, #f7a400 0%,#ff7400 100%); /* W3C */
 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7a400', endColorstr='#ff7400',GradientType=0 ); /* IE6-9 */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #FB8B00;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/sober_brown/default.css b/app/Resources/public/css/themes/sober_brown/default.css
index 3cd74b4a55..4dba3c9e1e 100644
--- a/app/Resources/public/css/themes/sober_brown/default.css
+++ b/app/Resources/public/css/themes/sober_brown/default.css
@@ -66,7 +66,7 @@ color: #FFFFFF;
 background: #6B1F05; /* Old browsers */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #B83609;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/app/Resources/public/css/themes/steel_grey/default.css b/app/Resources/public/css/themes/steel_grey/default.css
index 3fefbd7b23..00cd3e22b9 100644
--- a/app/Resources/public/css/themes/steel_grey/default.css
+++ b/app/Resources/public/css/themes/steel_grey/default.css
@@ -66,7 +66,7 @@ color: #FFFFFF;
 background: #677877; /* Old browsers */
 }
 .navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #B83609;
+  background-color: #FFFFFF;
 }
 .navbar-default .navbar-nav > li > .dropdown-menu > li > a {
   color: #ffffff;
diff --git a/main/template/default/chat/chat.tpl b/main/template/default/chat/chat.tpl
index e79febbbc8..71e4dbec91 100644
--- a/main/template/default/chat/chat.tpl
+++ b/main/template/default/chat/chat.tpl
@@ -109,8 +109,8 @@
                     var buttonStatus = user.isConnected ? 'success' : 'muted',
                         buttonTitle = user.isConnected ? '{{ 'StartAChat'|get_lang }}' : '{{ 'LeaveAMessage'|get_lang }}';
 
-                    html += '<li class="col-xs-12 chat-user">' +
-                        '   <div>' +
+                    html += '<li class="col-xs-12">' +
+                        '   <div class="chat-user" data-name="' + user.complete_name + '" data-user="' + user.id + '">' +
                         '       <img src="' + user.image_url + '" alt="' + user.complete_name + '" class="img-circle user-image-chat"/>' +
                         '       <ul class="list-unstyled">' +
                         '           <li>' + user.complete_name;
@@ -261,7 +261,7 @@
         }], {});
 
         $('button#chat-send-message').on('click', ChChat.onSendMessageListener);
-        $('#chat-users').on('click', 'button.btn', function (e) {
+        $('#chat-users').on('click', 'div.chat-user', function (e) {
             e.preventDefault();
             var jSelf = $(this),
                 userId = parseInt(jSelf.data('user')) || 0;
diff --git a/main/work/view.php b/main/work/view.php
index 057f2c8211..f5b1078af0 100755
--- a/main/work/view.php
+++ b/main/work/view.php
@@ -171,6 +171,15 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
         if (isset($work['contains_file']) && !empty($work['contains_file'])) {
             if (isset($work['download_url']) && !empty($work['download_url'])) {
                 $actions = Display::url(
+                    Display::return_icon(
+                        'back.png',
+                        get_lang('BackToWorksList'),
+                        null,
+                        ICON_SIZE_MEDIUM
+                    ),
+                    api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq()
+                );
+                $actions .= Display::url(
                     Display::return_icon(
                         'save.png',
                         get_lang('Download'),