diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index c005093ca..34fa22704 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -13,6 +13,7 @@ class Admin::SettingsController < Admin::BaseController
     @feature_settings = all_settings["feature"]
     @participation_processes_settings = all_settings["process"]
     @map_configuration_settings = all_settings["map"]
+    @proposals_settings = all_settings["proposals"]
   end
 
   def update
diff --git a/app/views/admin/settings/_proposals_dashboard.html.erb b/app/views/admin/settings/_proposals_dashboard.html.erb
index 389810b54..da76e218e 100644
--- a/app/views/admin/settings/_proposals_dashboard.html.erb
+++ b/app/views/admin/settings/_proposals_dashboard.html.erb
@@ -1,42 +1,3 @@
 <h2><%= t("admin.settings.index.dashboard.title") %></h2>
 
-<table>
-  <tbody>
-    <tr>
-      <td class="small-12 medium-4">
-        <strong><%= t("settings.#{successful_proposal_setting.key}") %></strong>
-        <br>
-        <span class="small">
-          <%= t("settings.#{successful_proposal_setting.key}_description") %>
-        </span>
-      </td>
-      <td class="small-12 medium-8">
-        <%= form_for(successful_proposal_setting,
-                     url: admin_setting_path(successful_proposal_setting),
-                     html: { id: "edit_#{dom_id(successful_proposal_setting)}"}) do |f| %>
-
-          <div class="small-12 medium-6 large-9 column">
-            <%= f.select :value, successful_proposals.collect { |p| [p.title, p.id] },
-                                 { include_blank: true, label: false },
-                                 label: false, id: dom_id(successful_proposal_setting) %>
-          </div>
-
-          <div class="small-12 medium-6 large-3 column">
-            <%= f.submit(t("admin.settings.index.update_setting"),
-                         class: "button hollow expanded") %>
-          </div>
-        <% end %>
-      </td>
-    </tr>
-
-    <%= render 'setting_text_field',     setting: poll_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: poll_feature_description_setting %>
-    <%= render 'setting_text_field',     setting: poll_feature_link_setting %>
-
-    <%= render 'setting_text_field',     setting: email_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: email_feature_description_setting %>
-
-    <%= render 'setting_text_field',     setting: poster_feature_short_title_setting %>
-    <%= render 'setting_textarea_field', setting: poster_feature_description_setting %>
-  </tbody>
-</table>
+<%= render "settings_table", settings: @proposals_settings %>
diff --git a/app/views/admin/settings/_setting_text_field.html.erb b/app/views/admin/settings/_setting_text_field.html.erb
deleted file mode 100644
index 3f2529a2c..000000000
--- a/app/views/admin/settings/_setting_text_field.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<tr>
-  <td class="small-12 medium-4 align-top">
-    <strong><%= t("settings.#{setting.key}") %></strong>
-    <br>
-    <span class="small">
-      <%= t("settings.#{setting.key}_description") %>
-    </span>
-  </td>
-  <td class="small-12 medium-8">
-    <%= form_for setting,
-                 url: admin_setting_path(setting),
-                 html: { id: "edit_#{dom_id(setting)}"} do |f| %>
-      <div class="small-12 medium-6 large-9 column">
-        <%= f.text_field :value, label: false, id: dom_id(setting) %>
-      </div>
-      <div class="small-12 medium-6 large-3 column">
-        <%= f.submit(t("admin.settings.index.update_setting"), class: "button hollow expanded") %>
-      </div>
-    <% end %>
-  </td>
-</tr>
diff --git a/app/views/admin/settings/_setting_textarea_field.html.erb b/app/views/admin/settings/_setting_textarea_field.html.erb
deleted file mode 100644
index cb3d57d0a..000000000
--- a/app/views/admin/settings/_setting_textarea_field.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<tr>
-  <td class="small-12 medium-4 align-top">
-    <strong><%= t("settings.#{setting.key}") %></strong>
-    <br>
-    <span class="small">
-      <%= t("settings.#{setting.key}_description") %>
-    </span>
-  </td>
-  <td class="small-12 medium-8">
-    <%= form_for setting,
-                 url: admin_setting_path(setting),
-                 html: { id: "edit_#{dom_id(setting)}"} do |f| %>
-      <div class="small-12 medium-6 large-9 column">
-        <%= f.cktext_area :value, label: false, id: dom_id(setting) %>
-      </div>
-      <div class="small-12 medium-6 large-3 column">
-        <%= f.submit(t("admin.settings.index.update_setting"), class: "button hollow expanded") %>
-      </div>
-    <% end %>
-  </td>
-</tr>