diff --git a/submodules/users/users.css b/submodules/users/users.css
index 2080604..96635fa 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -149,11 +149,15 @@
 	text-align: right;
 }
 
-#users_container .users-grid .grid-row .grid-cell.devices i,
-#users_container .users-grid .grid-row .grid-cell.features i {
+#users_container .users-grid .grid-row .grid-cell.devices i {
 	margin: 0 5px;
 }
 
+#users_container .users-grid .grid-row .grid-cell.features i {
+	margin: 5px 0 0;
+	padding: 0 5px 5px;
+}
+
 #users_container .users-grid .grid-row .grid-cell.features .navbar {
 	margin-bottom: 0;
 	text-align: left;
diff --git a/views/users-row.html b/views/users-row.html
index 91a3998..11011a8 100644
--- a/views/users-row.html
+++ b/views/users-row.html
@@ -58,7 +58,7 @@
 			{{#if extra.hasFeatures}}
 				{{#each extra.mapFeatures}}
 					{{#if this.active}}
-						<i class="{{this.icon}} {{this.iconColor}}"></i>
+						<i class="{{this.icon}} {{this.iconColor}}" data-toggle="tooltip" data-placement="top" data-original-title="{{ this.title }}"></i>
 					{{/if}}
 				{{/each}}
 			{{else}}