diff --git a/app/views/pages/conditions.html.erb b/app/views/pages/conditions.html.erb
index fbe53c1ca..7a1e5ac54 100644
--- a/app/views/pages/conditions.html.erb
+++ b/app/views/pages/conditions.html.erb
@@ -1,4 +1,7 @@
<% provide :title do %><%= t('pages.titles.conditions') %><% end %>
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: page_url("conditions") %>
+<% end %>
diff --git a/app/views/pages/general_terms.html.erb b/app/views/pages/general_terms.html.erb
index 72e6f4046..9404e6718 100644
--- a/app/views/pages/general_terms.html.erb
+++ b/app/views/pages/general_terms.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: page_url("general_terms") %>
+<% end %>
+
diff --git a/app/views/pages/more_info/faq/index.html b/app/views/pages/more_info/faq/index.html.erb
similarity index 89%
rename from app/views/pages/more_info/faq/index.html
rename to app/views/pages/more_info/faq/index.html.erb
index f48864a91..e6deee33e 100644
--- a/app/views/pages/more_info/faq/index.html
+++ b/app/views/pages/more_info/faq/index.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: faq_url %>
+<% end %>
+
<%= render "shared/back_link" %>
diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/more_info/how_to_use/index.html.erb
index 9c6ccfb00..515631352 100644
--- a/app/views/pages/more_info/how_to_use/index.html.erb
+++ b/app/views/pages/more_info/how_to_use/index.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: how_to_use_url %>
+<% end %>
+
<%= render "shared/back_link" %>
diff --git a/app/views/pages/more_info/participation/facts.html.erb b/app/views/pages/more_info/participation/facts.html.erb
index 9a52f6a6c..14d23f0ef 100644
--- a/app/views/pages/more_info/participation/facts.html.erb
+++ b/app/views/pages/more_info/participation/facts.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: participation_facts_url %>
+<% end %>
+
<%= render "shared/back_link" %>
diff --git a/app/views/pages/more_info/participation/world.html.erb b/app/views/pages/more_info/participation/world.html.erb
index 38ab0275d..e0deac9f9 100644
--- a/app/views/pages/more_info/participation/world.html.erb
+++ b/app/views/pages/more_info/participation/world.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: participation_world_url %>
+<% end %>
+
<%= render "shared/back_link" %>
diff --git a/app/views/pages/privacy.html.erb b/app/views/pages/privacy.html.erb
index 3ecbc0a4b..c7824b96c 100644
--- a/app/views/pages/privacy.html.erb
+++ b/app/views/pages/privacy.html.erb
@@ -1,4 +1,7 @@
<% provide :title do %><%= t('pages.titles.privacy') %><% end %>
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: page_url("privacy") %>
+<% end %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index ca187d717..93a3e2f73 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -5,6 +5,10 @@
social_title: @proposal.title,
social_description: @proposal.summary %>
<% end %>
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: proposal_url(@proposal) %>
+<% end %>
+
<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 1eb6cf38c..dc5686997 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,3 +1,7 @@
+<% content_for :canonical do %>
+ <%= render "shared/canonical", href: root_url %>
+<% end %>
+
diff --git a/public/robots.txt b/public/robots.txt
index 57ffebd13..c4f9f1a99 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -10,3 +10,5 @@ Disallow: /comments/
Disallow: /*?*locale
Disallow: /*?*order
Disallow: /*?*search
+Disallow: /*?*locale-switcher
+Disallow: user_id