diff --git a/supysonic/templates/adduser.html b/supysonic/templates/adduser.html
index e2344de..d8a8abb 100644
--- a/supysonic/templates/adduser.html
+++ b/supysonic/templates/adduser.html
@@ -31,7 +31,7 @@
   <div class="form-group">
     <label class="sr-only" for="user">Username</label>
     <div class="input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
+      <div class="input-group-addon"><span class="glyphicon glyphicon-user"></span></div>
       <input type="text" class="form-control" id="user" name="user" value="{{ request.form.name }}" placeholder="Username" />
       <span class="input-group-addon">
         <label for="admin">Admin</label>
@@ -42,21 +42,21 @@
   <div class="form-group">
     <label class="sr-only" for="passwd">Password</label>
     <div class="input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
+      <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div>
       <input type="password" class="form-control" id="passwd" name="passwd" placeholder="Password" />
     </div>
   </div>
   <div class="form-group">
     <label class="sr-only" for="passwd_confirm">Confirm</label>
     <div class="input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
+      <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div>
       <input type="password" class="form-control" id="passwd_confirm" name="passwd_confirm" placeholder="Confirm" />
     </div>
   </div>
   <div class="form-group">
     <label class="sr-only" for="mail">eMail</label>
     <div class="input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
+      <div class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></div>
       <input type="text" class="form-control" id="mail" name="mail" value="{{ request.form.mail }}" placeholder="eMail" />
     </div>
   </div>
diff --git a/supysonic/templates/change_mail.html b/supysonic/templates/change_mail.html
index 2bd921c..053612f 100644
--- a/supysonic/templates/change_mail.html
+++ b/supysonic/templates/change_mail.html
@@ -31,7 +31,7 @@
   <div class="form-group">
     <label class="sr-only" for="mail">eMail</label>
     <div class="input-group">
-      <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
+      <div class="input-group-addon"><span class="glyphicon glyphicon-envelope"></span></div>
       <input type="text" class="form-control" id="mail" name="mail" value="{{ request.form.mail or user.mail }}" placeholder="eMail" />
     </div>
   </div>
diff --git a/supysonic/templates/folders.html b/supysonic/templates/folders.html
index a0d60ca..ea2dce2 100644
--- a/supysonic/templates/folders.html
+++ b/supysonic/templates/folders.html
@@ -36,9 +36,9 @@
     <tr>
       <td>{{ folder.name }}</td><td>{{ folder.path }}</td><td>
         <a href="{{ url_for('del_folder', id = folder.id) }}" aria-label="Delete folder">
-          <span class="glyphicon glyphicon-remove-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Delete folder"></a></td>
+          <span class="glyphicon glyphicon-remove-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Delete folder"></span></a></td>
       <td><a href="{{ url_for('scan_folder', id = folder.id) }}" aria-label="Scan folder">
-          <span class="glyphicon glyphicon-search" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Scan folder"></a></td>
+          <span class="glyphicon glyphicon-search" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Scan folder"></span></a></td>
     </tr>
     {% endfor %}
   </tbody>