diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 99931e4ac..f13916d77 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -70,21 +70,21 @@
           <p><%= t("account.show.user_permission_info") %></p>
 
           <ul>
-            <li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_debates") %></li>
-            <li><i class="icon-check"></i>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
+            <li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_debates") %></li>
+            <li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
             <li>
               <% if current_user.level_two_or_three_verified? %>
-                <i class="icon-check"></i>
+                <span class="icon-check"></span>
               <% else %>
-                <i class="icon-x"></i>
+                <span class="icon-x"></span>
               <% end %>
               <%= t("account.show.user_permission_support_proposal") %>
             </li>
             <li>
               <% if current_user.level_three_verified? %>
-                <i class="icon-check"></i>
+                <span class="icon-check"></span>
               <% else %>
-                <i class="icon-x"></i>
+                <span class="icon-x"></span>
               <% end %>
               <%= t("account.show.user_permission_votes") %>
             </li>
@@ -101,7 +101,7 @@
               <span class="verify-account">
                 <% if current_user.level_three_verified? %>
                   <p class="already-verified">
-                    <i class="icon-check"></i>
+                    <span class="icon-check"></span>
                     <%= t("account.show.verified_account") %>
                   </p>
                 <% elsif current_user.level_two_verified? %>
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 49bd6957d..f435c5511 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -6,14 +6,14 @@
 
     <li <%= "class=active" if controller_name == "tags" %>>
       <%= link_to admin_tags_path do %>
-        <i class="icon-tag"></i>
+        <span class="icon-tag"></span>
         <%= t("admin.menu.debate_topics") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "proposals" %>>
       <%= link_to admin_proposals_path do %>
-        <i class="icon-proposals"></i>
+        <span class="icon-proposals"></span>
         <%= t("admin.menu.hidden_proposals") %>
       <% end %>
     </li>
@@ -21,7 +21,7 @@
     <% if feature?(:debates) %>
       <li <%= "class=active" if controller_name == "debates" %>>
         <%= link_to admin_debates_path do %>
-          <i class="icon-debates"></i>
+          <span class="icon-debates"></span>
           <%= t("admin.menu.hidden_debates") %>
         <% end %>
       </li>
@@ -29,7 +29,7 @@
 
     <li <%= "class=active" if controller_name == "comments" %>>
       <%= link_to admin_comments_path do %>
-        <i class="icon-comments"></i>
+        <span class="icon-comments"></span>
         <%= t("admin.menu.hidden_comments") %>
       <% end %>
     </li>
@@ -37,7 +37,7 @@
     <% if feature?(:spending_proposals) %>
       <li <%= "class=active" if controller_name == "spending_proposals" %>>
         <%= link_to admin_spending_proposals_path do %>
-          <i class="icon-budget"></i>
+          <span class="icon-budget"></span>
           <%= t("admin.menu.spending_proposals") %>
         <% end %>
       </li>
@@ -45,63 +45,63 @@
 
     <li <%= "class=active" if controller_name == "users" %>>
       <%= link_to admin_users_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t("admin.menu.hidden_users") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "verifications" %>>
       <%= link_to admin_verifications_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t("admin.menu.incomplete_verifications") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "organizations" %>>
       <%= link_to admin_organizations_path do %>
-        <i class="icon-organizations"></i>
+        <span class="icon-organizations"></span>
         <%= t("admin.menu.organizations") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "officials" %>>
       <%= link_to admin_officials_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t("admin.menu.officials") %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'moderators' %>>
       <%= link_to admin_moderators_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t('admin.menu.moderators') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'valuators' %>>
       <%= link_to admin_valuators_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t('admin.menu.valuators') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'activity' %>>
       <%= link_to admin_activity_path do %>
-        <i class="icon-eye"></i>
+        <span class="icon-eye"></span>
         <%= t('admin.menu.activity') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'settings' %>>
       <%= link_to admin_settings_path do %>
-        <i class="icon-settings"></i>
+        <span class="icon-settings"></span>
         <%= t("admin.menu.settings") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "stats" %>>
       <%= link_to admin_stats_path do %>
-        <i class="icon-stats"></i>
+        <span class="icon-stats"></span>
         <%= t("admin.menu.stats") %>
       <% end %>
     </li>
diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb
index c008d2a64..ec834eebf 100644
--- a/app/views/admin/organizations/index.html.erb
+++ b/app/views/admin/organizations/index.html.erb
@@ -28,7 +28,7 @@
     <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
-        <i class="icon-check"></i>
+        <span class="icon-check"></span>
         <%= t("admin.organizations.index.verified") %>
       </td>
     <% end %>
@@ -42,7 +42,7 @@
     <% end %>
     <% if organization.rejected? %>
       <td class="rejected">
-        <i class="icon-x"></i>
+        <span class="icon-x"></span>
         <%= t("admin.organizations.index.rejected") %>
       </td>
     <% end %>
diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb
index 877f5b6e6..9e90975ab 100644
--- a/app/views/admin/organizations/search.html.erb
+++ b/app/views/admin/organizations/search.html.erb
@@ -24,7 +24,7 @@
     <td><%= organization.responsible_name %></td>
     <% if organization.verified? %>
       <td class="verified">
-        <i class="icon-check"></i>
+        <span class="icon-check"></span>
         <%= t("admin.organizations.index.verified") %>
       </td>
     <% end %>
@@ -38,7 +38,7 @@
     <% end %>
     <% if organization.rejected? %>
       <td class="rejected">
-        <i class="icon-x"></i>
+        <span class="icon-x"></span>
         <%= t("admin.organizations.index.rejected") %>
       </td>
     <% end %>
diff --git a/app/views/admin/spending_proposals/_written_by_author.html.erb b/app/views/admin/spending_proposals/_written_by_author.html.erb
index 52331e987..8440666e5 100644
--- a/app/views/admin/spending_proposals/_written_by_author.html.erb
+++ b/app/views/admin/spending_proposals/_written_by_author.html.erb
@@ -36,7 +36,7 @@
 <% end %>
 
 <% if @spending_proposal.external_url.present? %>
-  <p><%= text_with_links @spending_proposal.external_url %>&nbsp;<i class="icon-external small"></i></p>
+  <p><%= text_with_links @spending_proposal.external_url %>&nbsp;<span class="icon-external small"></span></p>
 <% end %>
 
 <%= safe_html_with_links @spending_proposal.description %>
diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb
index 67160b926..1dcf5c109 100644
--- a/app/views/admin/spending_proposals/edit.html.erb
+++ b/app/views/admin/spending_proposals/edit.html.erb
@@ -1,5 +1,5 @@
 <%= link_to admin_spending_proposal_path(@spending_proposal, SpendingProposal.filter_params(params)), class: 'back' do %>
-  <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
+  <span class="icon-angle-left"></span> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
 <%= render 'written_by_author' %>
diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index 750d8b257..bbcf4b4fc 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -1,5 +1,5 @@
 <%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %>
-  <i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
+  <span class="icon-angle-left"></span> <%= t("admin.spending_proposals.show.back") %>
 <% end %>
 
 <%= render 'written_by_author' %>
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index f73e581d5..3747fa15d 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -15,7 +15,7 @@
           <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar float-left") %>
         <% else %>
         <% if comment.user.hidden? || comment.user.erased? %>
-            <i class="icon-deleted user-deleted"></i>
+            <span class="icon-deleted user-deleted"></span>
           <% elsif comment.user.organization? %>
             <%= image_tag("collective_avatar.png", size: 32, class: "avatar float-left") %>
           <% else %>
@@ -74,7 +74,7 @@
 
             <% if comment.children.size > 0 %>
               <%= link_to "", class: "js-toggle-children", data:  {'id': "#{dom_id(comment)}"} do %>
-                <i id="<%= dom_id(comment) %>_children_arrow" class="icon-angle-down"></i> <%= t("comments.comment.responses", count: comment.children.size) %>
+                <i id="<%= dom_id(comment) %>_children_arrow" class="icon-angle-down"></span> <%= t("comments.comment.responses", count: comment.children.size) %>
               <% end %>
             <% else %>
               <%= t("comments.comment.responses", count: 0) %>
diff --git a/app/views/comments/_flag_actions.html.erb b/app/views/comments/_flag_actions.html.erb
index b7f0e6ef8..87698af06 100644
--- a/app/views/comments/_flag_actions.html.erb
+++ b/app/views/comments/_flag_actions.html.erb
@@ -4,7 +4,7 @@
     <a id="flag-expand-comment-<%= comment.id %>"
     data-toggle="flag-drop-comment-<%= comment.id %>"
     title="<%= t('shared.flag') %>">
-      <i class="icon-flag flag-disable"></i>
+      <span class="icon-flag flag-disable"></span>
     </a>
     <div id="flag-drop-comment-<%= comment.id %>"
          class="dropdown-pane"
@@ -20,7 +20,7 @@
     <a id="unflag-expand-comment-<%= comment.id %>"
        data-toggle="unflag-drop-comment-<%= comment.id %>"
        title="<%= t('shared.unflag') %>">
-      <i class="icon-flag flag-active"></i>
+      <span class="icon-flag flag-active"></span>
     </a>
     <div class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put,
diff --git a/app/views/comments/_votes.html.erb b/app/views/comments/_votes.html.erb
index 06e6c04c6..20fc2d1cf 100644
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -7,10 +7,10 @@
       <% if can?(:vote, comment) %>
         <%= link_to vote_comment_path(comment, value: 'yes'),
             method: "post", remote: true do %>
-            <i class="icon-angle-up"></i>
+            <span class="icon-angle-up"></span>
         <% end %>
       <% else %>
-        <i class="icon-angle-up"></i>
+        <span class="icon-angle-up"></span>
       <% end %>
       <%= comment.total_likes %>
     </span>
@@ -19,16 +19,16 @@
       <% if can?(:vote, comment) %>
         <%= link_to vote_comment_path(comment, value: 'no'),
             method: "post", remote: true do %>
-            <i class="icon-angle-down"></i>
+            <span class="icon-angle-down"></span>
         <% end %>
       <% else %>
-        <i class="icon-angle-down"></i>
+        <span class="icon-angle-down"></span>
       <% end %>
       <%= comment.total_dislikes %>
     </span>
 
   <% elsif !user_signed_in? %>
-    
+
     <div class="logged" >
       <%= t('comments.comment.votes', count: comment.total_votes) %>
       &nbsp;|&nbsp;
@@ -37,10 +37,10 @@
         <% if can?(:vote, comment) %>
           <%= link_to vote_comment_path(comment, value: 'yes'),
               method: "post", remote: true do %>
-              <i class="icon-angle-up"></i>
+              <span class="icon-angle-up"></span>
           <% end %>
         <% else %>
-          <i class="icon-angle-up"></i>
+          <span class="icon-angle-up"></span>
         <% end %>
         <%= comment.total_likes %>
       </span>
@@ -48,14 +48,14 @@
         <% if can?(:vote, comment) %>
           <%= link_to vote_comment_path(comment, value: 'no'),
               method: "post", remote: true do %>
-              <i class="icon-angle-down"></i>
+              <span class="icon-angle-down"></span>
           <% end %>
         <% else %>
-          <i class="icon-angle-down"></i>
+          <span class="icon-angle-down"></span>
         <% end %>
         <%= comment.total_dislikes %>
       </span>
-     </div> 
+     </div>
     <div class="not-logged" style='display:none'>
       <%= t("votes.comment_unauthenticated",
         signin: link_to(t("votes.signin"), new_user_session_path),
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb
index cd4f66ba0..e20790181 100644
--- a/app/views/comments/show.html.erb
+++ b/app/views/comments/show.html.erb
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="small-12 column margin-top">
     <%= link_to @comment.commentable, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("comments.show.return_to_commentable") + @comment.commentable.title %>
     <% end %>
   </div>
diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
index fcd74b3db..c9807041b 100644
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -6,10 +6,10 @@
         <div class="small-12 medium-9 column">
           <div class="debate-content">
             <span class="label-debate float-left"><%= t("debates.debate.debate") %></span>
-            <i class="icon-debates"></i>
+            <span class="icon-debates"></span>
             <h3><%= link_to debate.title, debate %></h3>
             <p class="debate-info">
-              <i class="icon-comments"></i>&nbsp;
+              <span class="icon-comments"></span>&nbsp;
               <%= link_to t("debates.debate.comments", count: debate.comments_count), debate_path(debate, anchor: "comments") %>
               <span class="bullet">&nbsp;&bull;&nbsp;</span>
               <%= l debate.created_at.to_date %>
diff --git a/app/views/debates/_flag_actions.html.erb b/app/views/debates/_flag_actions.html.erb
index 0b0e52adb..1e0879142 100644
--- a/app/views/debates/_flag_actions.html.erb
+++ b/app/views/debates/_flag_actions.html.erb
@@ -1,7 +1,7 @@
 <span class="flag-content">
   <% if show_flag_action? debate %>
     <a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t('shared.flag') %>">
-      <i class="icon-flag flag-disable"></i>
+      <span class="icon-flag flag-disable"></span>
     </a>
     <div class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
@@ -10,7 +10,7 @@
 
   <% if show_unflag_action? debate %>
     <a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t('shared.unflag') %>">
-      <i class="icon-flag flag-active"></i>
+      <span class="icon-flag flag-active"></span>
     </a>
     <div class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
diff --git a/app/views/debates/_votes.html.erb b/app/views/debates/_votes.html.erb
index 970bcc8a5..054696478 100644
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -3,7 +3,7 @@
   <div class="in-favor inline-block">
     <%= link_to vote_debate_path(debate, value: 'yes'),
         class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %>
-      <i class="icon-like"></i>
+      <span class="icon-like"></span>
       <span><%= votes_percentage('likes', debate) %></span>
     <% end %>
   </div>
@@ -12,7 +12,7 @@
 
   <div class="against inline-block">
     <%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %>
-      <i class="icon-unlike"></i>
+      <span class="icon-unlike"></span>
       <span><%= votes_percentage('dislikes', debate) %></span>
     <% end %>
   </div>
diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb
index 836ec946b..34a7f70df 100644
--- a/app/views/debates/edit.html.erb
+++ b/app/views/debates/edit.html.erb
@@ -2,7 +2,7 @@
 
   <div class="small-12 column">
     <%= link_to debates_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.edit.back_link") %>
     <% end %>
 
diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb
index 977157989..19c6e9dba 100644
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -2,7 +2,7 @@
 
   <div class="small-12 medium-9 column">
     <%= link_to debates_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.new.back_link") %>
     <% end %>
     <h1><%= t("debates.new.start_new") %></h1>
@@ -17,7 +17,7 @@
   </div>
 
   <div class="small-12 medium-3 column">
-    <i class="icon-debates float-right"></i>
+    <span class="icon-debates float-right"></span>
     <h2><%= t("debates.new.recommendations_title") %></h2>
     <ul class="recommendations">
       <li><%= t("debates.new.recommendation_one") %></li>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index eb3f5bbc0..93ca49862 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -4,12 +4,12 @@
     <div id="<%= dom_id(@debate) %>" class="row">
       <div class="small-12 medium-9 column">
         <%= link_to :back, class: "back" do %>
-          <i class="icon-angle-left"></i>
+          <span class="icon-angle-left"></span>
           <%= t("debates.show.back_link") %>
         <% end %>
         <% if current_user && @debate.editable_by?(current_user) %>
           <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %>
-            <i class="icon-edit"></i>
+            <span class="icon-edit"></span>
             <%= t("debates.show.edit_debate_link") %>
           <% end %>
         <% end %>
@@ -27,7 +27,7 @@
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= l @debate.created_at.to_date %>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <i class="icon-comments"></i>&nbsp;
+          <span class="icon-comments"></span>&nbsp;
           <%= link_to t("debates.show.comments", count: @debate.comments_count), "#comments" %>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <span class="js-flag-actions">
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb
index 95a6a7762..55665708a 100644
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -2,11 +2,11 @@
   <li>
     <%= link_to notifications_path, class: "notifications", accesskey: "n" do %>
       <% if current_user.notifications_count > 0 %>
-        <i class="icon-circle" aria-hidden="true"></i>
-        <i class="icon-notification" aria-hidden="true" title="<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>">
-        </i>
+        <span class="icon-circle" aria-hidden="true"></span>
+        <span class="icon-notification" aria-hidden="true" title="<%= t('layouts.header.new_notifications', count: current_user.notifications_count).html_safe %>">
+        </span>
       <% else %>
-        <i class="icon-no-notification" aria-hidden="true" title="<%= t('layouts.header.no_notifications') %>"></i>
+        <span class="icon-no-notification" aria-hidden="true" title="<%= t('layouts.header.no_notifications') %>"></span>
       <% end %>
     <% end %>
   </li>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index a390f6340..74e6fb392 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -57,7 +57,7 @@
             <li class="inline-block">
               <%= link_to "https://twitter.com/#{setting['twitter_handle']}", target: "_blank", title: t("social.twitter") do %>
                 <span class="sr-only"><%= t("social.twitter") %></span>
-                <i class="icon-twitter" aria-hidden="true"></i>
+                <span class="icon-twitter" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
@@ -65,7 +65,7 @@
             <li class="inline-block">
               <%= link_to "https://www.facebook.com/#{setting['facebook_handle']}/", target: "_blank", title: t("social.facebook") do %>
                 <span class="sr-only"><%= t("social.facebook") %></span>
-                <i class="icon-facebook" aria-hidden="true"></i>
+                <span class="icon-facebook" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
@@ -73,7 +73,7 @@
             <li class="inline-block">
               <%= link_to setting['blog_url'], target: "_blank", title: t("social.blog") do %>
                 <span class="sr-only"><%= t("social.blog") %></span>
-                <i class="icon-blog" aria-hidden="true"></i>
+                <span class="icon-blog" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
@@ -81,7 +81,7 @@
             <li class="inline-block">
               <%= link_to "https://www.youtube.com/#{setting['youtube_handle']}", target: "_blank", title: t("social.youtube") do %>
                 <span class="sr-only"><%= t("social.youtube") %></span>
-                <i class="icon-youtube" aria-hidden="true"></i>
+                <span class="icon-youtube" aria-hidden="true"></span>
               <% end %>
             </li>
           <% end %>
diff --git a/app/views/legislations/show.html.erb b/app/views/legislations/show.html.erb
index 9d9fc9212..006d91bb2 100644
--- a/app/views/legislations/show.html.erb
+++ b/app/views/legislations/show.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 column">
     <div class="float-right">
       <a class="button warning" type="button" data-toggle="help-legislation">
-        <sub><i class="icon-edit"></i></sub>&nbsp;
+        <sub><span class="icon-edit"></span></sub>&nbsp;
         <%= t("legislation.help.title") %>
       </a>
 
diff --git a/app/views/management/_menu.html.erb b/app/views/management/_menu.html.erb
index 9a46c2be0..1810ab568 100644
--- a/app/views/management/_menu.html.erb
+++ b/app/views/management/_menu.html.erb
@@ -8,35 +8,35 @@
                               controller_name == "email_verifications" ||
                               controller_name == "users" %>>
       <%= link_to management_document_verifications_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t("management.menu.users") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "proposals" and action_name == "new" %>>
       <%= link_to new_management_proposal_path do %>
-        <i class="icon-proposals"></i>
+        <span class="icon-proposals"></span>
         <%= t("management.menu.create_proposal") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "proposals" and action_name == "index"  %>>
       <%= link_to management_proposals_path do %>
-        <i class="icon-like"></i>
+        <span class="icon-like"></span>
         <%= t("management.menu.support_proposals") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "spending_proposals" and action_name == "new" %>>
       <%= link_to new_management_spending_proposal_path do %>
-        <i class="icon-budget"></i>
+        <span class="icon-budget"></span>
         <%= t("management.menu.create_spending_proposal") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "proposals" and action_name == "print" %>>
       <%= link_to print_management_proposals_path do %>
-        <i class="icon-print"></i>
+        <span class="icon-print"></span>
         <%= t("management.menu.print_proposals") %>
       <% end %>
     </li>
diff --git a/app/views/management/_user_permissions.html.erb b/app/views/management/_user_permissions.html.erb
index 8b17605ea..9e2fefd2d 100644
--- a/app/views/management/_user_permissions.html.erb
+++ b/app/views/management/_user_permissions.html.erb
@@ -11,7 +11,7 @@
   <ul>
     <% [:debates, :create_proposals, :support_proposals, :vote_proposals].each do |permission| %>
       <li>
-        <i class="<%= permissions.include?(permission) ? 'icon-check' : 'icon-x' %>"></i>
+        <span class="<%= permissions.include?(permission) ? 'icon-check' : 'icon-x' %>"></span>
         <%= t("management.permissions.#{permission}") %>
       </li>
     <% end %>
diff --git a/app/views/moderation/_menu.html.erb b/app/views/moderation/_menu.html.erb
index b7b4b2b0d..652089969 100644
--- a/app/views/moderation/_menu.html.erb
+++ b/app/views/moderation/_menu.html.erb
@@ -6,7 +6,7 @@
 
     <li <%= "class=active" if controller_name == "proposals" %>>
       <%= link_to moderation_proposals_path do %>
-        <i class="icon-proposals"></i>
+        <span class="icon-proposals"></span>
         <%= t("moderation.menu.proposals") %>
       <% end %>
     </li>
@@ -14,7 +14,7 @@
     <% if feature?(:debates) %>
       <li <%= "class=active" if controller_name == "debates" %>>
         <%= link_to moderation_debates_path do %>
-          <i class="icon-debates"></i>
+          <span class="icon-debates"></span>
           <%= t('moderation.menu.flagged_debates') %>
         <% end %>
       </li>
@@ -22,14 +22,14 @@
 
     <li <%= "class=active" if controller_name == "comments" %>>
       <%= link_to moderation_comments_path do %>
-        <i class="icon-comments"></i>
+        <span class="icon-comments"></span>
         <%= t("moderation.menu.flagged_comments") %>
       <% end %>
     </li>
 
     <li <%= "class=active" if controller_name == "users" %>>
       <%= link_to moderation_users_path do %>
-        <i class="icon-user"></i>
+        <span class="icon-user"></span>
         <%= t("moderation.menu.users") %>
       <% end %>
     </li>
diff --git a/app/views/moderation/comments/index.html.erb b/app/views/moderation/comments/index.html.erb
index c95bbd05b..c12b1405d 100644
--- a/app/views/moderation/comments/index.html.erb
+++ b/app/views/moderation/comments/index.html.erb
@@ -38,7 +38,7 @@
           <br>
           <span class="date"><%= l comment.updated_at.to_date %></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= comment.flags_count %><i class="icon-flag flag-disable"></i>
+          <%= comment.flags_count %><span class="icon-flag flag-disable"></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= comment.author.username %>
           <br>
diff --git a/app/views/moderation/debates/index.html.erb b/app/views/moderation/debates/index.html.erb
index 390c089cf..4fecee50b 100644
--- a/app/views/moderation/debates/index.html.erb
+++ b/app/views/moderation/debates/index.html.erb
@@ -36,7 +36,7 @@
           <br>
           <span class="date"><%= l debate.updated_at.to_date %></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= debate.flags_count %><i class="icon-flag flag-disable"></i>
+          <%= debate.flags_count %><span class="icon-flag flag-disable"></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= debate.author.username %>
           <br>
diff --git a/app/views/moderation/proposals/index.html.erb b/app/views/moderation/proposals/index.html.erb
index 1f6124543..0b8d64ca1 100644
--- a/app/views/moderation/proposals/index.html.erb
+++ b/app/views/moderation/proposals/index.html.erb
@@ -36,7 +36,7 @@
           <br>
           <span class="date"><%= l proposal.updated_at.to_date %></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= proposal.flags_count %><i class="icon-flag flag-disable"></i>
+          <%= proposal.flags_count %><span class="icon-flag flag-disable"></span>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= proposal.author.username %>
           <br>
diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb
index 9fd168dca..877927f55 100644
--- a/app/views/pages/faq.html.erb
+++ b/app/views/pages/faq.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="menu small-12 medium-3 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
@@ -41,25 +41,25 @@
       <li>Si nos <a href="https://decide.madrid.es/users/sign_up">registramos</a> en la web con nuestro correo electrónico y no damos ningún dato más (no hacemos el proceso de verificación de residencia) podremos:</li>
     </ul>
 
-    <p><i class="icon-check"></i> Participar en debates</p>
-    <p><i class="icon-check"></i> Crear propuestas</p>
+    <p><span class="icon-check"></span> Participar en debates</p>
+    <p><span class="icon-check"></span> Crear propuestas</p>
 
     <ul>
       <li>Si despues de registrarnos realizamos la verificación básica (a través de la web consiste en verificar la residencia y dar un móvil para que nos manden un código de confirmación; ver información detallada del proceso en la sección <a href="#5">"¿Cómo creo y verifico mi cuenta?"</a> será posible:</li>
     </ul>
 
-    <p><i class="icon-check"></i> Participar en debates</p>
-    <p><i class="icon-check"></i> Crear propuestas</p>
-    <p><i class="icon-check"></i> Apoyar propuestas</p>
+    <p><span class="icon-check"></span> Participar en debates</p>
+    <p><span class="icon-check"></span> Crear propuestas</p>
+    <p><span class="icon-check"></span> Apoyar propuestas</p>
 
     <ul>
       <li>Si realizamos la verificación completa de nuestra cuenta (esto se puede realizar presencialmente en cualquiera de las <a href="http://www.madrid.es/portales/munimadrid/es/Inicio/El-Ayuntamiento/Atencion-al-ciudadano/Oficinas-de-Atencion-al-Ciudadano?vgnextfmt=default&vgnextchannel=5b99cde2e09a4310VgnVCM1000000b205a0aRCRD" target="_blank">26 Oficinas de Atención al Ciudadano</a> que hay por todo Madrid, o después de realizar la verificación básica pulsando en el enlace "Solicitar una carta por correo postal" que nos mandará a casa una carta con un código y unas instrucciones muy sencillas para terminar de verificarnos completamente) nos será posible realizar todas las acciones:</li>
     </ul>
 
-    <p><i class="icon-check"></i> Participar en debates</p>
-    <p><i class="icon-check"></i> Crear propuestas</p>
-    <p><i class="icon-check"></i> Apoyar propuestas</p>
-    <p><i class="icon-check"></i> Votar propuestas</p>
+    <p><span class="icon-check"></span> Participar en debates</p>
+    <p><span class="icon-check"></span> Crear propuestas</p>
+    <p><span class="icon-check"></span> Apoyar propuestas</p>
+    <p><span class="icon-check"></span> Votar propuestas</p>
 
     <p><strong>Recuerda</strong> que la votación de propuestas es un proceso muy concreto que sólo ocurre durante una semana una vez las propuestas han llegado al 2% de apoyos, por lo tanto por lo general será posible realizar todas las acciones en la web con la verificación básica de nuestra cuenta.</p>
 
diff --git a/app/views/pages/how_it_works.html.erb b/app/views/pages/how_it_works.html.erb
index eec62da64..9d52c2732 100644
--- a/app/views/pages/how_it_works.html.erb
+++ b/app/views/pages/how_it_works.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="small-12 medium-3 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/how_to_use.html.erb b/app/views/pages/how_to_use.html.erb
index e488f2072..680d15cdf 100644
--- a/app/views/pages/how_to_use.html.erb
+++ b/app/views/pages/how_to_use.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="text small-12 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/participation.html.erb b/app/views/pages/participation.html.erb
index 649896224..4f402340e 100644
--- a/app/views/pages/participation.html.erb
+++ b/app/views/pages/participation.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="small-12 medium-3 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/participation_facts.html.erb b/app/views/pages/participation_facts.html.erb
index 995c4413d..a4c97c483 100644
--- a/app/views/pages/participation_facts.html.erb
+++ b/app/views/pages/participation_facts.html.erb
@@ -2,7 +2,7 @@
   <div class="text small-12 column">
 
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/participation_world.html.erb b/app/views/pages/participation_world.html.erb
index f93ccf619..de0ac1eb7 100644
--- a/app/views/pages/participation_world.html.erb
+++ b/app/views/pages/participation_world.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="small-12 medium-3 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/proposals_info.html.erb b/app/views/pages/proposals_info.html.erb
index a54a40353..3bdef0bfe 100644
--- a/app/views/pages/proposals_info.html.erb
+++ b/app/views/pages/proposals_info.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 medium-3 column">
 
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/pages/spending_proposals_info.html.erb b/app/views/pages/spending_proposals_info.html.erb
index 060024ab0..bf22505bc 100644
--- a/app/views/pages/spending_proposals_info.html.erb
+++ b/app/views/pages/spending_proposals_info.html.erb
@@ -1,7 +1,7 @@
 <div class="row margin-top">
   <div class="small-12 medium-3 column">
     <%= link_to "/more_information", class: 'back' do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("debates.show.back_link") %>
     <% end %>
 
diff --git a/app/views/proposals/_flag_actions.html.erb b/app/views/proposals/_flag_actions.html.erb
index 382414921..aba7a2423 100644
--- a/app/views/proposals/_flag_actions.html.erb
+++ b/app/views/proposals/_flag_actions.html.erb
@@ -1,7 +1,7 @@
 <span class="flag-content">
   <% if show_flag_action? proposal %>
     <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
-      <i class="icon-flag flag-disable"></i>
+      <span class="icon-flag flag-disable"></span>
     </a>
     <div class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
@@ -10,7 +10,7 @@
 
   <% if show_unflag_action? proposal %>
     <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
-      <i class="icon-flag flag-active"></i>
+      <span class="icon-flag flag-active"></span>
     </a>
     <div class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
index 164b97589..e1e5d36a0 100644
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -7,10 +7,10 @@
 
           <% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %>
             <span class="label-proposal float-left"><%= t("proposals.proposal.proposal") %></span>
-            <i class="icon-proposals"></i>
+            <span class="icon-proposals"></span>
             <h3><%= link_to proposal.title, namespaced_proposal_path(proposal) %></h3>
             <p class="proposal-info">
-              <i class="icon-comments"></i>&nbsp;
+              <span class="icon-comments"></span>&nbsp;
               <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), namespaced_proposal_path(proposal, anchor: "comments") %>
 
               <span class="bullet">&nbsp;&bull;&nbsp;</span>
diff --git a/app/views/proposals/edit.html.erb b/app/views/proposals/edit.html.erb
index 71ef41e9d..f29149772 100644
--- a/app/views/proposals/edit.html.erb
+++ b/app/views/proposals/edit.html.erb
@@ -2,7 +2,7 @@
 
   <div class="small-12 column">
     <%= link_to proposals_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("proposals.edit.back_link") %>
     <% end %>
 
diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb
index 43368e442..9acf548a1 100644
--- a/app/views/proposals/new.html.erb
+++ b/app/views/proposals/new.html.erb
@@ -2,7 +2,7 @@
 
   <div class="small-12 medium-9 column">
     <%= link_to proposals_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("proposals.new.back_link") %>
     <% end %>
     <h1><%= t("proposals.new.start_new") %></h1>
@@ -15,7 +15,7 @@
   </div>
 
   <div class="small-12 medium-3 column">
-    <i class="icon-proposals float-right"></i>
+    <span class="icon-proposals float-right"></span>
     <h2><%= t("proposals.new.recommendations_title") %></h2>
     <ul class="recommendations">
       <li><%= t("proposals.new.recommendation_one") %></li>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 2b060d501..3a7434d75 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -11,12 +11,12 @@
     <div id="<%= dom_id(@proposal) %>" class="row">
       <div class="small-12 medium-9 column">
         <%= link_to :back, class: "back" do %>
-          <i class="icon-angle-left"></i>
+          <span class="icon-angle-left"></span>
           <%= t("proposals.show.back_link") %>
         <% end %>
         <% if current_user && @proposal.editable_by?(current_user) %>
           <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button success small float-right' do %>
-            <i class="icon-edit"></i>
+            <span class="icon-edit"></span>
             <%= t("proposals.show.edit_proposal_link") %>
           <% end %>
         <% end %>
@@ -34,7 +34,7 @@
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <%= l @proposal.created_at.to_date %>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <i class="icon-comments"></i>&nbsp;
+          <span class="icon-comments"></span>&nbsp;
           <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <span class="js-flag-actions">
diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb
index 960c9e618..0ef9450a3 100644
--- a/app/views/proposals/summary.html.erb
+++ b/app/views/proposals/summary.html.erb
@@ -3,7 +3,7 @@
     <div id="proposals" class="proposals-list small-12 medium-9 column margin-top">
 
       <%= link_to :back, class: 'back left' do %>
-        <i class="icon-angle-left left"></i>
+        <span class="icon-angle-left left"></span>
         <%= t("proposals.show.back_link") %>
       <% end %>
 
diff --git a/app/views/shared/_author_info.html.erb b/app/views/shared/_author_info.html.erb
index 625888624..1a0315341 100644
--- a/app/views/shared/_author_info.html.erb
+++ b/app/views/shared/_author_info.html.erb
@@ -1,5 +1,5 @@
 <% if resource.author.hidden? || resource.author.erased? %>
-  <i class="icon-deleted author-deleted"></i>
+  <span class="icon-deleted author-deleted"></span>
   <span class="author deleted">
       <%= t("shared.author_info.author_deleted") %>
   </span>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 6747e8317..c572515f0 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -6,7 +6,7 @@
       <div class="input-group-button">
         <button type="submit" class="button" title="<%= t("#{i18n_namespace}.button") %>">
           <span class="sr-only"><%= t("#{i18n_namespace}.button") %></span>
-          <i class="icon-search"></i>
+          <span class="icon-search"></span>
         </button>
       </div>
     </div>
diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb
index bd8f00203..ab4eb4089 100644
--- a/app/views/spending_proposals/new.html.erb
+++ b/app/views/spending_proposals/new.html.erb
@@ -2,7 +2,7 @@
 
   <div class="small-12 medium-9 column">
     <%= link_to spending_proposals_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("spending_proposals.new.back_link") %>
     <% end %>
     <h1><%= t("spending_proposals.new.start_new") %></h1>
@@ -15,7 +15,7 @@
   </div>
 
   <div class="small-12 medium-3 column">
-    <i class="icon-budget float-right"></i>
+    <span class="icon-budget float-right"></span>
     <h2><%= t("spending_proposals.new.recommendations_title") %></h2>
     <ul class="recommendations">
       <li><%= t("spending_proposals.new.recommendation_one") %></li>
diff --git a/app/views/users/registrations/delete_form.html.erb b/app/views/users/registrations/delete_form.html.erb
index 228d4db98..aab1d4a0a 100644
--- a/app/views/users/registrations/delete_form.html.erb
+++ b/app/views/users/registrations/delete_form.html.erb
@@ -1,5 +1,5 @@
 <%= link_to :back, class: "back" do %>
-  <i class="icon-angle-left"></i>
+  <span class="icon-angle-left"></span>
   <%= t("devise_views.users.registrations.edit.back_link") %>
 <% end %>
 
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index f4b5f7cf2..c01403ae8 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,5 +1,5 @@
 <%= link_to :back, class: "back" do %>
-  <i class="icon-angle-left float-left"></i>
+  <span class="icon-angle-left float-left"></span>
   <%= t("devise_views.users.registrations.edit.back_link") %>
 <% end %>
 
diff --git a/app/views/valuation/_menu.html.erb b/app/views/valuation/_menu.html.erb
index 76f6ff434..c63b6421a 100644
--- a/app/views/valuation/_menu.html.erb
+++ b/app/views/valuation/_menu.html.erb
@@ -7,7 +7,7 @@
     <% if feature?(:spending_proposals) %>
       <li <%= "class=active" if controller_name == "spending_proposals" %>>
         <%= link_to valuation_spending_proposals_path do %>
-          <i class="icon-budget"></i>
+          <span class="icon-budget"></span>
           <%= t("valuation.menu.spending_proposals") %>
         <% end %>
       </li>
diff --git a/app/views/valuation/spending_proposals/show.html.erb b/app/views/valuation/spending_proposals/show.html.erb
index 406ad00bf..d91635efe 100644
--- a/app/views/valuation/spending_proposals/show.html.erb
+++ b/app/views/valuation/spending_proposals/show.html.erb
@@ -1,5 +1,5 @@
 <%= link_to :back, class: 'back' do %>
-  <i class="icon-angle-left"></i> <%= t("valuation.spending_proposals.show.back") %>
+  <span class="icon-angle-left"></span> <%= t("valuation.spending_proposals.show.back") %>
 <% end %>
 
 <h2><%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %> </h2>
diff --git a/app/views/verification/letter/edit.html.erb b/app/views/verification/letter/edit.html.erb
index c792e219d..0f280f783 100644
--- a/app/views/verification/letter/edit.html.erb
+++ b/app/views/verification/letter/edit.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 medium-9 large-6 small-centered column">
     <div class="text-center">
       <h1>
-        <i class="icon-check"></i>
+        <span class="icon-check"></span>
         <%= t("pages.verify.title") %>
       </h1>
 
@@ -15,7 +15,7 @@
         <%= f.password_field :password, label: t("pages.verify.password"), placeholder: t("pages.verify.password") %>
 
         <p class="letter-divider text-center">
-          <i class="icon-letter"></i>
+          <span class="icon-letter"></span>
         </p>
 
         <p>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 130fb106c..ab2066b70 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -20,7 +20,7 @@
     <div class="small-12 medium-4 column">
 
       <%= link_to account_path, class: "back" do %>
-        <i class="icon-angle-left float-left"></i>
+        <span class="icon-angle-left float-left"></span>
         <%= t("verification.back") %>
       <% end %>
 
@@ -31,10 +31,10 @@
         <p><%= t("verification.letter.new.user_permission_info") %></p>
 
         <ul>
-          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
-          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
-          <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
-          <li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
+          <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_debates") %></li>
+          <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_proposal") %></li>
+          <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
+          <li><span class="icon-x"></span>&nbsp;<%= t("verification.user_permission_votes") %></li>
         </ul>
       </div>
 
@@ -42,7 +42,7 @@
     </div>
     <div class="small-12 medium-8 column final-votes-info">
 
-      <i class="icon-box"></i>
+      <span class="icon-box"></span>
 
       <p><strong><%= t("verification.letter.new.explanation") %></strong></p>
 
diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb
index a21cfb4ed..a0db69fd2 100644
--- a/app/views/verification/letter/show.html.erb
+++ b/app/views/verification/letter/show.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 column">
 
     <%= link_to account_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("verification.back") %>
     <% end %>
 
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 3ad074277..439138627 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -18,7 +18,7 @@
     </div>
 
     <%= link_to account_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("verification.back") %>
     <% end %>
 
@@ -28,10 +28,10 @@
       <p><%= t("verification.user_permission_info") %></p>
 
       <ul>
-        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
-        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
-        <li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
-        <li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
+        <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_debates") %></li>
+        <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_proposal") %></li>
+        <li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
+        <li><span class="icon-x"></span>&nbsp;<%= t("verification.user_permission_votes") %></li>
       </ul>
     </div>
 
diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb
index 94fed7fd4..7e11af9d5 100644
--- a/app/views/verification/sms/edit.html.erb
+++ b/app/views/verification/sms/edit.html.erb
@@ -18,7 +18,7 @@
     </div>
 
     <%= link_to account_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("verification.back") %>
     <% end %>
 
diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb
index 2e304ddda..6019c89cd 100644
--- a/app/views/verification/sms/new.html.erb
+++ b/app/views/verification/sms/new.html.erb
@@ -18,7 +18,7 @@
     </div>
 
     <%= link_to account_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("verification.back") %>
     <% end %>
 
diff --git a/app/views/verification/verified_user/show.html.erb b/app/views/verification/verified_user/show.html.erb
index f1ae927b2..69e98eeb6 100644
--- a/app/views/verification/verified_user/show.html.erb
+++ b/app/views/verification/verified_user/show.html.erb
@@ -2,7 +2,7 @@
   <div class="small-12 column">
 
     <%= link_to account_path, class: "back" do %>
-      <i class="icon-angle-left"></i>
+      <span class="icon-angle-left"></span>
       <%= t("verification.back") %>
     <% end %>
 
diff --git a/app/views/welcome/welcome.html.erb b/app/views/welcome/welcome.html.erb
index be9d3abe2..696c040a9 100644
--- a/app/views/welcome/welcome.html.erb
+++ b/app/views/welcome/welcome.html.erb
@@ -5,10 +5,10 @@
   <p><%= t("welcome.welcome.user_permission_info") %></p>
 
   <ul>
-    <li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_debates") %></li>
-    <li><i class="icon-check"></i>&nbsp;<%= t("welcome.welcome.user_permission_proposal") %></li>
-    <li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_support_proposal") %></li>
-    <li><i class="icon-x"></i>&nbsp;<%= t("welcome.welcome.user_permission_votes") %></li>
+    <li><span class="icon-check"></span>&nbsp;<%= t("welcome.welcome.user_permission_debates") %></li>
+    <li><span class="icon-check"></span>&nbsp;<%= t("welcome.welcome.user_permission_proposal") %></li>
+    <li><span class="icon-x"></span>&nbsp;<%= t("welcome.welcome.user_permission_support_proposal") %></li>
+    <li><span class="icon-x"></span>&nbsp;<%= t("welcome.welcome.user_permission_votes") %></li>
   </ul>
 
   <p>