diff --git a/assets/css/app.scss b/assets/css/app.scss
index 920fd89a9e..6339b20b26 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -698,6 +698,7 @@ form .field {
 .permissions-table {
   width: 100%;
   border-collapse: collapse;
+  table-layout: auto;
   th, td {
     border: 1px solid #ccc;
     padding: 8px;
@@ -713,8 +714,12 @@ form .field {
     background-color: #e9e9e9;
   }
   th, td {
-    border: 1px solid #ddd;
-    padding: 8px;
+    padding: 5px;
+    font-size: 0.9em;
+    white-space: normal;
+    word-wrap: break-word;
+    min-width: 100px;
+    vertical-align: top;
   }
   th {
     padding-top: 12px;
@@ -741,6 +746,10 @@ form .field {
   .save-button:hover {
     background-color: #45a049;
   }
+  input[type="checkbox"] {
+    transform: scale(1);
+    margin: 0 auto;
+  }
 }
 
 .files-info-page {
diff --git a/src/CoreBundle/DataFixtures/PermissionFixtures.php b/src/CoreBundle/DataFixtures/PermissionFixtures.php
index 87aa3c6684..68493f0578 100644
--- a/src/CoreBundle/DataFixtures/PermissionFixtures.php
+++ b/src/CoreBundle/DataFixtures/PermissionFixtures.php
@@ -146,6 +146,7 @@ class PermissionFixtures extends Fixture implements FixtureGroupInterface
             ['title' => 'Edit user', 'slug' => 'user:edit', 'description' => 'Edit users'],
             ['title' => 'Edit user Role', 'slug' => 'user:editrole', 'description' => 'Edit user roles'],
             ['title' => 'Login as user', 'slug' => 'user:loginas', 'description' => 'Login as another user'],
+            ['title' => 'Edit Course Settings', 'slug' => 'course:editsettings', 'description' => 'Edit settings of a course'],
         ];
     }
 
@@ -256,6 +257,7 @@ class PermissionFixtures extends Fixture implements FixtureGroupInterface
             'user:edit' => ['ADM', 'SUA', 'GLO'],
             'user:editrole' => ['ADM', 'SUA', 'GLO'],
             'user:loginas' => ['SUA', 'GLO'],
+            'course:editsettings' => ['TEA', 'ADM', 'SUA', 'GLO'],
         ];
     }
 }
diff --git a/src/CoreBundle/Resources/views/Permission/index.html.twig b/src/CoreBundle/Resources/views/Permission/index.html.twig
index 8f7aca0f09..009fd5fad5 100644
--- a/src/CoreBundle/Resources/views/Permission/index.html.twig
+++ b/src/CoreBundle/Resources/views/Permission/index.html.twig
@@ -4,32 +4,34 @@
     <h1>{{ 'Permissions Management'|trans }}</h1>
     <form method="post">
         <button type="submit" class="save-button btn btn--primary hover:bg-blue-700 text-white font-bold py-2 px-4 rounded cursor-pointer mt-4 mb-4">{{ 'Save permissions'|trans }}</button>
-        <table class="permissions-table">
-            <thead>
-            <tr>
-                <th>{{ 'Permission '|trans }} <br> ({{ 'slug'|trans }})</th>
-                {% for role in roles %}
-                    <th>
-                        {{ role|trans }}<br>
-                        <input type="checkbox" class="select-all" data-role="{{ role }}" style="margin-top: 5px;">
-                    </th>
-                {% endfor %}
-            </tr>
-            </thead>
-            <tbody>
-            {% for permission in permissions %}
+        <div style="overflow-x: auto;">
+            <table class="permissions-table">
+                <thead>
                 <tr>
-                    <td>{{ permission.title|trans }} <br> ({{ permission.slug }})</td>
+                    <th>{{ 'Permission '|trans }} <br> ({{ 'slug'|trans }})</th>
                     {% for role in roles %}
-                        <td>
-                            <input type="checkbox" name="permissions[{{ permission.slug }}][{{ role }}]"
-                                   {% if forms[permission.slug].vars.value[role] %}checked="checked"{% endif %}>
-                        </td>
+                        <th>
+                            {{ role|trans }}<br>
+                            <input type="checkbox" class="select-all" data-role="{{ role }}" style="margin-top: 5px;">
+                        </th>
                     {% endfor %}
                 </tr>
-            {% endfor %}
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                {% for permission in permissions %}
+                    <tr>
+                        <td>{{ permission.title|trans }} <br> ({{ permission.slug }})</td>
+                        {% for role in roles %}
+                            <td>
+                                <input type="checkbox" name="permissions[{{ permission.slug }}][{{ role }}]"
+                                       {% if forms[permission.slug].vars.value[role] %}checked="checked"{% endif %}>
+                            </td>
+                        {% endfor %}
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
         <button type="submit" class="save-button btn btn--primary hover:bg-blue-700 text-white font-bold py-2 px-4 rounded cursor-pointer mt-4">{{ 'Save permissions'|trans }}</button>
     </form>
     <script>