diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 7677ad1..1963e99 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -85,4 +85,48 @@ class SettingsController extends Controller
 
         return redirect()->route('settings.index')->with('status', 'Uprawnienia ról zostały zaktualizowane.');
     }
+
+    public function storeRole(Request $request)
+    {
+        $validated = $request->validate([
+            'name' => ['required', 'string', 'max:255', 'unique:roles,name,NULL,id,guard_name,web'],
+        ], [
+            'name.required' => 'Nazwa roli jest wymagana.',
+            'name.unique' => 'Taka rola już istnieje.',
+        ]);
+
+        Role::create([
+            'name' => trim($validated['name']),
+            'guard_name' => 'web',
+        ]);
+
+        return redirect()->route('settings.index')->with('status', 'Nowa rola została dodana.');
+    }
+
+    public function updateRole(Request $request, Role $role)
+    {
+        $validated = $request->validate([
+            'name' => ['required', 'string', 'max:255', 'unique:roles,name,' . $role->id . ',id,guard_name,' . $role->guard_name],
+        ], [
+            'name.required' => 'Nazwa roli jest wymagana.',
+            'name.unique' => 'Taka rola już istnieje.',
+        ]);
+
+        $role->update([
+            'name' => trim($validated['name']),
+        ]);
+
+        return redirect()->route('settings.index')->with('status', 'Rola została zaktualizowana.');
+    }
+
+    public function destroyRole(Role $role)
+    {
+        if ($role->users()->exists()) {
+            return redirect()->route('settings.index')->with('error', 'Nie można usunąć roli przypisanej do użytkowników.');
+        }
+
+        $role->delete();
+
+        return redirect()->route('settings.index')->with('status', 'Rola została usunięta.');
+    }
 }
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 85d9a5f..10f49f3 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -20,6 +20,87 @@
             @endif
 
             <div class="space-y-4">
+                <div class="bg-white dark:bg-gray-800 shadow-sm rounded-lg border border-gray-200 dark:border-gray-700/50 overflow-hidden">
+                    <button type="button" class="w-full flex items-center justify-between px-5 py-4 text-left font-semibold text-gray-900 dark:text-white bg-gray-50 dark:bg-gray-800/80 hover:bg-gray-100 dark:hover:bg-gray-700/80 transition" onclick="const panel=this.nextElementSibling; panel.classList.toggle('hidden'); this.querySelector('svg').classList.toggle('rotate-180');">
+                        <span>Zarządzanie rolami</span>
+                        <svg class="w-5 h-5 transition-transform duration-200" viewBox="0 0 20 20" fill="currentColor">
+                            <path fill-rule="evenodd" d="M5.23 7.21a.75.75 0 011.06.02L10 11.17l3.71-3.94a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z" clip-rule="evenodd" />
+                        </svg>
+                    </button>
+
+                    <div class="hidden p-5">
+                        <form method="POST" action="{{ route('settings.roles.store') }}" class="mb-8">
+                            @csrf
+                            <div class="flex flex-col sm:flex-row gap-3">
+                                <div class="flex-1">
+                                    <label for="role-name" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Nazwa nowej roli</label>
+                                    <input id="role-name" name="name" type="text" value="{{ old('name') }}" placeholder="np. magazynier" class="w-full rounded-md border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white shadow-sm focus:border-indigo-500 focus:ring-indigo-500">
+                                    @error('name')
+                                        <p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>
+                                    @enderror
+                                </div>
+
+                                <div class="flex items-end">
+                                    <button type="submit" class="inline-flex items-center justify-center px-4 py-2 bg-indigo-600 hover:bg-indigo-500 text-white text-sm font-medium rounded-md shadow-sm transition">
+                                        Dodaj rolę
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+
+                        <div class="overflow-x-auto">
+                            <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
+                                <thead>
+                                    <tr class="text-left text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400">
+                                        <th class="py-3 px-4">Nazwa</th>
+                                        <th class="py-3 px-4">Użytkownicy</th>
+                                        <th class="py-3 px-4 text-right">Akcje</th>
+                                    </tr>
+                                </thead>
+                                <tbody class="divide-y divide-gray-200 dark:divide-gray-700/60">
+                                    @forelse($roles as $role)
+                                        <tr>
+                                            <td class="py-3 px-4 text-gray-900 dark:text-white">{{ $role->name }}</td>
+                                            <td class="py-3 px-4 text-sm text-gray-500 dark:text-gray-400">{{ $role->users()->count() }}</td>
+                                            <td class="py-3 px-4">
+                                                <div class="flex items-center justify-end gap-2">
+                                                    <button type="button" onclick="document.getElementById('edit-role-{{ $role->id }}').classList.toggle('hidden')" class="inline-flex items-center px-3 py-1.5 text-sm font-medium rounded-md bg-amber-100 text-amber-800 hover:bg-amber-200 dark:bg-amber-900/40 dark:text-amber-200 dark:hover:bg-amber-900/60">
+                                                        Edytuj
+                                                    </button>
+                                                    <form method="POST" action="{{ route('settings.roles.destroy', $role) }}" onsubmit="return confirm('Czy na pewno chcesz usunąć tę rolę?');">
+                                                        @csrf
+                                                        @method('DELETE')
+                                                        <button type="submit" class="inline-flex items-center px-3 py-1.5 text-sm font-medium rounded-md bg-red-100 text-red-700 hover:bg-red-200 dark:bg-red-900/40 dark:text-red-200 dark:hover:bg-red-900/60">
+                                                            Usuń
+                                                        </button>
+                                                    </form>
+                                                </div>
+
+                                                <div id="edit-role-{{ $role->id }}" class="hidden mt-3 rounded-md border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900/40 p-3">
+                                                    <form method="POST" action="{{ route('settings.roles.update', $role) }}">
+                                                        @csrf
+                                                        @method('PUT')
+                                                        <div class="flex flex-col sm:flex-row gap-2">
+                                                            <input type="text" name="name" value="{{ old('name', $role->name) }}" class="flex-1 rounded-md border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white shadow-sm focus:border-indigo-500 focus:ring-indigo-500">
+                                                            <button type="submit" class="inline-flex items-center justify-center px-3 py-2 bg-indigo-600 hover:bg-indigo-500 text-white text-sm rounded-md shadow-sm">
+                                                                Zapisz
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    @empty
+                                        <tr>
+                                            <td colspan="3" class="py-6 px-4 text-center text-sm text-gray-500 dark:text-gray-400">Brak zdefiniowanych ról.</td>
+                                        </tr>
+                                    @endforelse
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="bg-white dark:bg-gray-800 shadow-sm rounded-lg border border-gray-200 dark:border-gray-700/50 overflow-hidden">
                     <button type="button" class="w-full flex items-center justify-between px-5 py-4 text-left font-semibold text-gray-900 dark:text-white bg-gray-50 dark:bg-gray-800/80 hover:bg-gray-100 dark:hover:bg-gray-700/80 transition" onclick="const panel=this.nextElementSibling; panel.classList.toggle('hidden'); this.querySelector('svg').classList.toggle('rotate-180');">
                         <span>Rodzaje zaliczek</span>
diff --git a/routes/web.php b/routes/web.php
index 458260b..c5f4277 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -41,6 +41,9 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::post('/settings/advance-types', [SettingsController::class, 'storeAdvanceType'])->name('settings.advance-types.store');
         Route::put('/settings/advance-types/{advanceType}', [SettingsController::class, 'updateAdvanceType'])->name('settings.advance-types.update');
         Route::delete('/settings/advance-types/{advanceType}', [SettingsController::class, 'destroyAdvanceType'])->name('settings.advance-types.destroy');
+        Route::post('/settings/roles', [SettingsController::class, 'storeRole'])->name('settings.roles.store');
+        Route::put('/settings/roles/{role}', [SettingsController::class, 'updateRole'])->name('settings.roles.update');
+        Route::delete('/settings/roles/{role}', [SettingsController::class, 'destroyRole'])->name('settings.roles.destroy');
         Route::post('/settings/role-permissions', [SettingsController::class, 'storeRolePermissions'])->name('settings.role-permissions.store');
     });