diff --git a/chat/indico_chat/templates/event_header.html b/chat/indico_chat/templates/event_header.html
index da99790..0879dc8 100644
--- a/chat/indico_chat/templates/event_header.html
+++ b/chat/indico_chat/templates/event_header.html
@@ -13,10 +13,10 @@
                     <div class="event-service-toolbar toolbar right">
                         {% if chat_links %}
                             <div class="group">
-                                <a class="i-button i-button-small arrow event-service-right-button dropDownMenu highlight join-button" data-toggle="dropdown" target="_blank"><strong>{% trans %}Join{% endtrans %}</strong></a>
+                                <a class="i-button i-button-small arrow event-service-right-button highlight join-button" data-toggle="dropdown" target="_blank"><strong>{% trans %}Join{% endtrans %}</strong></a>
                                 <ul class="dropdown">
                                     {% for chat_link in chat_links %}
-                                        <li><a class="fakeLink" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
+                                        <li><a class="fake-link" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
                                     {% endfor %}
                                 </ul>
                             </div>
diff --git a/chat/indico_chat/templates/event_page.html b/chat/indico_chat/templates/event_page.html
index bdbc39e..fc19197 100644
--- a/chat/indico_chat/templates/event_page.html
+++ b/chat/indico_chat/templates/event_page.html
@@ -12,10 +12,10 @@
                 <div class="event-service-toolbar toolbar right">
                     {% if chat_links %}
                         <div class="group">
-                            <a class="i-button i-button-small arrow event-service-right-button dropDownMenu highlight join-button" data-toggle="dropdown" target="_blank"><strong>{% trans %}Join{% endtrans %}</strong></a>
+                            <a class="i-button i-button-small arrow event-service-right-button highlight join-button" data-toggle="dropdown" target="_blank"><strong>{% trans %}Join{% endtrans %}</strong></a>
                             <ul class="dropdown">
                                 {% for chat_link in chat_links %}
-                                    <li><a class="fakeLink" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
+                                    <li><a class="fake-link" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
                                 {% endfor %}
                             </ul>
                         </div>
diff --git a/chat/indico_chat/templates/manage_event.html b/chat/indico_chat/templates/manage_event.html
index f3a0153..b3d269a 100644
--- a/chat/indico_chat/templates/manage_event.html
+++ b/chat/indico_chat/templates/manage_event.html
@@ -50,7 +50,7 @@
                                         </a>
                                         <ul class="dropdown">
                                             {% for chat_link in chat_links %}
-                                                <li><a class="fakeLink" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
+                                                <li><a class="fake-link" href="{{ chat_link.link.format(room=chatroom.jid_node, server=server) }}" target="_blank">{{ chat_link.title }}</a></li>
                                             {% endfor %}
                                         </ul>
                                     </div>
diff --git a/importer/indico_importer/static/js/importer.js b/importer/indico_importer/static/js/importer.js
index d39b599..a30342d 100644
--- a/importer/indico_importer/static/js/importer.js
+++ b/importer/indico_importer/static/js/importer.js
@@ -390,7 +390,7 @@
 
             draw: function() {
                 this.firstSearch = Html.span({style:{display:"inline"}}, $t.gettext("Please type your search phrase and press 'search'."));
-                var hereLink = Html.span({className: 'fakeLink'}, $t.gettext("here"));
+                var hereLink = Html.span({className: 'fake-link'}, $t.gettext("here"));
                 hereLink.observeClick(this.afterSearchAction);
                 this.afterSearch = Html.span(
                     {style: {display: 'none'}},
@@ -966,7 +966,7 @@
                     } else {
                         var summaryBeg = Html.span({}, summary.substr(0, 200));
                         var summaryEnd = Html.span({style:{display:'none'}}, summary.substr(200));
-                        var showLink = Html.span({className:'fakeLink'}, $t.gettext(" (show all)"));
+                        var showLink = Html.span({className:'fake-link'}, $t.gettext(" (show all)"));
                         showLink.observeClick(function(evt) {
                             summaryEnd.dom.style.display = "inline";
                             showLink.dom.style.display = "none";
@@ -976,7 +976,7 @@
                             //Recalculating position of the selection number
                             self.observeSelection(self.selectedList);
                         });
-                        var hideLink = Html.span({className:'fakeLink', style:{display:'none'}}, $t.gettext(" (hide)"));
+                        var hideLink = Html.span({className:'fake-link', style:{display:'none'}}, $t.gettext(" (hide)"));
                         hideLink.observeClick(function(evt) {
                             summaryEnd.dom.style.display = "none";
                             showLink.dom.style.display = "inline";
@@ -1200,7 +1200,7 @@
 
             _drawImporterDiv: function() {
                 var self = this;
-                this.moreEntriesDiv = Html.div({className:'fakeLink', style:{paddingBottom:pixels(15), textAlign:'center', clear: 'both', marginTop: pixels(15)}}, $t.gettext("more results"));
+                this.moreEntriesDiv = Html.div({className:'fake-link', style:{paddingBottom:pixels(15), textAlign:'center', clear: 'both', marginTop: pixels(15)}}, $t.gettext("more results"));
                 this.moreEntriesDiv.observeClick(function() {
                     self.append(20);
                 });
diff --git a/piwik/indico_piwik/templates/statistics.html b/piwik/indico_piwik/templates/statistics.html
index 0edc14a..4a0a3e9 100644
--- a/piwik/indico_piwik/templates/statistics.html
+++ b/piwik/indico_piwik/templates/statistics.html
@@ -67,7 +67,7 @@
         <div class="statsWidget full edge">
             <div class="statsWidgetTitle">
             {% trans %}Visitor Hit Rates{% endtrans %}
-                <span id="visitsInfoHelp" class="fakeLink" title="
+                <span id="visitsInfoHelp" class="fake-link" title="
                     {%- trans -%}
                         Please note, statistics have only been collected since the plugin's
                         introduction. This means that there is no data present for the earlier