diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index 4149020fa..3821f22c7 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -57,15 +57,15 @@ $brand:             #004A83;
 $dark:              darken($brand, 10%);
 
 $text:              #222222;
-$text-medium:       #999999;
-$text-light:        #CCCCCC;
+$text-medium:       #515151;
+$text-light:        #BFBFBF;
 
 $border:            #DEE0E3;
 
-$link:              #2895F1;
+$link:              $brand;
 $link-hover:        darken($link, 20%);
 
-$debates:           #008CCF;
+$debates:           $brand;
 
 $like:              #7BD2A8;
 $unlike:            #EF8585;
@@ -74,6 +74,7 @@ $delete:            #F04124;
 $check:             #46DB91;
 
 $proposals:         #FFA42D;
+$proposals-dark:    #794500;
 
 $budget:            #454372;
 $budget-hover:      #7571BF;
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 4c447479f..8c4549ffd 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -56,6 +56,7 @@ a {
   }
 
   &:focus {
+    color: $link-hover;
     outline: 3px solid #ffbf47;
   }
 }
@@ -258,6 +259,10 @@ a {
   margin: 0 $line-height/2;
 }
 
+.pagination .current {
+  background: $brand;
+}
+
 // 02. Header
 // ----------
 
@@ -1160,7 +1165,7 @@ table {
     top: 0;
   }
 
-  &:hover {
+  &:hover, &:focus {
     background: white;
     color: #40A2D1;
   }
@@ -1200,7 +1205,7 @@ table {
     top: 0;
   }
 
-  &:hover {
+  &:hover, &:focus {
     background: white;
     color: #354F88;
   }
@@ -1240,7 +1245,7 @@ table {
     top: 0;
   }
 
-  &:hover {
+  &:hover, &:focus {
     background: white;
     color: #CE3E26;
   }
@@ -1284,7 +1289,8 @@ table {
       top: 0;
     }
 
-    &:hover {
+    &:hover, &:focus {
+      background: white;
       color: #40A2D1;
     }
   }
@@ -1307,7 +1313,8 @@ table {
       top: 0;
     }
 
-    &:hover {
+    &:hover, &:focus {
+      background: white;
       color: #354F88;
     }
   }
@@ -1330,7 +1337,8 @@ table {
       top: 0;
     }
 
-    &:hover {
+    &:hover, &:focus {
+      background: white;
       color: #CE3E26;
     }
   }
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index c299d59cb..a5e1d7df2 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -528,7 +528,7 @@
     }
 
     .label-proposal {
-      color: $proposals;
+      color: $proposals-dark;
     }
 
     .label-investment-project {
@@ -566,7 +566,7 @@
     }
 
     .icon-proposals {
-      color: $proposals;
+      color: $proposals-dark;
     }
 
     .icon-budget {
diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
index fdb975c79..d084a0241 100644
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -41,7 +41,7 @@
 
             </p>
             <div class="debate-description">
-              <%= link_to debate.description, debate %>
+              <%= debate.description %>
               <div class="truncate"></div>
             </div>
             <%= render "shared/tags", taggable: debate, limit: 5 %>
diff --git a/app/views/debates/_votes.html.erb b/app/views/debates/_votes.html.erb
index cc59a3f3a..9bc3ca555 100644
--- a/app/views/debates/_votes.html.erb
+++ b/app/views/debates/_votes.html.erb
@@ -1,23 +1,41 @@
 <% voted_classes = css_classes_for_vote(@debate_votes, debate) %>
 <div class="votes">
   <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 %>
-      <span class="icon-like">
-        <span class="sr-only"><%= t('votes.agree') %></span>
-      </span>
-      <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+    <% if user_signed_in? %>
+      <%= link_to vote_debate_path(debate, value: 'yes'),
+          class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %>
+        <span class="icon-like">
+          <span class="sr-only"><%= t('votes.agree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+      <% end %>
+    <% else %>
+      <div class="like">
+        <span class="icon-like">
+          <span class="sr-only"><%= t('votes.agree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+      </div>
     <% end %>
   </div>
 
   <span class="divider"></span>
 
   <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 %>
-      <span class="icon-unlike">
-        <span class="sr-only"><%= t('votes.disagree') %></span>
-      </span>
-      <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+    <% if user_signed_in? %>
+      <%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %>
+        <span class="icon-unlike">
+          <span class="sr-only"><%= t('votes.disagree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+      <% end %>
+    <% else %>
+      <div class="unlike">
+        <span class="icon-unlike">
+          <span class="sr-only"><%= t('votes.disagree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+      </div>
     <% end %>
   </div>
 
@@ -39,10 +57,12 @@
       </p>
     </div>
   <% elsif !user_signed_in? %>
-    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
-      <%= t("votes.unauthenticated",
-        signin: link_to(t("votes.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+    <div tabindex="0">
+      <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+        <%= t("votes.unauthenticated",
+          signin: link_to(t("votes.signin"), new_user_session_path),
+          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+      </div>
     </div>
   <% end %>
 </div>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index ee5371ce5..de9e89c93 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -1,22 +1,19 @@
 <%= paginator.render do -%>
   <div class="pagination-centered">
-    <nav>
-      <h2 class="sr-only"><%= t("shared.outline.pagination") %></h2>
-      <ul class="pagination text-center margin-top" aria-label="Pagination">
-        <%= first_page_tag unless current_page.first? %>
-        <%= prev_page_tag unless current_page.first? %>
+    <ul class="pagination text-center margin-top" aria-label="Pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
 
-        <% each_page do |page| -%>
-          <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-            <%= page_tag page %>
-          <% elsif !page.was_truncated? -%>
-            <%= gap_tag %>
-          <% end -%>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
         <% end -%>
+      <% end -%>
 
-        <%= next_page_tag unless current_page.last? %>
-        <%= last_page_tag unless current_page.last? %>
-      </ul>
-    </nav>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
   </div>
 <% end -%>
diff --git a/app/views/pages/accessibility.html.erb b/app/views/pages/accessibility.html.erb
index 8d8d6a34d..a2c2eff30 100644
--- a/app/views/pages/accessibility.html.erb
+++ b/app/views/pages/accessibility.html.erb
@@ -40,7 +40,7 @@
         </tr>
         <tr>
           <td class="text-center">S</td>
-          <td>Presupuestos ciudadanos</td>
+          <td>Presupuestos participativos</td>
         </tr>
         <tr>
           <td class="text-center">I</td>
diff --git a/app/views/pages/spending_proposals_info.html.erb b/app/views/pages/spending_proposals_info.html.erb
index 60e947343..41332bb96 100644
--- a/app/views/pages/spending_proposals_info.html.erb
+++ b/app/views/pages/spending_proposals_info.html.erb
@@ -8,8 +8,8 @@
   </div>
 
   <div class="small-12 medium-9 column">
-    <h1>¿Cómo funcionan los presupuestos ciudadanos?</h1>
+    <h1>¿Cómo funcionan los Presupuestos participativos?</h1>
     <h2 id="i">Explicación detallada del proceso</h2>
-    <p>Próximamente se podrá encontrar aquí una descripción del proceso de participación ciudadana en los presupuestos.</p>
+    <p>Descripción del proceso de participación ciudadana en los presupuestos.</p>
   </div>
 </div>
diff --git a/app/views/proposal_ballots/index.html.erb b/app/views/proposal_ballots/index.html.erb
index e05f8514a..fe5bdef70 100644
--- a/app/views/proposal_ballots/index.html.erb
+++ b/app/views/proposal_ballots/index.html.erb
@@ -1,3 +1,4 @@
+<% provide :title do %><%= t("proposal_ballots.title") %><% end %>
 <div class="expanded no-margin-top margin-bottom dark-heading">
   <div class="row" data-equalizer>
     <div class="small-12 medium-6 column padding" data-equalizer-watch>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
index dc37934d5..69bf8d164 100644
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -44,7 +44,7 @@
               <% end %>
             </p>
             <div class="proposal-description">
-              <p><%= link_to proposal.summary, namespaced_proposal_path(proposal) %></p>
+              <p><%= proposal.summary %></p>
               <div class="truncate"></div>
             </div>
           <% end %>
@@ -53,20 +53,22 @@
       </div>
 
       <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column supports-container">
-        <div class="supports text-center">
-          <% if proposal.successfull? %>
+        <% if proposal.successfull? %>
+          <div class="padding text-center">
             <p>
               <%= t("proposal_ballots.successfull",
                   voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
             </p>
-          <% elsif proposal.archived? %>
+          </div>
+        <% elsif proposal.archived? %>
+          <div class="padding text-center">
             <strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
             <p><%= t("proposals.proposal.archived") %></p>
-          <% else %>
-            <%= render 'votes',
-                      { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
-          <% end %>
-        </div>
+          </div>
+        <% else %>
+          <%= render 'votes',
+                    { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %>
+        <% end %>
       </div>
     </div>
   </div>
diff --git a/app/views/proposals/_votes.html.erb b/app/views/proposals/_votes.html.erb
index 4c2a348ca..fb41357af 100644
--- a/app/views/proposals/_votes.html.erb
+++ b/app/views/proposals/_votes.html.erb
@@ -1,56 +1,66 @@
-<div class="progress small-12 round">
-  <span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
-  <span class="percentage">
-    <%= supports_percentage(proposal) %>&nbsp;/&nbsp;<%= t("proposals.proposal.total_percent") %>
-  </span>
-</div>
+<div class="supports text-center">
+  <div class="progress small-12 round">
+    <span class="meter" style="width: <%= progress_bar_percentage(proposal) %>%;"></span>
+    <span class="percentage">
+      <%= supports_percentage(proposal) %>&nbsp;/&nbsp;<%= t("proposals.proposal.total_percent") %>
+    </span>
+  </div>
 
-<span class="total-supports">
-  <%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
-  <span>
-    <abbr title="<%= t("proposals.proposal.reason_for_supports_necessary") %>">
-      <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
-    </abbr>
+  <span class="total-supports">
+    <%= t("proposals.proposal.supports", count: proposal.total_votes) %>&nbsp;
+    <span>
+      <abbr title="<%= t("proposals.proposal.reason_for_supports_necessary") %>">
+        <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %>
+      </abbr>
+    </span>
   </span>
-</span>
 
-<div class="in-favor">
-  <% if voted_for?(@proposal_votes, proposal) %>
-    <div class="supported callout success">
-      <%= t("proposals.proposal.already_supported") %>
-    </div>
-  <% else %>
-    <%= link_to vote_url,
-        class: "button button-support small expanded",
-        title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
-      <%= t("proposals.proposal.support") %>
+  <div class="in-favor">
+    <% if voted_for?(@proposal_votes, proposal) %>
+      <div class="supported callout success">
+        <%= t("proposals.proposal.already_supported") %>
+      </div>
+    <% elsif user_signed_in? && proposal.votable_by?(current_user) %>
+      <%= link_to vote_url,
+          class: "button button-support small expanded",
+          title: t('proposals.proposal.support_title'), method: "post", remote: true do %>
+        <%= t("proposals.proposal.support") %>
+      <% end %>
+    <% else %>
+      <div class="button button-support small expanded">
+        <%= t("proposals.proposal.support") %>
+      </div>
     <% end %>
+  </div>
+
+  <% if user_signed_in? && current_user.organization? %>
+    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+      <p>
+        <%= t("votes.organizations") %>
+      </p>
+    </div>
+  <% elsif user_signed_in? && !proposal.votable_by?(current_user) %>
+    <div tabindex="0">
+      <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+        <p>
+          <%= t("votes.verified_only",
+              verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
+        </p>
+      </div>
+    </div>
+  <% elsif !user_signed_in? %>
+    <div tabindex="0">
+      <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+        <%= t("votes.unauthenticated",
+          signin: link_to(t("votes.signin"), new_user_session_path),
+          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+      </div>
+    </div>
+  <% end %>
+
+  <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
+    <div class="share-supported">
+      <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %>
+    </div>
   <% end %>
 </div>
-
-<% if user_signed_in? && current_user.organization? %>
-  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
-    <p>
-      <%= t("votes.organizations") %>
-    </p>
-  </div>
-<% elsif user_signed_in? && !proposal.votable_by?(current_user)%>
-  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
-    <p>
-      <%= t("votes.verified_only",
-          verify_account: link_to(t("votes.verify_account"), verification_path )).html_safe %>
-    </p>
-  </div>
-<% elsif !user_signed_in? %>
-  <div class="participation-not-allowed" style='display:none' aria-hidden="false">
-    <%= t("votes.unauthenticated",
-      signin: link_to(t("votes.signin"), new_user_session_path),
-      signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-  </div>
-<% end %>
-
-<% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %>
-  <div class="share-supported">
-    <%= social_share_button_tag("#{proposal.title} #{setting['twitter_hashtag']}", url: proposal_url(proposal), via: setting['twitter_handle']) %>
-  </div>
-<% end %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 920565d11..ba6cb677f 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -102,17 +102,21 @@
       <aside class="small-12 medium-3 column">
         <div class="sidebar-divider"></div>
         <h2><%= t("votes.supports") %></h2>
-        <div id="<%= dom_id(@proposal) %>_votes" class="supports text-center">
+        <div id="<%= dom_id(@proposal) %>_votes">
           <% if @proposal.successfull? %>
-            <p>
-              <%= t("proposal_ballots.successfull",
-                  voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
-            </p>
+            <div class="padding text-center">
+              <p>
+                <%= t("proposal_ballots.successfull",
+                    voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+              </p>
+            </div>
           <% elsif @proposal.archived? %>
-            <p>
-              <strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
-            </p>
-            <p><%= t("proposals.proposal.archived") %></p>
+            <div class="padding text-center">
+              <p>
+                <strong><%= t("proposals.proposal.supports", count: @proposal.total_votes) %></strong>
+              </p>
+              <p><%= t("proposals.proposal.archived") %></p>
+            </div>
           <% else %>
             <%= render 'votes',
                       { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>
diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb
index e8f06f7bc..00db85b9c 100644
--- a/app/views/shared/_advanced_search.html.erb
+++ b/app/views/shared/_advanced_search.html.erb
@@ -29,19 +29,21 @@
         </div>
 
         <div id='js-custom-date' class='small-12 large-8 column' style="display: none">
-          <div class='small-12 large-6 column'>
-            <label><%= t("shared.advanced_search.from") %></label>
-            <%= text_field_tag 'advanced_search[date_min]',
-                                params[:advanced_search].try(:[], :date_min),
-                                placeholder: t("shared.advanced_search.date_placeholder"),
-                                class: 'js-calendar' %>
-          </div>
-          <div class='small-12 large-6 column'>
-            <label><%= t("shared.advanced_search.to") %></label>
-            <%= text_field_tag 'advanced_search[date_max]',
-                                params[:advanced_search].try(:[], :date_max),
-                                placeholder: t("shared.advanced_search.date_placeholder"),
-                                class: 'js-calendar' %>
+          <div class="row">
+            <div class='small-12 large-6 column'>
+              <label><%= t("shared.advanced_search.from") %> (<%= t("shared.advanced_search.date_placeholder") %>)</label>
+              <%= text_field_tag 'advanced_search[date_min]',
+                                  params[:advanced_search].try(:[], :date_min),
+                                  placeholder: t("shared.advanced_search.date_placeholder"),
+                                  class: 'js-calendar' %>
+            </div>
+            <div class='small-12 large-6 column'>
+              <label><%= t("shared.advanced_search.to") %> (<%= t("shared.advanced_search.date_placeholder") %>)</label>
+              <%= text_field_tag 'advanced_search[date_max]',
+                                  params[:advanced_search].try(:[], :date_max),
+                                  placeholder: t("shared.advanced_search.date_placeholder"),
+                                  class: 'js-calendar' %>
+            </div>
           </div>
         </div>
       </div>
diff --git a/app/views/spending_proposals/_sidebar.html.erb b/app/views/spending_proposals/_sidebar.html.erb
index 57d115d8c..fc6878698 100644
--- a/app/views/spending_proposals/_sidebar.html.erb
+++ b/app/views/spending_proposals/_sidebar.html.erb
@@ -10,6 +10,6 @@
 </div>
 
 <div class="sidebar-divider"></div>
-<h3 class="sidebar-title"><%= t("spending_proposals.index.sidebar.feasibility") %></h3>
+<h2 class="sidebar-title"><%= t("spending_proposals.index.sidebar.feasibility") %></h2>
 <br>
 <%= link_to t('spending_proposals.index.sidebar.unfeasible'), spending_proposals_path(unfeasible: '1') %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40a371652..3ae90565f 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -455,7 +455,6 @@ en:
       debates: Debates
       proposals: Proposals
       budget: Participatory budget
-      pagination: Pagination
       searcher: Searcher
   social:
     blog: Blog
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 5312b445b..8d5dfb490 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -212,7 +212,7 @@ es:
       proposals: Propuestas
       proposal_ballot: Votaciones
       see_all: Ver propuestas
-      spending_proposals: Presupuestos ciudadanos
+      spending_proposals: Presupuestos participativos
   legislation:
     help:
       alt: Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz.
@@ -454,8 +454,7 @@ es:
     outline:
       debates: Debates
       proposals: Propuestas
-      budget: Presupuestos ciudadanos
-      pagination: Paginación
+      budget: Presupuestos participativos
       searcher: Buscador
   social:
     blog: Blog
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index b60d8aa59..1ded2e0ff 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -17,7 +17,8 @@ feature 'Debates' do
     debates.each do |debate|
       within('#debates') do
         expect(page).to have_content debate.title
-        expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.description)
+        expect(page).to have_content debate.description
+        expect(page).to have_css("a[href='#{debate_path(debate)}']", text: debate.title)
       end
     end
   end
diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb
index 744a8fe0b..baa5efcc6 100644
--- a/spec/features/management/proposals_spec.rb
+++ b/spec/features/management/proposals_spec.rb
@@ -100,9 +100,9 @@ feature 'Proposals' do
     within("#proposals") do
       expect(page).to have_css('.proposal', count: 1)
       expect(page).to have_content(proposal1.title)
+      expect(page).to have_content(proposal1.summary)
       expect(page).to_not have_content(proposal2.title)
       expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.title)
-      expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.summary)
     end
   end
 
@@ -127,9 +127,9 @@ feature 'Proposals' do
     within("#proposals") do
       expect(page).to have_css('.proposal', count: 2)
       expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.title)
-      expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.summary)
+      expect(page).to have_content(proposal1.summary)
       expect(page).to have_css("a[href='#{management_proposal_path(proposal2)}']", text: proposal2.title)
-      expect(page).to have_css("a[href='#{management_proposal_path(proposal2)}']", text: proposal2.summary)
+      expect(page).to have_content(proposal2.summary)
     end
   end
 
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index aaf7d9dd9..7a99b0050 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -22,8 +22,8 @@ feature 'Proposals' do
       proposals.each do |proposal|
         within('#proposals') do
           expect(page).to have_content proposal.title
+          expect(page).to have_content proposal.summary
           expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.title)
-          expect(page).to have_css("a[href='#{proposal_path(proposal)}']", text: proposal.summary)
         end
       end
     end
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 00f59fa75..30a0c9452 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -156,7 +156,7 @@ module CommonActions
 
   def expect_message_you_need_to_sign_in
     expect(page).to have_content 'You must Sign in or Sign up to continue'
-    expect(page).to have_selector('.in-favor a', visible: false)
+    expect(page).to have_selector('.in-favor', visible: false)
   end
 
   def expect_message_you_need_to_sign_in_to_vote_comments
@@ -172,7 +172,7 @@ module CommonActions
 
   def expect_message_only_verified_can_vote_proposals
     expect(page).to have_content 'Only verified users can vote on proposals'
-    expect(page).to have_selector('.in-favor a', visible: false)
+    expect(page).to have_selector('.in-favor', visible: false)
   end
 
   def expect_message_voting_not_allowed