diff --git a/templates/organizations/index.html.twig b/templates/organizations/index.html.twig
index 37ff60de..21af00bf 100644
--- a/templates/organizations/index.html.twig
+++ b/templates/organizations/index.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'organizations.index.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'organizations' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'organizations' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/organizations/new.html.twig b/templates/organizations/new.html.twig
index 65e72c75..dad16f42 100644
--- a/templates/organizations/new.html.twig
+++ b/templates/organizations/new.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'organizations.new.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'organizations' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'organizations' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/roles/edit.html.twig b/templates/roles/edit.html.twig
index 108cc058..db4a6162 100644
--- a/templates/roles/edit.html.twig
+++ b/templates/roles/edit.html.twig
@@ -17,7 +17,7 @@
 {% block title %}{{ pageTitle }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'roles' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'roles' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/roles/index.html.twig b/templates/roles/index.html.twig
index 121aeb0b..83ff2b5a 100644
--- a/templates/roles/index.html.twig
+++ b/templates/roles/index.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'roles.index.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'roles' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'roles' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/roles/new.html.twig b/templates/roles/new.html.twig
index f73b41cc..65242c8d 100644
--- a/templates/roles/new.html.twig
+++ b/templates/roles/new.html.twig
@@ -17,7 +17,7 @@
 {% block title %}{{ pageTitle }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'roles' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'roles' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/_sidebar_settings.html.twig b/templates/settings/_sidebar.html.twig
similarity index 100%
rename from templates/_sidebar_settings.html.twig
rename to templates/settings/_sidebar.html.twig
diff --git a/templates/users/authorizations/index.html.twig b/templates/users/authorizations/index.html.twig
index 792534cd..3239a907 100644
--- a/templates/users/authorizations/index.html.twig
+++ b/templates/users/authorizations/index.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'users.authorizations.index.title' | trans({ name: user.displayName }) }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'users' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'users' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/users/authorizations/new.html.twig b/templates/users/authorizations/new.html.twig
index 5852c4bc..2bad8c71 100644
--- a/templates/users/authorizations/new.html.twig
+++ b/templates/users/authorizations/new.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'users.authorizations.new.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'users' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'users' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/users/index.html.twig b/templates/users/index.html.twig
index a3b5e90f..e7a64790 100644
--- a/templates/users/index.html.twig
+++ b/templates/users/index.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'users.index.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'users' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'users' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}
diff --git a/templates/users/new.html.twig b/templates/users/new.html.twig
index 4ff6abae..c595187d 100644
--- a/templates/users/new.html.twig
+++ b/templates/users/new.html.twig
@@ -11,7 +11,7 @@
 {% block title %}{{ 'users.new.title' | trans }}{% endblock %}
 
 {% block sidebar %}
-    {{ include('_sidebar_settings.html.twig', { current: 'users' }, with_context = false) }}
+    {{ include('settings/_sidebar.html.twig', { current: 'users' }, with_context = false) }}
 {% endblock %}
 
 {% block body %}