diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php
index 063b20dc65..9259e1219e 100644
--- a/src/Controller/UserPanel.php
+++ b/src/Controller/UserPanel.php
@@ -82,8 +82,8 @@ class UserPanel extends Controller
 
         return [
             '_template'           => 'settings/base.html.twig',
-            'prof'                => $personal_form->createView(),
-            'acc'                 => $account_form->createView(),
+            'profile'             => $personal_form->createView(),
+            'account'             => $account_form->createView(),
             'tabbed_forms_notify' => $notifications_form_array,
             'open_details_query'  => $this->string('open'),
         ];
diff --git a/templates/settings/account.html.twig b/templates/settings/account.html.twig
deleted file mode 100644
index 255af77a60..0000000000
--- a/templates/settings/account.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% block form_account %}
-    <div class='form'>
-        {{ form(acc) }}
-    </div>
-{% endblock %}
diff --git a/templates/settings/base.html.twig b/templates/settings/base.html.twig
index d24ae25bc4..53b1bec5ce 100644
--- a/templates/settings/base.html.twig
+++ b/templates/settings/base.html.twig
@@ -1,6 +1,6 @@
 {% extends '/stdgrid.html.twig' %}
 
-{% block title %}{% endblock %}
+{% block title %}{{ 'Settings' | trans }}{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
@@ -8,90 +8,108 @@
     <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/settings.css') }}">
 {% endblock stylesheets %}
 
-{% block body %}
-    <nav class='section-settings'>
-        <h2>Settings</h2>
-        <ul>
+{% macro settings_details_element(title, summary, form_name, context) %}
+    <details class="section-title-settings" {{ open_details(context.open_details_query, [ form_name ]) }} id={{ form_name ~ '-details' }}>
+        <summary>
+            <h3>
+                {{ title | trans }}
+                {{ icon('arrow-down', 'icon icon-details-open') | raw }}
+            </h3>
+            <em>
+                {{ summary | trans }}
+            </em>
+        </summary>
+
+
+        {{ form(attribute(context, form_name) | default) }}
+    </details>
+{% endmacro settings_details_element %}
+
+{% macro settings_details_container(title, summary, tabs, context) %}
+    <details class="section-title-settings" {{ open_details(context.open_details_query, tabs) }} id={{ tabs[0] ~ '-details' }}>
+        <summary>
+            <h3>
+                {{ title | trans }}
+                {{ icon('arrow-down', 'icon icon-details-open') | raw }}
+            </h3>
+            <em>
+                {{ summary | trans }}
+            </em>
+        </summary>
+
+
+        {% if title == 'Profile' %}
             <li>
-                <details class="section-title-settings" {{ open_details(open_details_query, ['profile', 'personal_info']) }} id="profile-details">
-                <summary>
-                    <h3>Profile {{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
-                    <em>Personal Information, Avatar and Profile</em>
-                </summary>
+                <nav class='section-settings-nav'>
+                    <ul>
+                        <li>
+                            {{ _self.settings_details_element('Personal Info', 'Nickname, Homepage, Bio, Self Tags and more.', 'profile', context) }}
+                        </li>
 
-                <section>
-                    <nav class='section-settings-nav'>
-                        <ul>
+                        <hr>
+
+                        {% for tab in context.profile_tabs %}
                             <li>
-                            <details class="section-title-settings" {{ open_details(open_details_query, ['personal_info']) }} id="perosnal-info-details">
-                                <summary>
-                                    <h3>Personal Info{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
-                                    <em>Nickname, Homepage, Bio, Self Tags and more.</em>
-                                </summary>
-
-                                {% block form_profile %}{% include '/settings/profile.html.twig' %}{% endblock %}
-                            </details>
-                            </li>
-
-                            <hr>
-
-                        {% set profile_tabs = handle_event('PopulateProfileSettingsTabs', app.request) %}
-                        {% for tab in profile_tabs %}
-                            <li>
-                                <details class="section-title-settings"> {# TODO add ID and open_details and to parent #}
+                                <details class="section-title-settings">  {# TODO: add ID and open_details and to parent #}
                                 <summary>
                                     <h3>{{ tab['title'] }}{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
                                     <em>{{ tab['desc'] }}</em>
                                 </summary>
 
                                 {% include tab['controller']['_template'] with tab['controller'] only %}
-
-                                {# <a href="{{ path(tab['route']) }}"
-                                class='hover-effect {{ active(tab['route']) }}'>{{ tab['title'] }}</a> #}
-
                                 </details>
                             </li>
 
                             <hr>
                         {% endfor %}
-                        </ul>
-                    </nav>
-                </section>
-                </details>
+                    </ul>
+                </nav>
             </li>
-
-            <hr>
-
+        {% elseif title == 'Account' %}
             <li>
-                <details class="section-title-settings" {{ open_details(open_details_query, ['account']) }} id="account-details">
-                    <summary>
-                        <h3>Account{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
-                        <em>Email, Password and Language</em>
-                    </summary>
-
-                    <section>
-                        {% block form_account %}
-                            {% include '/settings/account.html.twig' %}
-                        {% endblock %}
-                    </section>
-                </details>
+                {{ form(context.account) }}
             </li>
-
-            <hr>
-
+        {% elseif title == 'Notifications' %}
             <li>
-                <details class="section-title-settings" {{ open_details(open_details_query, ['notifications']) }} id="notifications-details">
-                    <summary>
-                        <h3>Notifications{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
-                        <em>Enable/disable notifications (Email, XMPP, Replies...)</em>
-                    </summary>
+                <nav class='section-settings-nav'>
+                    <ul>
+                        {% for transport, form_transport in context.tabbed_forms_notify %}
+                            <li>
+                                <details class="section-title-settings">
+                                    <summary>
+                                        <h3>{{ transport }}{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
+                                        <em>{{ transport }}'s notification options.</em>
+                                    </summary>
 
-                    <section>
-                        {% block form_notify %}
-                            {% include '/settings/notifications.html.twig' %}
-                        {% endblock %}
-                    </section>
-                </details>
+                                    <div id="form_{{ transport }}" class='form'>
+                                        {{ form(form_transport) }}
+                                    </div>
+                                </details>
+                            </li>
+                            <hr>
+                        {% endfor %}
+                    </ul>
+                </nav>
+            </li>
+        {% endif %}
+    </details>
+{% endmacro settings_details_container %}
+
+{% block body %}
+    <nav class='section-settings'>
+        <h2>Settings</h2>
+        <ul>
+            <li>
+                {% set profile_tabs = handle_event('PopulateProfileSettingsTabs', app.request) %}
+                {{ _self.settings_details_container('Profile', 'Personal Information, Avatar and Profile', ['profile', 'personal-info'], _context) }}
+            </li>
+            <hr>
+            <li>
+                {{ _self.settings_details_container('Account', 'Email, Password and Language', ['account'], _context) }}
+            </li>
+            <hr>
+            <li>
+                {{ _self.settings_details_container('Notifications', 'Enable/disable notifications (Email, XMPP, Replies...)', ['notifications'], _context) }}
             </li>
         </ul>
     </nav>
diff --git a/templates/settings/notifications.html.twig b/templates/settings/notifications.html.twig
deleted file mode 100644
index 70f14f787b..0000000000
--- a/templates/settings/notifications.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{% block form_notify %}
-    <section>
-
-        <nav class='set-nav'>
-            <ul>
-                {% for transport, form_transport in tabbed_forms_notify %}
-                    <li>
-                        <details class="section-title-settings">
-                            <summary>
-                                <h3>{{ transport }}{{ icon('arrow-down', 'icon icon-details-open') | raw }}</h3>
-                                <em>{{ transport }}'s notification options.</em>
-                            </summary>
-
-                            <div id="form_{{ transport }}" class='form'>
-                                {{ form(form_transport) }}
-                            </div>
-                        </details>
-                    </li>
-                    <hr>
-                {% endfor %}
-            </ul>
-        </nav>
-
-    </section>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/settings/profile.html.twig b/templates/settings/profile.html.twig
deleted file mode 100644
index 1f48e88d2f..0000000000
--- a/templates/settings/profile.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% block form_profile %}
-    <div class='form'>
-        {{ form(prof) }}
-    </div>
-{% endblock %}
\ No newline at end of file