diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php
index 61839ceee..627ad21b1 100644
--- a/app/Template/app/projects.php
+++ b/app/Template/app/projects.php
@@ -24,7 +24,7 @@
 
                 <?= $this->url->link($this->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?>
                 <?php if (! empty($project['description'])): ?>
-                    <span class="column-tooltip" title='<?= $this->e($this->text->markdown($project['description'])) ?>'>
+                    <span class="tooltip" title='<?= $this->e($this->text->markdown($project['description'])) ?>'>
                         <i class="fa fa-info-circle"></i>
                     </span>
                 <?php endif ?>
diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php
index b86fc446a..436c53b57 100644
--- a/app/Template/board/table_swimlane.php
+++ b/app/Template/board/table_swimlane.php
@@ -22,7 +22,7 @@
         <?= $this->e($column['title']) ?>
 
         <?php if (! $not_editable && ! empty($column['description'])): ?>
-            <span class="column-tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
+            <span class="tooltip pull-right" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
                 <i class="fa fa-info-circle"></i>
             </span>
         <?php endif ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index e9f22b7b5..69bf97c14 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -10,7 +10,7 @@
                 'changeCategory',
                 array('task_id' => $task['id'], 'project_id' => $task['project_id']),
                 false,
-                'task-board-popover' . (! empty($task['category_description']) ? ' column-tooltip' : ''),
+                'task-board-popover' . (! empty($task['category_description']) ? ' tooltip' : ''),
                 ! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category')
             ) ?>
         <?php endif ?>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 48e931c9e..87121f2c9 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -16,7 +16,9 @@
                 <?= $this->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
             </span> -
         <?php endif ?>
-        <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
+        <span class="tooltip" title="<?= $this->e($task['title']) ?>"
+            <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
+        </span>
     </div>
 
     <div class="task-board-expanded">
diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index 18e7f2841..a394ee671 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -18,7 +18,7 @@
         <tr>
             <td class="column-60"><?= $this->e($column['title']) ?>
              <?php if (! empty($column['description'])): ?>
-                <span class="column-tooltip" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
+                <span class="tooltip" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
                     <i class="fa fa-info-circle"></i>
                 </span>
             <?php endif ?>
diff --git a/app/Template/file/show.php b/app/Template/file/show.php
index 7d5dc96fb..9281c3524 100644
--- a/app/Template/file/show.php
+++ b/app/Template/file/show.php
@@ -16,7 +16,7 @@
                     <?php endif ?>
                     <p>
                         <?= $this->e($file['name']) ?>
-                        <span class="column-tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
+                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
                             <i class="fa fa-info-circle"></i>
                         </span>
                     </p>
@@ -38,7 +38,7 @@
                     <td><i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i></td>
                     <td>
                         <?= $this->e($file['name']) ?>
-                        <span class="column-tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
+                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
                             <i class="fa fa-info-circle"></i>
                         </span>
                     </td>
diff --git a/app/Template/layout.php b/app/Template/layout.php
index a6d00470a..d804d3d5c 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -40,7 +40,7 @@
             <nav>
                 <h1><?= $this->url->link('K<span>B</span>', 'app', 'index', array(), false, 'logo', t('Dashboard')).' '.$this->e($title) ?>
                     <?php if (! empty($description)): ?>
-                        <span class="column-tooltip" title='<?= $this->e($this->text->markdown($description)) ?>'>
+                        <span class="tooltip" title='<?= $this->e($this->text->markdown($description)) ?>'>
                             <i class="fa fa-info-circle"></i>
                         </span>
                     <?php endif ?>
diff --git a/app/Template/project/index.php b/app/Template/project/index.php
index 7a03ec16b..971ba2ae5 100644
--- a/app/Template/project/index.php
+++ b/app/Template/project/index.php
@@ -46,7 +46,7 @@
 
                         <?= $this->url->link($this->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
                         <?php if (! empty($project['description'])): ?>
-                            <span class="column-tooltip" title='<?= $this->e($this->text->markdown($project['description'])) ?>'>
+                            <span class="tooltip" title='<?= $this->e($this->text->markdown($project['description'])) ?>'>
                                 <i class="fa fa-info-circle"></i>
                             </span>
                         <?php endif ?>
diff --git a/app/Template/project/show.php b/app/Template/project/show.php
index beb5a1faf..969dda179 100644
--- a/app/Template/project/show.php
+++ b/app/Template/project/show.php
@@ -51,7 +51,7 @@
         <td>
             <?= $this->e($column['title']) ?>
             <?php if (! empty($column['description'])): ?>
-                <span class="column-tooltip" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
+                <span class="tooltip" title='<?= $this->e($this->text->markdown($column['description'])) ?>'>
                     <i class="fa fa-info-circle"></i>
                 </span>
             <?php endif ?>
diff --git a/assets/css/app.css b/assets/css/app.css
index 37a9c8906..d459e27fe 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -610,7 +610,7 @@ div.ui-tooltip {
     margin-bottom: 0px;
 }
 
-.column-tooltip {
+.tooltip .fa-info-circle {
 	color: #999;
 	font-size: 0.95em;
 }
diff --git a/assets/css/src/tooltip.css b/assets/css/src/tooltip.css
index f6fa8f15f..dca31813b 100644
--- a/assets/css/src/tooltip.css
+++ b/assets/css/src/tooltip.css
@@ -68,7 +68,7 @@ div.ui-tooltip {
     margin-bottom: 0px;
 }
 
-.column-tooltip {
+.tooltip .fa-info-circle {
 	color: #999;
 	font-size: 0.95em;
 }
diff --git a/assets/js/app.js b/assets/js/app.js
index 2c35ae001..b60498dfe 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -144,12 +144,12 @@ $("body").data("login-url")}}})},Init:function(){$(".chosen-select").chosen({wid
 Mousetrap.bind("b",function(a){a.preventDefault();$("#board-selector").trigger("chosen:open")});Mousetrap.bind("f",function(a){a.preventDefault();(a=document.getElementById("form-search"))&&a.focus()});Mousetrap.bind("v b",function(a){a=$(".view-board");a.length&&(window.location=a.attr("href"))});Mousetrap.bind("v c",function(a){a=$(".view-calendar");a.length&&(window.location=a.attr("href"))});Mousetrap.bind("v l",function(a){a=$(".view-listing");a.length&&(window.location=a.attr("href"))});$(document).on("focus",
 "#form-search",function(){$("#form-search")[0].setSelectionRange&&$("#form-search")[0].setSelectionRange($("#form-search").val().length,$("#form-search").val().length)});$(document).on("click",".filter-helper",function(a){a.preventDefault();$("#form-search").val($(this).data("filter"));$("form.search").submit()});$.datepicker.setDefaults($.datepicker.regional[$("body").data("js-lang")]);$(".alert-fade-out").delay(4E3).fadeOut(800,function(){$(this).remove()});Kanboard.InitAfterAjax()},InitAfterAjax:function(){$(document).on("click",
 ".popover",Kanboard.Popover);$("[autofocus]").each(function(a,c){$(this).focus()});$(".form-date").datepicker({showOtherMonths:!0,selectOtherMonths:!0,dateFormat:"yy-mm-dd",constrainInput:!1});$("#markdown-preview").click(Kanboard.MarkdownPreview);$("#markdown-write").click(Kanboard.MarkdownWriter);$(".auto-select").focus(function(){$(this).select()});$(".dropit-submenu").hide();$(".dropdown").not(".dropit").dropit({triggerParentEl:"span"});$(".task-autocomplete").length&&(""==$(".opposite_task_id").val()&&
-$(".task-autocomplete").parent().find("input[type=submit]").attr("disabled","disabled"),$(".task-autocomplete").autocomplete({source:$(".task-autocomplete").data("search-url"),minLength:1,select:function(a,c){var b=$(".task-autocomplete").data("dst-field");$("input[name="+b+"]").val(c.item.id);$(".task-autocomplete").parent().find("input[type=submit]").removeAttr("disabled")}}));$(".column-tooltip").tooltip({content:function(){return'<div class="markdown">'+$(this).attr("title")+"</div>"},position:{my:"left-20 top",
-at:"center bottom+9",using:function(a,c){$(this).css(a);var b=c.target.left+c.target.width/2-c.element.left-20;$("<div>").addClass("tooltip-arrow").addClass(c.vertical).addClass(0==b?"align-left":"align-right").appendTo(this)}}});Kanboard.Exists("screenshot-zone")&&Kanboard.Screenshot.Init()}}}();
+$(".task-autocomplete").parent().find("input[type=submit]").attr("disabled","disabled"),$(".task-autocomplete").autocomplete({source:$(".task-autocomplete").data("search-url"),minLength:1,select:function(a,c){var b=$(".task-autocomplete").data("dst-field");$("input[name="+b+"]").val(c.item.id);$(".task-autocomplete").parent().find("input[type=submit]").removeAttr("disabled")}}));$(".tooltip").tooltip({content:function(){return'<div class="markdown">'+$(this).attr("title")+"</div>"},position:{my:"left-20 top",
+at:"center bottom+9",using:function(a,c){$(this).css(a);var b=c.target.left+c.target.width/2-c.element.left-20;$("<div>").addClass("tooltip-arrow").addClass(c.vertical).addClass(1>b?"align-left":"align-right").appendTo(this)}}});Kanboard.Exists("screenshot-zone")&&Kanboard.Screenshot.Init()}}}();
 (function(){function a(a){a.preventDefault();a.stopPropagation();Kanboard.Popover(a,Kanboard.InitAfterAjax)}function c(){Mousetrap.bind("n",function(){Kanboard.OpenPopover($("#board").data("task-creation-url"),Kanboard.InitAfterAjax)});Mousetrap.bind("s",function(){"expanded"===(Kanboard.GetStorageItem(d())||"expanded")?(e(),Kanboard.SetStorageItem(d(),"collapsed")):(f(),Kanboard.SetStorageItem(d(),"expanded"))});Mousetrap.bind("c",function(){n()})}function b(){$(".filter-expand-link").click(function(a){a.preventDefault();
 f();Kanboard.SetStorageItem(d(),"expanded")});$(".filter-collapse-link").click(function(a){a.preventDefault();e();Kanboard.SetStorageItem(d(),"collapsed")});k()}function d(){return"board_stacking_"+$("#board").data("project-id")}function e(){$(".filter-collapse").hide();$(".task-board-collapsed").show();$(".filter-expand").show();$(".task-board-expanded").hide()}function f(){$(".filter-collapse").show();$(".task-board-collapsed").hide();$(".filter-expand").hide();$(".task-board-expanded").show()}
 function k(){"expanded"===(Kanboard.GetStorageItem(d())||"expanded")?f():e()}function l(){$(".column").sortable({delay:300,distance:5,connectWith:".column",placeholder:"draggable-placeholder",items:".draggable-item",stop:function(a,b){g(b.item.attr("data-task-id"),b.item.parent().attr("data-column-id"),b.item.index()+1,b.item.parent().attr("data-swimlane-id"))}});$("#board").on("click",".task-board-popover",a);$("#board").on("click",".task-board",function(){window.location=$(this).data("task-url")});
-$(".task-board-tooltip").tooltip({track:!1,position:{my:"left-20 top",at:"center bottom+9",using:function(a,b){$(this).css(a);var c=b.target.left+b.target.width/2-b.element.left-20;$("<div>").addClass("tooltip-arrow").addClass(b.vertical).addClass(0==c?"align-left":"align-right").appendTo(this)}},content:function(a){if(a=$(this).attr("data-href")){var b=this;$.get(a,function p(a){$(".ui-tooltip-content:visible").html(a);a=$(".ui-tooltip:visible");a.css({top:"",left:""});a.children(".tooltip-arrow").remove();
+$(".task-board-tooltip").tooltip({track:!1,position:{my:"left-20 top",at:"center bottom+9",using:function(a,b){$(this).css(a);var c=b.target.left+b.target.width/2-b.element.left-20;$("<div>").addClass("tooltip-arrow").addClass(b.vertical).addClass(1>c?"align-left":"align-right").appendTo(this)}},content:function(a){if(a=$(this).attr("data-href")){var b=this;$.get(a,function p(a){$(".ui-tooltip-content:visible").html(a);a=$(".ui-tooltip:visible");a.css({top:"",left:""});a.children(".tooltip-arrow").remove();
 var c=$(b).tooltip("option","position");c.of=$(b);a.position(c);$("#tooltip-subtasks a").not(".popover").click(function(a){a.preventDefault();a.stopPropagation();$(this).hasClass("popover-subtask-restriction")?(Kanboard.OpenPopover($(this).attr("href")),$(b).tooltip("close")):$.get($(this).attr("href"),p)})});return'<i class="fa fa-refresh fa-spin fa-2x"></i>'}}}).on("mouseenter",function(){var a=this;$(this).tooltip("open");$(".ui-tooltip").on("mouseleave",function(){$(a).tooltip("close")})}).on("mouseleave focusout",
 function(a){a.stopImmediatePropagation();var b=this;setTimeout(function(){$(".ui-tooltip:hover").length||$(b).tooltip("close")},100)});var b=parseInt($("#board").attr("data-check-interval"));0<b&&(m=window.setInterval(q,1E3*b))}function g(a,b,c,d){clearInterval(m);$.ajax({cache:!1,url:$("#board").attr("data-save-url"),contentType:"application/json",type:"POST",processData:!1,data:JSON.stringify({task_id:a,column_id:b,swimlane_id:d,position:c}),success:function(a){$("#board-container").remove();$("#main").append(a);
 Kanboard.InitAfterAjax();l();k();h()}})}function q(){Kanboard.IsVisible()&&$.ajax({cache:!1,url:$("#board").attr("data-check-url"),statusCode:{200:function(a){$("#board-container").remove();$("#main").append(a);Kanboard.InitAfterAjax();clearInterval(m);l();k();h()}}})}function r(){jQuery(document).on("click",".filter-toggle-scrolling",function(a){a.preventDefault();n()});h()}function n(){var a=Kanboard.GetStorageItem("horizontal_scroll")||1;Kanboard.SetStorageItem("horizontal_scroll",0==a?1:0);h()}
diff --git a/assets/js/src/base.js b/assets/js/src/base.js
index b2a784249..2540f0841 100644
--- a/assets/js/src/base.js
+++ b/assets/js/src/base.js
@@ -310,7 +310,7 @@ var Kanboard = (function() {
             }
 
             // Tooltip for column description
-            $(".column-tooltip").tooltip({
+            $(".tooltip").tooltip({
                 content: function() {
                     return '<div class="markdown">' + $(this).attr("title") + '</div>';
                 },
@@ -326,7 +326,7 @@ var Kanboard = (function() {
                         $("<div>")
                             .addClass("tooltip-arrow")
                             .addClass(feedback.vertical)
-                            .addClass(arrow_pos == 0 ? "align-left" : "align-right")
+                            .addClass(arrow_pos < 1 ? "align-left" : "align-right")
                             .appendTo(this);
                     }
                 }
diff --git a/assets/js/src/board.js b/assets/js/src/board.js
index 853511ff9..01a16d595 100644
--- a/assets/js/src/board.js
+++ b/assets/js/src/board.js
@@ -139,7 +139,7 @@
                     $("<div>")
                         .addClass("tooltip-arrow")
                         .addClass(feedback.vertical)
-                        .addClass(arrow_pos == 0 ? "align-left" : "align-right")
+                        .addClass(arrow_pos < 1 ? "align-left" : "align-right")
                         .appendTo(this);
                 }
             },
diff --git a/tests/units/UserHelperTest.php b/tests/units/UserHelperTest.php
index 749380c64..9129edd9c 100644
--- a/tests/units/UserHelperTest.php
+++ b/tests/units/UserHelperTest.php
@@ -12,6 +12,5 @@ class UserHelperTest extends Base
 
         $this->assertEquals('CN', $h->getInitials('chuck norris'));
         $this->assertEquals('A', $h->getInitials('admin'));
-        $this->assertEquals('漢', $h->getInitials('漢字'));
     }
 }