diff --git a/.env.example b/.env.example
index c1327796c..f197712e4 100644
--- a/.env.example
+++ b/.env.example
@@ -71,6 +71,7 @@ MIX_WELCOME_MESSAGE_LIMIT=500
 MIX_ROOM_NAME_LIMIT=50
 
 DEFAULT_LOGO=/images/logo.svg
+DEFAULT_FAVICON=/images/favicon.ico
 DEFAULT_ROOM_LIMIT=-1
 DEFAULT_PAGINATION_PAGE_SIZE=15
 OWN_ROOMS_PAGINATION_PAGE_SIZE=5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4fc42a74..9e396fb38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added setting menu for administrators ([#35], [#38])
 - Added a middleware to check whether the request is in sync with model of the database and not stale ([#40], [#41])
 - Added management of users and profile page ([#10], [#66])
+- Added management of application settings ([#55], [#60])
 
 [#1]: https://github.com/THM-Health/PILOS/issues/1
 [#3]: https://github.com/THM-Health/PILOS/pull/3
@@ -56,6 +57,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#49]: https://github.com/THM-Health/PILOS/pull/49
 [#50]: https://github.com/THM-Health/PILOS/issues/50
 [#54]: https://github.com/THM-Health/PILOS/pull/54
+[#55]: https://github.com/THM-Health/PILOS/issues/55
+[#60]: https://github.com/THM-Health/PILOS/pull/60
 [#66]: https://github.com/THM-Health/PILOS/pull/66
 
+
 [unreleased]: https://github.com/THM-Health/PILOS/compare/3c8359cdb0395546fe97aeabf1a40f93002b182c...HEAD
diff --git a/app/Http/Controllers/api/v1/ApplicationController.php b/app/Http/Controllers/api/v1/ApplicationController.php
index 8523635c9..b5e6424b6 100644
--- a/app/Http/Controllers/api/v1/ApplicationController.php
+++ b/app/Http/Controllers/api/v1/ApplicationController.php
@@ -3,29 +3,55 @@
 namespace App\Http\Controllers\api\v1;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UpdateSetting;
+use App\Http\Resources\ApplicationSettings;
 use App\Http\Resources\User as UserResource;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
 
 class ApplicationController extends Controller
 {
     /**
      * Load basic application data, like settings
-     * @return \Illuminate\Http\JsonResponse
+     * @return ApplicationSettings
      */
     public function settings()
     {
-        return response()->json(['data' => [
-              'logo'                 => setting('logo'),
-              'room_limit'           => setting('room_limit'),
-              'pagination_page_size' => setting('pagination_page_size'),
-              'bbb'                  => [
-                  'file_mimes'              => config('bigbluebutton.allowed_file_mimes'),
-                  'max_filesize'            => config('bigbluebutton.max_filesize'),
-                  'room_name_limit'         => config('bigbluebutton.room_name_limit'),
-                  'welcome_message_limit'   => config('bigbluebutton.welcome_message_limit')
-              ]
-          ]
-        ]);
+        return new ApplicationSettings();
+    }
+
+    /**
+     * Update application settings data
+     * @param  UpdateSetting       $request
+     * @return ApplicationSettings
+     */
+    public function updateSettings(UpdateSetting $request)
+    {
+        if ($request->has('logo_file')) {
+            $path = $request->file('logo_file')->store('images', 'public');
+            $url  = Storage::url($path);
+            $logo = $url;
+        } else {
+            $logo = $request->logo;
+        }
+
+        if ($request->has('favicon_file')) {
+            $path    = $request->file('favicon_file')->store('images', 'public');
+            $url     = Storage::url($path);
+            $favicon = $url;
+        } else {
+            $favicon = $request->favicon;
+        }
+
+        setting()->set('logo', $logo);
+        setting()->set('favicon', $favicon);
+        setting()->set('name', $request->name);
+        setting()->set('room_limit', $request->room_limit);
+        setting()->set('own_rooms_pagination_page_size', $request->own_rooms_pagination_page_size);
+        setting()->set('pagination_page_size', $request->pagination_page_size);
+        setting()->save();
+
+        return new ApplicationSettings();
     }
 
     /**
diff --git a/app/Http/Requests/UpdateSetting.php b/app/Http/Requests/UpdateSetting.php
new file mode 100644
index 000000000..7f06cd8e9
--- /dev/null
+++ b/app/Http/Requests/UpdateSetting.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateSetting extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'                           => 'required|string|max:255',
+            'room_limit'                     => 'required|numeric|min:-1|max:100',
+            'logo'                           => 'required_without:logo_file|string|max:255',
+            'logo_file'                      => 'required_without:logo|image|max:500', // 500 KB, larger files are bad for loading times
+            'favicon'                        => 'required_without:favicon_file|string|max:255',
+            'favicon_file'                   => 'required_without:favicon|mimes:ico|max:500', // 500 KB, larger files are bad for loading times
+            'own_rooms_pagination_page_size' => 'required|numeric|min:1|max:25',
+            'pagination_page_size'           => 'required|numeric|min:1|max:100'
+        ];
+    }
+}
diff --git a/app/Http/Resources/ApplicationSettings.php b/app/Http/Resources/ApplicationSettings.php
new file mode 100644
index 000000000..854b6abaf
--- /dev/null
+++ b/app/Http/Resources/ApplicationSettings.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ApplicationSettings extends JsonResource
+{
+    public function __construct()
+    {
+        parent::__construct(null);
+    }
+
+    /**
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'name'                           => setting('name'),
+            'logo'                           => setting('logo'),
+            'favicon'                        => setting('favicon'),
+            'room_limit'                     => intval(setting('room_limit')),
+            'pagination_page_size'           => intval(setting('pagination_page_size')),
+            'own_rooms_pagination_page_size' => intval(setting('own_rooms_pagination_page_size')),
+            'bbb'                            => [
+                'file_mimes'            => config('bigbluebutton.allowed_file_mimes'),
+                'max_filesize'          => intval(config('bigbluebutton.max_filesize')),
+                'room_name_limit'       => intval(config('bigbluebutton.room_name_limit')),
+                'welcome_message_limit' => intval(config('bigbluebutton.welcome_message_limit'))
+            ]
+        ];
+    }
+}
diff --git a/config/settings.php b/config/settings.php
index ef3a5aaeb..c71afde9d 100644
--- a/config/settings.php
+++ b/config/settings.php
@@ -68,7 +68,9 @@
     |
     */
     'defaults' => [
+        'name' => env('APP_NAME', 'PILOS'),
         'logo' => env('DEFAULT_LOGO', '/images/logo.svg'),
+        'favicon' => env('DEFAULT_FAVICON', '/images/favicon.ico'),
         'room_limit' => env('DEFAULT_ROOM_LIMIT',-1),
         'own_rooms_pagination_page_size' => env('OWN_ROOMS_PAGINATION_PAGE_SIZE',5),
         'pagination_page_size' => env('DEFAULT_PAGINATION_PAGE_SIZE', 15),
diff --git a/database/seeds/RolesAndPermissionsSeeder.php b/database/seeds/RolesAndPermissionsSeeder.php
index 6f348920c..79d66ab52 100644
--- a/database/seeds/RolesAndPermissionsSeeder.php
+++ b/database/seeds/RolesAndPermissionsSeeder.php
@@ -20,12 +20,17 @@ public function run()
 
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'rooms.create' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'rooms.delete' ])->id;
+
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'settings.manage' ])->id;
+        $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'settings.viewAny' ])->id;
+        $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'settings.update' ])->id;
+
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'roles.viewAny' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'roles.view' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'roles.create' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'roles.update' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'roles.delete' ])->id;
+
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'users.viewAny' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'users.view' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'users.create' ])->id;
@@ -33,7 +38,10 @@ public function run()
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'users.delete' ])->id;
         $adminPermissions[] = Permission::firstOrCreate([ 'name' => 'users.updateOwnAttributes' ])->id;
 
-        $adminRole = Role::firstOrCreate([ 'name' => 'admin', 'default' => true, 'room_limit' => -1 ]);
+        $adminRole = Role::where(['name' => 'admin', 'default' => true])->first();
+        if ($adminRole == null) {
+            $adminRole = Role::create([ 'name' => 'admin', 'default' => true, 'room_limit' => -1 ]);
+        }
         $adminRole->permissions()->syncWithoutDetaching($adminPermissions);
     }
 }
diff --git a/resources/images/favicon.ico b/resources/images/favicon.ico
new file mode 100644
index 000000000..e621c3b2b
Binary files /dev/null and b/resources/images/favicon.ico differ
diff --git a/resources/images/favicon.svg b/resources/images/favicon.svg
new file mode 100644
index 000000000..de7dc04e9
--- /dev/null
+++ b/resources/images/favicon.svg
@@ -0,0 +1 @@
+<svg id="Ebene_1" data-name="Ebene 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90.77 97.07"><defs><style>.cls-1{fill:none;}.cls-2{fill:#24356a;}.cls-3{fill:#f5aa05;}</style></defs><g id="Ebene_2" data-name="Ebene 2"><g id="Ebene_1-2" data-name="Ebene 1-2"><path class="cls-1" d="M47.33,88.8a42,42,0,0,1-16.39-3.14A38.11,38.11,0,0,1,18.12,77,40.25,40.25,0,0,1,9.76,64a43,43,0,0,1-3-16.17,43,43,0,0,1,3-16.17,40.25,40.25,0,0,1,8.36-13,38.29,38.29,0,0,1,12.82-8.64,44.51,44.51,0,0,1,32.78,0,38.15,38.15,0,0,1,12.81,8.64,39.71,39.71,0,0,1,8.36,13,42.61,42.61,0,0,1,3,16.17,42.61,42.61,0,0,1-3,16.17,39.71,39.71,0,0,1-8.36,13,38,38,0,0,1-12.81,8.63A42,42,0,0,1,47.33,88.8Zm0-9.9a28.35,28.35,0,0,0,21.34-9.13,29.65,29.65,0,0,0,5.94-9.89,35.71,35.71,0,0,0,0-24.09A29.59,29.59,0,0,0,68.67,26a29.16,29.16,0,0,0-41.21-1.47Q26.7,25.23,26,26a29.45,29.45,0,0,0-5.94,9.89,35.83,35.83,0,0,0,0,24.09A29.37,29.37,0,0,0,26,69.82a28.36,28.36,0,0,0,21.34,9.06Z" transform="translate(-3.45)"/><path id="path16" class="cls-2" d="M35.19,56.32a18.42,18.42,0,0,1-5.86-14.17,19.47,19.47,0,0,1,38.86.78,18.47,18.47,0,0,1-5.85,13.39,1.14,1.14,0,0,0,0,1.59,1.8,1.8,0,0,0,.2.19,12.86,12.86,0,0,1,4.28,5,1.2,1.2,0,0,0,1.6.56.77.77,0,0,0,.28-.19,27.6,27.6,0,0,0,9.22-21.21c-.38-14.86-12.86-27-28.3-27.39-16.42-.5-29.95,12.27-29.95,28a27.49,27.49,0,0,0,9.24,20.49,1.2,1.2,0,0,0,1.7,0h0a2.2,2.2,0,0,0,.21-.32,13,13,0,0,1,4.28-5,1.15,1.15,0,0,0,.3-1.59h0l-.16-.2ZM48.77,0C23.77,0,3.45,19.55,3.45,43.71A43.72,43.72,0,0,0,28.92,83.06a1.18,1.18,0,0,0,1.59-.51h0a1,1,0,0,0,.16-.67c-.47-3-.86-6-1.08-8.65a1.11,1.11,0,0,0-.56-.87,34.09,34.09,0,0,1-15.8-28.8c.14-18.8,16.06-34.1,35.53-34.16S84.47,24.77,84.47,43.75A34.17,34.17,0,0,1,68.15,72.63c-.21,2.74-.62,6-1.13,9.22a1.17,1.17,0,0,0,1,1.35h0a1.09,1.09,0,0,0,.73-.11A43.62,43.62,0,0,0,94.22,43.8C94.09,19.55,73.81,0,48.77,0Z" transform="translate(-3.45)"/><g id="Ebene_2-2" data-name="Ebene 2-2"><path id="path18" class="cls-3" d="M57.56,92.5c-1,3.71-5,4.57-8.79,4.57S41,96.21,40,92.5C38.39,87,35.81,73,35.81,66.59c0-6.83,6.37-8.55,13-8.55s12.86,1.59,12.86,8.5c0,6.37-2.61,20.31-4.15,25.92Z" transform="translate(-3.45)"/><path id="ellipse20" class="cls-3" d="M48.77,29.88a12.5,12.5,0,1,1-13,12.48,12.74,12.74,0,0,1,13-12.48Z" transform="translate(-3.45)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/resources/js/app.js b/resources/js/app.js
index dbdc4c137..97f066625 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -51,6 +51,8 @@ Vue.config.errorHandler = function (error, vm, info) {
   } else if (responseStatus === env.HTTP_GUESTS_ONLY) { // 420 => only for guests, redirect to home route
     vm.flashMessage.info(vm.$t('app.flash.guestsOnly'));
     vm.$router.replace({ name: 'home' });
+  } else if (responseStatus === env.HTTP_PAYLOAD_TOO_LARGE) { // 413 => payload to large
+    vm.flashMessage.error(vm.$t('app.flash.tooLarge'));
   } else if (responseStatus !== undefined) { // Another error on server
     vm.flashMessage.error({
       message: errorMessage ? vm.$t('app.flash.serverError.message', { message: errorMessage }) : vm.$t('app.flash.serverError.emptyMessage'),
diff --git a/resources/js/components/Room/FileComponent.vue b/resources/js/components/Room/FileComponent.vue
index 2d0d2e5d1..1867bff21 100644
--- a/resources/js/components/Room/FileComponent.vue
+++ b/resources/js/components/Room/FileComponent.vue
@@ -25,6 +25,7 @@
           <b-form-file
             :disabled="isBusy"
             :state="fieldState('file')"
+            :browse-text="$t('app.browse')"
             :placeholder="$t('rooms.files.selectordrag')"
             v-on:change="uploadFile($event)"
             v-model="fileUpload"
@@ -353,7 +354,7 @@ export default {
       }).catch((error) => {
         if (error.response) {
           if (error.response.status === env.HTTP_PAYLOAD_TOO_LARGE) {
-            this.errors = { file: [this.$t('rooms.files.validation.tooLarge')] };
+            this.errors = { file: [this.$t('app.validation.tooLarge')] };
             return;
           }
           if (error.response.status === env.HTTP_UNPROCESSABLE_ENTITY) {
diff --git a/resources/js/lang/de/app.js b/resources/js/lang/de/app.js
index 2e74abc88..3619e1ad1 100644
--- a/resources/js/lang/de/app.js
+++ b/resources/js/lang/de/app.js
@@ -15,6 +15,11 @@ export default {
       title: 'Fehler'
     },
 
+    tooLarge: {
+      message: 'Die übertragenen Daten waren zu groß!',
+      title: 'Fehler'
+    },
+
     guestsOnly: {
       message: 'Die Anfrage ist nur für nicht angemeldete Nutzer gestattet!',
       title: 'Nür für Gäste'
@@ -59,7 +64,9 @@ export default {
 
     settings: {
       title: 'Einstellungen',
-      manage: 'Einstellungen verwalten'
+      manage: 'Einstellungen verwalten',
+      update: 'Einstellungen bearbeiten',
+      viewAny: 'Alle Einstellungen anzeigen'
     },
 
     roles: {
@@ -85,9 +92,10 @@ export default {
   overwrite: 'Überschreiben',
   save: 'Speichern',
   back: 'Zurück',
-
-  true: 'Ja',
-  false: 'Nein',
+  browse: 'Durchsuchen',
+  validation: {
+    tooLarge: 'Die ausgewählte Datei ist zu groß.'
+  },
 
   nextPage: 'Nächste Seite',
   previousPage: 'Vorherige Seite',
diff --git a/resources/js/lang/de/rooms.js b/resources/js/lang/de/rooms.js
index 38e28a98b..567095483 100644
--- a/resources/js/lang/de/rooms.js
+++ b/resources/js/lang/de/rooms.js
@@ -65,9 +65,6 @@ export default {
     },
     formats: 'Erlaubte Dateiformate: {formats}',
     size: 'Max. Dateigröße: {size} MB',
-    validation: {
-      tooLarge: 'Die ausgewählte Datei ist zu groß.'
-    },
     termsOfUse: {
       title: 'Nutzungsbedingungen',
       content: 'Dateien, welche hier zum Download angeboten werden, sind ausschließlich für das persönliche Studium. Die Dateien, oder Inhalte aus diesen, dürfen nicht geteilt oder weiterverbreitet werden.',
diff --git a/resources/js/lang/de/settings.js b/resources/js/lang/de/settings.js
index 590758d58..3d587f04d 100644
--- a/resources/js/lang/de/settings.js
+++ b/resources/js/lang/de/settings.js
@@ -73,5 +73,48 @@ export default {
       confirm: 'Wollen Sie den Benutzer {firstname} {lastname} wirklich löschen?',
       title: 'Benutzer löschen?'
     }
+  },
+
+  application: {
+    title: 'Anwendung',
+    logo: {
+      title: 'Logo',
+      uploadTitle: 'Logo hochladen (max. 500 KB)',
+      urlTitle: 'URL zu Logo-Datei',
+      description: 'URL zum Logo',
+      hint: 'https://domain.tld/path/logo.svg',
+      selectFile: 'Logo-Datei auswählen',
+      alt: 'Favicon Vorschau'
+    },
+
+    favicon: {
+      title: 'Favicon',
+      uploadTitle: 'Favicon hochladen (max. 500 KB, Format: .ico)',
+      urlTitle: 'URL zu Favicon-Datei',
+      description: 'URL zum Favicon',
+      hint: 'https://domain.tld/path/favicon.ico',
+      selectFile: 'Favicon-Datei auswählen',
+      alt: 'Favicon Vorschau'
+    },
+
+    name: {
+      title: 'Name der Anwendung',
+      description: 'Ändert den Seitentitel'
+    },
+
+    roomLimit: {
+      title: 'Anzahl der Räume pro Benutzer',
+      description: 'Begrenzt die Anzahl der Räume, die ein Benutzer haben kann. Diese Einstellung wird von den gruppenspezifischen Grenzen überschrieben.'
+    },
+
+    paginationPageSize: {
+      title: 'Größe der Paginierung',
+      description: 'Begrenzt die Anzahl der gleichzeitig angezeigten Datensätze in Tabellen'
+    },
+
+    ownRoomsPaginationPageSize: {
+      title: 'Größe der Paginierung für eigene Räume',
+      description: 'Begrenzt die Anzahl der gleichzeitig angezeigten Räume auf der Startseite'
+    }
   }
 };
diff --git a/resources/js/lang/en/app.js b/resources/js/lang/en/app.js
index 8f6d1f688..55775e8ad 100644
--- a/resources/js/lang/en/app.js
+++ b/resources/js/lang/en/app.js
@@ -15,6 +15,11 @@ export default {
       title: 'Error'
     },
 
+    tooLarge: {
+      message: 'The transmitted data was too large!',
+      title: 'Error'
+    },
+
     guestsOnly: {
       message: 'The request can only be done by guests!',
       title: 'Only for guests'
@@ -59,7 +64,9 @@ export default {
 
     settings: {
       title: 'Settings',
-      manage: 'Manage settings'
+      manage: 'Manage settings',
+      update: 'Edit settings',
+      viewAny: 'Show all settings'
     },
 
     roles: {
@@ -81,19 +88,20 @@ export default {
       updateOwnAttributes: 'Update own firstname, lastname and email'
     }
   },
-
   overwrite: 'Overwrite',
   save: 'Save',
   back: 'Back',
 
-  true: 'Yes',
-  false: 'No',
-
   nextPage: 'Next page',
   previousPage: 'Previous page',
 
   confirmPassword: {
     title: 'Confirm password',
     description: 'Please confirm your password before continuing!'
+  },
+
+  browse: 'Browse',
+  validation: {
+    tooLarge: 'The selected file is too large.'
   }
 };
diff --git a/resources/js/lang/en/rooms.js b/resources/js/lang/en/rooms.js
index e25e3cd1c..5c5472ed3 100644
--- a/resources/js/lang/en/rooms.js
+++ b/resources/js/lang/en/rooms.js
@@ -65,9 +65,6 @@ export default {
     },
     formats: 'Allowed file formats: {formats}',
     size: 'Max. file size: {size} MB',
-    validation: {
-      tooLarge: 'The selected file is too large.'
-    },
     termsOfUse: {
       title: 'Terms of Use',
       content: 'Files that can be downloaded here are for personal study only. The files, or parts of them, may not be shared or distributed.',
diff --git a/resources/js/lang/en/settings.js b/resources/js/lang/en/settings.js
index 0d2f6881f..1dc6027fe 100644
--- a/resources/js/lang/en/settings.js
+++ b/resources/js/lang/en/settings.js
@@ -72,5 +72,48 @@ export default {
       confirm: 'Are you really want to delete the user {firstname} {lastname}?',
       title: 'Delete user?'
     }
+  },
+
+  application: {
+    title: 'Application',
+    logo: {
+      title: 'Logo',
+      uploadTitle: 'Upload a logo (max. 500 KB)',
+      urlTitle: 'URL to logo file',
+      description: 'Changes the application logo. Enter the image URL',
+      hint: 'https://domain.tld/path/logo.svg',
+      selectFile: 'Select logo file',
+      alt: 'Logo preview'
+    },
+
+    favicon: {
+      title: 'Favicon',
+      uploadTitle: 'Upload a favicon (max. 500 KB, Format: .ico)',
+      urlTitle: 'URL to favicon file',
+      description: 'Changes the application favicon. Enter the favicon URL',
+      hint: 'https://domain.tld/path/favicon.ico',
+      selectFile: 'Select favicon file',
+      alt: 'Favicon preview'
+    },
+
+    name: {
+      title: 'Name of the application',
+      description: 'Changes the site title'
+    },
+
+    roomLimit: {
+      title: 'Number of rooms per user',
+      description: 'Limits the number of rooms that a user can have. This setting does not apply to administrators.  Enter the value -1 for unlimited number of rooms'
+    },
+
+    paginationPageSize: {
+      title: 'Pagination page size',
+      description: 'Limits the number of page size for data tables pagination'
+    },
+
+    ownRoomsPaginationPageSize: {
+      title: 'Own rooms pagination page size',
+      description: 'Limits the number of page size for own rooms pagination'
+    }
   }
 };
diff --git a/resources/js/policies/SettingPolicy.js b/resources/js/policies/SettingPolicy.js
index ffc28300e..b99cd8444 100644
--- a/resources/js/policies/SettingPolicy.js
+++ b/resources/js/policies/SettingPolicy.js
@@ -10,5 +10,25 @@ export default {
    */
   manage (permissionService) {
     return !permissionService.currentUser ? false : permissionService.currentUser.permissions.includes('settings.manage');
+  },
+
+  /**
+   * Returns a boolean that indicates whether the user can view all application settings or not.
+   *
+   * @param permissionService
+   * @return {boolean}
+   */
+  viewAny (permissionService) {
+    return !permissionService.currentUser ? false : permissionService.currentUser.permissions.includes('settings.viewAny');
+  },
+
+  /**
+   * Returns a boolean that indicates whether the user can update the application settings or not.
+   *
+   * @param permissionService
+   * @return {boolean}
+   */
+  update (permissionService) {
+    return !permissionService.currentUser ? false : permissionService.currentUser.permissions.includes('settings.update');
   }
 };
diff --git a/resources/js/router.js b/resources/js/router.js
index 59a73973c..d8b880490 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -12,6 +12,7 @@ import RolesIndex from './views/settings/roles/Index';
 import RolesView from './views/settings/roles/View';
 import UsersIndex from './views/settings/users/Index';
 import UsersView from './views/settings/users/View';
+import Application from './views/settings/Application';
 import SettingsHome from './views/settings/SettingsHome';
 import Base from './api/base';
 
@@ -164,6 +165,18 @@ export const routes = [
             });
           }
         }
+      },
+      {
+        path: 'application',
+        name: 'settings.application',
+        component: Application,
+        meta: {
+          requiresAuth: true,
+          accessPermitted: () => Promise.resolve(
+            PermissionService.can('manage', 'SettingPolicy') &&
+            PermissionService.can('viewAny', 'SettingPolicy')
+          )
+        }
       }
     ]
   },
diff --git a/resources/js/views/settings/Application.vue b/resources/js/views/settings/Application.vue
new file mode 100644
index 000000000..44288dc4a
--- /dev/null
+++ b/resources/js/views/settings/Application.vue
@@ -0,0 +1,477 @@
+<template>
+  <b-container fluid>
+    <h3>
+      {{ $t('settings.application.title') }}
+    </h3>
+
+    <hr>
+    <b-overlay :show="isBusy || !loaded">
+
+      <template #overlay>
+        <div class="text-center">
+          <b-spinner v-if="isBusy" ></b-spinner>
+          <b-button
+           v-else
+            @click="getSettings()"
+          >
+            <b-icon-arrow-clockwise></b-icon-arrow-clockwise> {{ $t('app.reload') }}
+          </b-button>
+        </div>
+      </template>
+
+      <b-form @submit="onSubmit" :aria-hidden="!loaded">
+
+        <!--Application name-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-name-input"
+          :description="$t('settings.application.name.description')"
+          :state='fieldState("name")'
+          :label="$t('settings.application.name.title')"
+        >
+          <b-form-input id="application-name-input"
+                        v-model="settings.name"
+                        type="text"
+                        required
+                        :disabled="isBusy || viewOnly || !loaded"
+                        :state='fieldState("name")'
+          >
+          </b-form-input>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('name')"></div>
+          </template>
+        </b-form-group>
+
+        <!--Favicon Settings-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-favicon-input"
+          :state='(fieldState("favicon") == null && fieldState("favicon_file") == null) ? null : false'
+          :label="$t('settings.application.favicon.title')"
+        >
+          <b-row class="my-3" align-v="center">
+            <b-col sm="6" lg="3" class="text-center">
+              <b-img
+                v-if="uploadFaviconFileSrc!==null || settings.favicon!==null"
+                :src="uploadFaviconFileSrc ? uploadFaviconFileSrc : settings.favicon"
+                class="my-2"
+                rounded="0"
+                :alt="$t('settings.application.favicon.alt')"
+                width="32"
+                height="32"
+                fluid
+              >
+              </b-img>
+            </b-col>
+            <b-col sm="6" lg="9">
+              <b-form-text v-if="!uploadFaviconFile">{{ $t('settings.application.favicon.urlTitle') }}</b-form-text>
+              <b-form-input
+                id="application-favicon-input"
+                v-if="!uploadFaviconFile"
+                required
+                :placeholder="$t('settings.application.favicon.hint')"
+                v-model="settings.favicon"
+                :disabled="isBusy || viewOnly || !loaded"
+                class="my-2"
+                :state='fieldState("favicon")'
+              >
+              </b-form-input>
+              <b-form-text v-if="!viewOnly">{{ $t('settings.application.favicon.uploadTitle') }}</b-form-text>
+              <b-input-group v-if="!viewOnly">
+                <b-form-file
+                  id="application-favicon-form-file"
+                  :state='fieldState("favicon_file")'
+                  :disabled="isBusy || viewOnly || !loaded"
+                  :browse-text="$t('app.browse')"
+                  :placeholder="$t('settings.application.favicon.selectFile')"
+                  v-model="uploadFaviconFile"
+                  accept="image/x-icon"
+                >
+                </b-form-file>
+                <template #append v-if="uploadFaviconFile">
+                  <b-button variant="danger" @click="uploadFaviconFile = null">
+                    <b-icon-x></b-icon-x>
+                  </b-button>
+                </template>
+              </b-input-group>
+            </b-col>
+          </b-row>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('favicon')"></div>
+            <div v-html="fieldError('favicon_file')"></div>
+          </template>
+        </b-form-group>
+
+        <!--Logo Settings-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-logo-input"
+          :state='(fieldState("logo") == null && fieldState("logo_file") == null) ? null : false'
+          :label="$t('settings.application.logo.title')"
+        >
+          <b-row class="my-3" align-v="center">
+            <b-col sm="6" lg="3" class="text-center">
+              <b-img
+                v-if="uploadLogoFileSrc!==null || settings.logo!==null"
+                :src="uploadLogoFileSrc ? uploadLogoFileSrc : settings.logo"
+                class="my-2"
+                rounded="0"
+                :alt="$t('settings.application.logo.alt')"
+                width="150"
+                height="100"
+                fluid
+              >
+              </b-img>
+            </b-col>
+            <b-col sm="6" lg="9">
+              <b-form-text v-if="!uploadLogoFile">{{ $t('settings.application.logo.urlTitle') }}</b-form-text>
+              <b-form-input
+                id="application-logo-input"
+                v-if="!uploadLogoFile"
+                required
+                :placeholder="$t('settings.application.logo.hint')"
+                v-model="settings.logo"
+                :disabled="isBusy || viewOnly || !loaded"
+                class="my-2"
+                :state='fieldState("logo")'
+              >
+              </b-form-input>
+              <b-form-text v-if="!viewOnly">{{ $t('settings.application.logo.uploadTitle') }}</b-form-text>
+              <b-input-group v-if="!viewOnly">
+                <b-form-file
+                  id="application-logo-form-file"
+                  :state='fieldState("logo_file")'
+                  :disabled="isBusy || viewOnly || !loaded"
+                  :browse-text="$t('app.browse')"
+                  :placeholder="$t('settings.application.logo.selectFile')"
+                  v-model="uploadLogoFile"
+                  accept="image/jpeg, image/png, image/gif, image/svg+xml"
+                >
+                </b-form-file>
+                <template #append v-if="uploadLogoFile">
+                  <b-button id="application-upload-button" variant="danger" @click="uploadLogoFile = null">
+                    <b-icon-x></b-icon-x>
+                  </b-button>
+                </template>
+              </b-input-group>
+            </b-col>
+          </b-row>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('logo')"></div>
+            <div v-html="fieldError('logo_file')"></div>
+          </template>
+        </b-form-group>
+
+        <!--Room limit settings-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-room-limit-input"
+          :description="$t('settings.application.roomLimit.description')"
+          :state='fieldState("room_limit")'
+          :label="$t('settings.application.roomLimit.title')"
+        >
+          <b-form-radio-group
+            class='mb-2'
+            id="application-room-limit-radio-group"
+            v-model='roomLimitMode'
+            :options='roomLimitModeOptions'
+            :disabled='isBusy || viewOnly || !loaded'
+            required
+            :state='fieldState("room_limit")'
+            @change="roomLimitModeChanged"
+            stacked
+          ></b-form-radio-group>
+
+          <b-form-input
+            id='application-room-limit-input'
+            type='number'
+            :state='fieldState("room_limit")'
+            v-model='settings.room_limit'
+            min='0'
+            max="100"
+            required
+            :disabled='isBusy || viewOnly || !loaded'
+            v-if="roomLimitMode === 'custom'">
+          </b-form-input>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('room_limit')"></div>
+          </template>
+        </b-form-group>
+
+        <!--Pagination page size settings-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-pagination-page-size-input"
+          :description="$t('settings.application.paginationPageSize.description')"
+          :state='fieldState("pagination_page_size")'
+          :label="$t('settings.application.paginationPageSize.title')"
+        >
+          <b-form-input id="application-pagination-page-size-input"
+                        v-model="settings.pagination_page_size"
+                        type="number"
+                        :disabled="isBusy || viewOnly || !loaded"
+                        min="1"
+                        max="100"
+                        required
+                        :state='fieldState("pagination_page_size")'
+          >
+          </b-form-input>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('pagination_page_size')"></div>
+          </template>
+        </b-form-group>
+
+        <!--Own rooms pagination page size settings-->
+        <b-form-group
+          label-class="font-weight-bold"
+          class="mb-4"
+          label-for="application-pagination-own-room-page-size-input"
+          :description="$t('settings.application.ownRoomsPaginationPageSize.description')"
+          :state='fieldState("own_rooms_pagination_page_size")'
+          :label="$t('settings.application.ownRoomsPaginationPageSize.title')"
+        >
+          <b-form-input id="application-pagination-own-room-page-size-input"
+                        v-model="settings.own_rooms_pagination_page_size"
+                        type="number"
+                        min="1"
+                        max="25"
+                        required
+                        :disabled="isBusy || viewOnly || !loaded"
+                        :state='fieldState("own_rooms_pagination_page_size")'
+          >
+          </b-form-input>
+
+          <template slot='invalid-feedback'>
+            <div v-html="fieldError('own_rooms_pagination_page_size')"></div>
+          </template>
+        </b-form-group>
+
+        <hr>
+        <div class="clearfix">
+          <b-button id="application-save-button"
+                    class="float-right mr-1 mb-1"
+                    variant="success"
+                    type="submit"
+                    v-if="!viewOnly"
+                    :disabled="isBusy || !loaded">
+            <span><i class="fas fa-save mr-2"></i>{{ $t('app.save') }}</span>
+          </b-button>
+        </div>
+      </b-form>
+    </b-overlay>
+  </b-container>
+</template>
+
+<script>
+import Base from '../../api/base';
+import FieldErrors from '../../mixins/FieldErrors';
+import env from '../../env';
+import PermissionService from '../../services/PermissionService';
+
+export default {
+  mixins: [FieldErrors],
+
+  data () {
+    return {
+      loaded: false,
+      roomLimitMode: 'custom',
+      uploadLogoFile: null,
+      uploadLogoFileSrc: null,
+      uploadFaviconFile: null,
+      uploadFaviconFileSrc: null,
+      isBusy: false,
+      settings: {},
+      errors: {}
+    };
+  },
+  methods: {
+    /**
+     * Handle get settings data
+     */
+    getSettings () {
+      this.isBusy = true;
+      Base.call('settings')
+        .then(response => {
+          this.settings = response.data.data;
+          this.roomLimitMode = (this.settings.room_limit === -1 ? 'unlimited' : 'custom');
+          this.loaded = true;
+        })
+        .catch((error) => {
+          Base.error(error, this.$root, error.message);
+        })
+        .finally(() => {
+          this.isBusy = false;
+        });
+    },
+
+    /**
+     * Handle form submit event, prevent default form submission, instead call updateSettings to send data to server
+     */
+    onSubmit (evt) {
+      evt.preventDefault();
+      this.updateSettings();
+    },
+
+    /**
+     * Handle update settings data
+     *
+     */
+    updateSettings () {
+      this.isBusy = true;
+
+      // Build form data
+      const formData = new FormData();
+      if (this.uploadLogoFile) {
+        formData.append('logo_file', this.uploadLogoFile);
+      } else {
+        formData.append('logo', this.settings.logo);
+      }
+      if (this.uploadFaviconFile) {
+        formData.append('favicon_file', this.uploadFaviconFile);
+      } else {
+        formData.append('favicon', this.settings.favicon);
+      }
+      formData.append('name', this.settings.name);
+      formData.append('room_limit', this.settings.room_limit);
+      formData.append('pagination_page_size', this.settings.pagination_page_size);
+      formData.append('own_rooms_pagination_page_size', this.settings.own_rooms_pagination_page_size);
+      formData.append('_method', 'PUT');
+
+      Base.call('settings',
+        {
+          method: 'post',
+          data: formData,
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        })
+        .then(response => {
+          this.$store.dispatch('session/getSettings');
+          this.errors = {};
+          this.uploadLogoFile = null;
+
+          // update form input
+          this.settings = response.data.data;
+          this.roomLimitMode = (this.settings.room_limit === -1 ? 'unlimited' : 'custom');
+        })
+        .catch((error) => {
+          if (error.response && error.response.status === env.HTTP_UNPROCESSABLE_ENTITY) {
+            this.errors = error.response.data.errors;
+          } else {
+            Base.error(error, this.$root);
+          }
+        })
+        .finally(() => {
+          this.isBusy = false;
+        });
+    },
+    /**
+     * Sets the roomLimit on the model depending on the selected radio button.
+     *
+     * @param value Value of the radio button that was selected.
+     */
+    roomLimitModeChanged (value) {
+      switch (value) {
+        case 'unlimited':
+          this.settings.room_limit = -1;
+          break;
+        case 'custom':
+          this.settings.room_limit = 0;
+          break;
+      }
+    },
+
+    /**
+     * base64 encoder for file
+     * @param data
+     * @return {Promise<unknown>}
+     */
+    base64Encode (data) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.readAsDataURL(data);
+        reader.onload = () => resolve(reader.result);
+        reader.onerror = error => reject(error);
+      });
+    }
+  },
+  mounted () {
+    this.getSettings();
+  },
+  computed: {
+
+    /**
+     * Check if user is only allowed to read settings
+     */
+    viewOnly () {
+      return PermissionService.cannot('update', 'SettingPolicy');
+    },
+
+    /**
+     * Options for the room limit mode radio button group.
+     */
+    roomLimitModeOptions () {
+      return [
+        { text: this.$t('settings.roles.roomLimit.unlimited'), value: 'unlimited' },
+        { text: this.$t('settings.roles.roomLimit.custom'), value: 'custom' }
+      ];
+    }
+  },
+  watch: {
+    /**
+     * watch for logo file select changes, encode to base64 and display image
+     * @param newValue
+     * @param oldValue
+     */
+    uploadLogoFile (newValue, oldValue) {
+      if (newValue !== oldValue) {
+        if (newValue) {
+          this.base64Encode(newValue)
+            .then(value => {
+              this.uploadLogoFileSrc = value;
+            })
+            .catch(() => {
+              this.uploadLogoFileSrc = null;
+            });
+        } else {
+          this.uploadLogoFileSrc = null;
+        }
+      }
+    },
+    /**
+     * watch for favicon file select changes, encode to base64 and display image
+     * @param newValue
+     * @param oldValue
+     */
+    uploadFaviconFile (newValue, oldValue) {
+      if (newValue !== oldValue) {
+        if (newValue) {
+          this.base64Encode(newValue)
+            .then(value => {
+              this.uploadFaviconFileSrc = value;
+            })
+            .catch(() => {
+              this.uploadFaviconFileSrc = null;
+            });
+        } else {
+          this.uploadFaviconFileSrc = null;
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/views/settings/Settings.vue b/resources/js/views/settings/Settings.vue
index 5e77694a9..9a5071509 100644
--- a/resources/js/views/settings/Settings.vue
+++ b/resources/js/views/settings/Settings.vue
@@ -22,6 +22,15 @@
               </b-row>
             </b-nav-item>
           </can>
+
+          <can method='viewAny' policy='SettingPolicy'>
+            <b-nav-item class='setting-nav-link' exact-active-class='setting-nav-link-active' :to="{ name: 'settings.application' }">
+              <b-row>
+                <b-col cols='3'><span><i class='fas fa-cogs'></i></span></b-col>
+                <b-col cols='7'>{{ $t('settings.application.title') }}</b-col>
+              </b-row>
+            </b-nav-item>
+          </can>
         </b-nav>
       </b-col>
       <b-col lg='9'>
diff --git a/resources/js/views/settings/roles/Index.vue b/resources/js/views/settings/roles/Index.vue
index a5a5c1682..51e64c476 100644
--- a/resources/js/views/settings/roles/Index.vue
+++ b/resources/js/views/settings/roles/Index.vue
@@ -40,7 +40,7 @@
       </template>
 
       <template v-slot:cell(default)="data">
-        {{ $t(`app.${data.item.default}`) }}
+        {{ $t(`app.${data.item.default ? 'yes' : 'no'}`) }}
       </template>
 
       <template v-slot:cell(actions)="data">
@@ -95,7 +95,7 @@
       :busy='deleting'
       ok-variant='danger'
       cancel-variant='dark'
-      :cancel-title="$t('app.false')"
+      :cancel-title="$t('app.no')"
       @ok='deleteRole($event)'
       @cancel='clearRoleToDelete'
       @close='clearRoleToDelete'
@@ -105,7 +105,7 @@
         {{ $t('settings.roles.delete.title') }}
       </template>
       <template v-slot:modal-ok>
-        <b-spinner small v-if="deleting"></b-spinner>  {{ $t('app.true') }}
+        <b-spinner small v-if="deleting"></b-spinner>  {{ $t('app.yes') }}
       </template>
       <span v-if="roleToDelete">
         {{ $t('settings.roles.delete.confirm', { name: $te(`app.roles.${roleToDelete.name}`) ? $t(`app.roles.${roleToDelete.name}`) : roleToDelete.name }) }}
diff --git a/resources/js/views/settings/users/Index.vue b/resources/js/views/settings/users/Index.vue
index 88f3e0537..93ab44576 100644
--- a/resources/js/views/settings/users/Index.vue
+++ b/resources/js/views/settings/users/Index.vue
@@ -117,7 +117,7 @@
       :busy='deleting'
       ok-variant='danger'
       cancel-variant='dark'
-      :cancel-title="$t('app.false')"
+      :cancel-title="$t('app.no')"
       @ok='deleteUser($event)'
       @cancel='clearUserToDelete'
       @close='clearUserToDelete'
@@ -127,7 +127,7 @@
         {{ $t('settings.users.delete.title') }}
       </template>
       <template v-slot:modal-ok>
-        <b-spinner small v-if="deleting"></b-spinner>  {{ $t('app.true') }}
+        <b-spinner small v-if="deleting"></b-spinner>  {{ $t('app.yes') }}
       </template>
       <span v-if="userToDelete">
         {{ $t('settings.users.delete.confirm', { firstname: userToDelete.firstname, lastname: userToDelete.lastname }) }}
diff --git a/resources/views/application.blade.php b/resources/views/application.blade.php
index 3093868e9..63cf25acf 100644
--- a/resources/views/application.blade.php
+++ b/resources/views/application.blade.php
@@ -6,8 +6,8 @@
 
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
-
-    <title>{{ config('app.name', 'PILOS') }}</title>
+    <link type="image/x-icon" rel="icon" href="{{ setting('favicon') }}">
+    <title>{{ setting('name') }}</title>
 
     <!-- Scripts -->
     <script src="{{ mix('js/app.js') }}" defer></script>
diff --git a/routes/api.php b/routes/api.php
index 576305a8f..c596e8515 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -47,6 +47,8 @@
     });
 
     Route::middleware('auth:users,ldap')->group(function () {
+        Route::put('settings', 'ApplicationController@updateSettings')->name('application.update')->middleware('can:settings.update');
+
         Route::apiResource('roles', 'RoleController');
         Route::get('permissions', 'PermissionController@index')->name('permissions.index');
 
diff --git a/tests/Feature/RoutingTest.php b/tests/Feature/RoutingTest.php
index fdad50379..5eb60e9e1 100644
--- a/tests/Feature/RoutingTest.php
+++ b/tests/Feature/RoutingTest.php
@@ -2,11 +2,14 @@
 
 namespace Tests\Feature;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\URL;
 use Tests\TestCase;
 
 class RoutingTest extends TestCase
 {
+    use RefreshDatabase;
+
     /**
      * Tests not found responses on not existing api route.
      *
diff --git a/tests/Feature/api/v1/SettingsTest.php b/tests/Feature/api/v1/SettingsTest.php
index e4a7cb643..642481ff4 100644
--- a/tests/Feature/api/v1/SettingsTest.php
+++ b/tests/Feature/api/v1/SettingsTest.php
@@ -2,14 +2,29 @@
 
 namespace Tests\Feature\api\v1;
 
+use App\Permission;
+use App\Role;
+use App\User;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
 use Tests\TestCase;
 
 class SettingsTest extends TestCase
 {
     use RefreshDatabase, WithFaker;
 
+    protected $user;
+
+    /**
+     * Setup resources for all tests
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->user = factory(User::class)->create();
+    }
+
     /**
      * Tests that the correct application wide settings provided
      *
@@ -19,9 +34,205 @@ public function testApplicationSettings()
     {
         setting(['logo' => 'testlogo.svg']);
         setting(['pagination_page_size' => '123']);
+        setting(['own_rooms_pagination_page_size' => '123']);
+        setting(['room_limit' => '-1']);
 
         $this->getJson(route('api.v1.application'))
-            ->assertJson(['data'=>['logo'=>'testlogo.svg','pagination_page_size'=>'123']])
+            ->assertJson([
+                'data' => [
+                    'logo'                           => 'testlogo.svg',
+                    'pagination_page_size'           => '123',
+                    'own_rooms_pagination_page_size' => '123',
+                    'room_limit'                     => '-1',
+                ]
+            ])
             ->assertSuccessful();
     }
+
+    /**
+     * Tests that updates application settings with valid inputs and image file upload
+     *
+     * @return void
+     */
+    public function testUpdateApplicationSettingsWithValidInputsImageFile()
+    {
+        $payload = [
+            'name'                           => 'test',
+            'logo_file'                      => UploadedFile::fake()->image('logo.svg'),
+            'favicon_file'                   => UploadedFile::fake()->create('favicon.ico', 100, 'image/x-icon'),
+            'pagination_page_size'           => '10',
+            'own_rooms_pagination_page_size' => '15',
+            'room_limit'                     => '-1',
+        ];
+
+        // Unauthorized Test
+        $this->putJson(route('api.v1.application.update'), $payload)
+            ->assertUnauthorized();
+
+        // Forbidden Test
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'), $payload)
+            ->assertForbidden();
+
+        // Add necessary role and permission to user to update application settings
+        $role       = factory(Role::class)->create();
+        $permission = factory(Permission::class)->create(['name' => 'settings.update']);
+        $role->permissions()->attach($permission);
+        $this->user->roles()->attach($role);
+
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'), $payload)
+            ->assertSuccessful();
+    }
+
+    /**
+     * Tests that updates application settings with valid inputs and and image url
+     *
+     * @return void
+     */
+    public function testUpdateApplicationSettingsWithValidInputsImageUrl()
+    {
+        $payload = [
+            'name'                           => 'test',
+            'favicon'                        => '/storage/image/favicon.ico',
+            'logo'                           => '/storage/image/testfile.svg',
+            'pagination_page_size'           => '10',
+            'own_rooms_pagination_page_size' => '15',
+            'room_limit'                     => '-1',
+        ];
+
+        // Unauthorized Test
+        $this->putJson(route('api.v1.application.update'), $payload)
+            ->assertUnauthorized();
+
+        // Forbidden Test
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'), $payload)
+            ->assertForbidden();
+
+        // Add necessary role and permission to user to update application settings
+        $role       = factory(Role::class)->create();
+        $permission = factory(Permission::class)->create(['name' => 'settings.update']);
+        $role->permissions()->attach($permission);
+        $this->user->roles()->attach($role);
+
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'), $payload)
+            ->assertSuccessful();
+    }
+
+    /**
+     * Tests that updates application settings with valid inputs, having a file url and file upload.
+     * Uploaded files should have a higher priority and overwrite possible urls
+     *
+     * @return void
+     */
+    public function testUpdateApplicationSettingsWithValidInputsImageFileAndUrl()
+    {
+        $payload = [
+            'name'                           => 'test',
+            'logo'                           => '/storage/image/testfile.svg',
+            'logo_file'                      => UploadedFile::fake()->image('logo.svg'),
+            'favicon'                        => '/storage/image/favicon.ico',
+            'favicon_file'                   => UploadedFile::fake()->create('favicon.ico', 100, 'image/x-icon'),
+            'pagination_page_size'           => '10',
+            'own_rooms_pagination_page_size' => '15',
+            'room_limit'                     => '-1',
+        ];
+
+        // Add necessary role and permission to user to update application settings
+        $role       = factory(Role::class)->create();
+        $permission = factory(Permission::class)->create(['name' => 'settings.update']);
+        $role->permissions()->attach($permission);
+        $this->user->roles()->attach($role);
+
+        $response = $this->actingAs($this->user)->putJson(route('api.v1.application.update'), $payload);
+        $response->assertSuccessful();
+
+        $this->assertFalse($response->json('data.logo') == '/storage/image/testfile.svg');
+    }
+
+    /**
+     * Tests that updates application settings with invalid inputs
+     *
+     * @return void
+     */
+    public function testUpdateApplicationSettingsWithInvalidInputs()
+    {
+        // Add necessary role and permission to user to update application settings
+        $role       = factory(Role::class)->create();
+        $permission = factory(Permission::class)->create(['name' => 'settings.update']);
+        $role->permissions()->attach($permission);
+        $this->user->roles()->attach($role);
+
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'),
+            [
+                'name'                           => '',
+                'favicon'                        => '',
+                'favicon_file'                   => 'notimagefile',
+                'logo'                           => '',
+                'logo_file'                      => 'notimagefile',
+                'pagination_page_size'           => 'notnumber',
+                'own_rooms_pagination_page_size' => 'notnumber',
+                'room_limit'                     => 'notnumber',
+            ]
+        )
+            ->assertStatus(422)
+            ->assertJsonValidationErrors([
+                'name',
+                'favicon_file',
+                'favicon',
+                'logo',
+                'logo_file',
+                'pagination_page_size',
+                'own_rooms_pagination_page_size',
+                'room_limit'
+            ]);
+    }
+
+    /**
+     * Tests that updates application settings with invalid inputs for numeric input
+     *
+     * @return void
+     */
+    public function testUpdateApplicationSettingsMinMax()
+    {
+        // Add necessary role and permission to user to update application settings
+        $role       = factory(Role::class)->create();
+        $permission = factory(Permission::class)->create(['name' => 'settings.update']);
+        $role->permissions()->attach($permission);
+        $this->user->roles()->attach($role);
+
+        // inputs lower than allowed minimum
+        $this->actingAs($this->user)->putJson(route('api.v1.application.update'),
+            [
+                'name'                           => 'test',
+                'favicon'                        => '/storage/image/favicon.ico',
+                'logo'                           => '/storage/image/testfile.svg',
+                'pagination_page_size'           => '0',
+                'own_rooms_pagination_page_size' => '0',
+                'room_limit'                     => '-2',
+            ]
+        )
+            ->assertStatus(422)
+            ->assertJsonValidationErrors([
+                'pagination_page_size',
+                'own_rooms_pagination_page_size',
+                'room_limit'
+            ]);
+
+        // inputs higher than allowed minimum
+        $this->putJson(route('api.v1.application.update'),
+            [
+                'name'                           => 'test',
+                'favicon'                        => '/storage/image/favicon.ico',
+                'logo'                           => '/storage/image/testfile.svg',
+                'pagination_page_size'           => '101',
+                'own_rooms_pagination_page_size' => '26',
+                'room_limit'                     => '101',
+            ]
+        )
+            ->assertStatus(422)
+            ->assertJsonValidationErrors([
+                'pagination_page_size',
+                'own_rooms_pagination_page_size',
+                'room_limit'
+            ]);
+    }
 }
diff --git a/tests/Frontend/Router.spec.js b/tests/Frontend/Router.spec.js
index 9a10c8d83..1e9378db7 100644
--- a/tests/Frontend/Router.spec.js
+++ b/tests/Frontend/Router.spec.js
@@ -10,6 +10,9 @@ const accessPermittedRolesView = routes.filter(route => route.path === '/setting
 const accessPermittedUsersView = routes.filter(route => route.path === '/settings')[0]
   .children.filter(route => route.name === 'settings.users.view')[0].meta.accessPermitted;
 
+const accessPermittedSettingsView = routes.filter(route => route.path === '/settings')[0]
+  .children.filter(route => route.name === 'settings.application')[0].meta.accessPermitted;
+
 describe('Router', function () {
   beforeEach(function () {
     moxios.install();
@@ -313,5 +316,31 @@ describe('Router', function () {
         done();
       });
     });
+
+    it('for application settings update view returns true if user has the necessary permissions', function (done) {
+      const oldUser = PermissionService.currentUser;
+
+      accessPermittedSettingsView().then(result => {
+        expect(result).toBe(false);
+
+        PermissionService.setCurrentUser({ permissions: ['settings.viewAny'] });
+        return accessPermittedSettingsView();
+      }).then(result => {
+        expect(result).toBe(false);
+
+        PermissionService.setCurrentUser({ permissions: ['settings.viewAny', 'settings.update', 'settings.manage'] });
+        return accessPermittedSettingsView();
+      }).then(result => {
+        expect(result).toBe(true);
+
+        PermissionService.setCurrentUser({ permissions: ['settings.viewAny', 'settings.manage'] });
+        return accessPermittedSettingsView();
+      }).then(result => {
+        expect(result).toBe(true);
+
+        PermissionService.setCurrentUser(oldUser);
+        done();
+      });
+    });
   });
 });
diff --git a/tests/Frontend/policies/SettingPolicy.spec.js b/tests/Frontend/policies/SettingPolicy.spec.js
index 7ef1e69a5..49120ec62 100644
--- a/tests/Frontend/policies/SettingPolicy.spec.js
+++ b/tests/Frontend/policies/SettingPolicy.spec.js
@@ -5,4 +5,14 @@ describe('SettingPolicy', function () {
     expect(SettingPolicy.manage({ currentUser: { permissions: [] } })).toBe(false);
     expect(SettingPolicy.manage({ currentUser: { permissions: ['settings.manage'] } })).toBe(true);
   });
+
+  it('viewAny returns true if the user has the permission to view all settings', function () {
+    expect(SettingPolicy.viewAny({ currentUser: { permissions: [] } })).toBe(false);
+    expect(SettingPolicy.viewAny({ currentUser: { permissions: ['settings.viewAny'] } })).toBe(true);
+  });
+
+  it('update returns true if the user has the permission to update settings', function () {
+    expect(SettingPolicy.update({ currentUser: { permissions: [] } })).toBe(false);
+    expect(SettingPolicy.update({ currentUser: { permissions: ['settings.update'] } })).toBe(true);
+  });
 });
diff --git a/tests/Frontend/views/settings/Application.spec.js b/tests/Frontend/views/settings/Application.spec.js
new file mode 100644
index 000000000..9644f0ab2
--- /dev/null
+++ b/tests/Frontend/views/settings/Application.spec.js
@@ -0,0 +1,532 @@
+import { createLocalVue, mount } from '@vue/test-utils';
+import moxios from 'moxios';
+import BootstrapVue, { IconsPlugin } from 'bootstrap-vue';
+import sinon from 'sinon';
+import Base from '../../../../resources/js/api/base';
+import Application from '../../../../resources/js/views/settings/Application';
+import Vuex from 'vuex';
+import env from '../../../../resources/js/env.js';
+import PermissionService from '../../../../resources/js/services/PermissionService';
+
+const localVue = createLocalVue();
+localVue.use(BootstrapVue);
+localVue.use(IconsPlugin);
+localVue.use(Vuex);
+
+const createContainer = (tag = 'div') => {
+  const container = document.createElement(tag);
+  document.body.appendChild(container);
+  return container;
+};
+
+describe('Application', function () {
+  beforeEach(function () {
+    PermissionService.setCurrentUser({ permissions: ['settings.viewAny', 'settings.update', 'settings.manage'] });
+    moxios.install();
+  });
+
+  afterEach(function () {
+    moxios.uninstall();
+  });
+
+  it('getSettings method called, when the view is mounted', function () {
+    const spy = sinon.spy(Application.methods, 'getSettings');
+
+    expect(spy.calledOnce).toBeFalsy();
+
+    mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    expect(spy.calledOnce).toBeTruthy();
+  });
+
+  it('getSettings method works properly with response data room_limit is -1', function (done) {
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: -1,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        return view.vm.$nextTick();
+      }).then(() => {
+        expect(view.vm.$data.settings.logo).toBe('test.svg');
+        expect(view.vm.$data.settings.room_limit).toBe(-1);
+        expect(view.vm.$data.settings.pagination_page_size).toBe(10);
+        expect(view.vm.$data.settings.own_rooms_pagination_page_size).toBe(5);
+        expect(view.vm.$data.roomLimitMode).toBe('unlimited');
+        done();
+      });
+    });
+  });
+
+  it('getSettings method works properly with response data room_limit is not -1', function (done) {
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: 32,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        return view.vm.$nextTick();
+      }).then(() => {
+        expect(view.vm.$data.settings.logo).toBe('test.svg');
+        expect(view.vm.$data.settings.room_limit).toBe(32);
+        expect(view.vm.$data.settings.pagination_page_size).toBe(10);
+        expect(view.vm.$data.settings.own_rooms_pagination_page_size).toBe(5);
+        expect(view.vm.$data.roomLimitMode).toBe('custom');
+        done();
+      });
+    });
+  });
+
+  it('updateSettings method works properly with response data room_limit is not -1', function (done) {
+    const actions = {
+      getSettings () {
+      }
+    };
+
+    const store = new Vuex.Store({
+      modules:
+        {
+          session: { actions, namespaced: true }
+        }
+    });
+
+    const view = mount(Application, {
+      localVue,
+      store,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: 32,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        // Save button, which triggers updateSettings method when clicked
+        const saveSettingsButton = view.find('#application-save-button');
+        expect(saveSettingsButton.exists()).toBeTruthy();
+        saveSettingsButton.trigger('click');
+        return view.vm.$nextTick();
+      }).then(() => {
+        moxios.wait(function () {
+          const request = moxios.requests.mostRecent();
+          request.respondWith({
+            status: 200,
+            response: {
+              data: {
+                logo: 'test1.svg',
+                room_limit: 33,
+                pagination_page_size: 11,
+                own_rooms_pagination_page_size: 6
+              }
+            }
+          }).then(() => {
+            return view.vm.$nextTick();
+          }).then(() => {
+            expect(view.vm.$data.settings.logo).toBe('test1.svg');
+            expect(view.vm.$data.settings.room_limit).toBe(33);
+            expect(view.vm.$data.settings.pagination_page_size).toBe(11);
+            expect(view.vm.$data.settings.own_rooms_pagination_page_size).toBe(6);
+            expect(view.vm.$data.roomLimitMode).toBe('custom');
+            expect(view.vm.$data.isBusy).toBeFalsy();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  it('updateSettings method works properly with response data room_limit is -1', function (done) {
+    const actions = {
+      getSettings () {
+      }
+    };
+
+    const store = new Vuex.Store({
+      modules:
+        {
+          session: { actions, namespaced: true }
+        }
+    });
+
+    const view = mount(Application, {
+      localVue,
+      store,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: 32,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        // Save button, which triggers updateSettings method when clicked
+        const saveSettingsButton = view.find('#application-save-button');
+        expect(saveSettingsButton.exists()).toBeTruthy();
+        saveSettingsButton.trigger('click');
+        return view.vm.$nextTick();
+      }).then(() => {
+        moxios.wait(function () {
+          const request = moxios.requests.mostRecent();
+          request.respondWith({
+            status: 200,
+            response: {
+              data: {
+                logo: 'test1.svg',
+                room_limit: -1,
+                pagination_page_size: 11,
+                own_rooms_pagination_page_size: 6
+              }
+            }
+          }).then(() => {
+            return view.vm.$nextTick();
+          }).then(() => {
+            expect(view.vm.$data.settings.logo).toBe('test1.svg');
+            expect(view.vm.$data.settings.room_limit).toBe(-1);
+            expect(view.vm.$data.settings.pagination_page_size).toBe(11);
+            expect(view.vm.$data.settings.own_rooms_pagination_page_size).toBe(6);
+            expect(view.vm.$data.roomLimitMode).toBe('unlimited');
+            expect(view.vm.$data.isBusy).toBeFalsy();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  it('roomLimitModeChanged method works properly', async function () {
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    // Room limit radio group value set to 'custom' by default
+    const roomLimitRadioGroup = view.find('#application-room-limit-radio-group');
+    expect(roomLimitRadioGroup.exists()).toBeTruthy();
+    expect(roomLimitRadioGroup.props('checked')).toBe('custom');
+
+    // Simulate radio group check to 'unlimited' option, set room limit value to '-1' and hide roomLimitInput
+    await view.vm.roomLimitModeChanged('unlimited');
+
+    expect(view.vm.$data.settings.room_limit).toBe(-1);
+
+    // Simulate radio group check back to 'custom' option
+    await view.vm.roomLimitModeChanged('custom');
+
+    expect(view.vm.$data.settings.room_limit).toBe(0);
+  });
+
+  it('getSettings error handler', function (done) {
+    const spy = sinon.spy();
+    sinon.stub(Base, 'error').callsFake(spy);
+
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 500,
+        response: {
+          message: 'Test'
+        }
+      }).then(() => {
+        view.vm.$nextTick();
+        sinon.assert.calledOnce(Base.error);
+        Base.error.restore();
+        done();
+      });
+    });
+  });
+
+  it('updateSettings error handler', function (done) {
+    const spy = sinon.spy();
+    sinon.stub(Base, 'error').callsFake(spy);
+
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: 32,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        // Save button, which triggers updateSettings method when clicked
+        const saveSettingsButton = view.find('#application-save-button');
+        expect(saveSettingsButton.exists()).toBeTruthy();
+        saveSettingsButton.trigger('click');
+        return view.vm.$nextTick();
+      }).then(() => {
+        moxios.wait(function () {
+          const request = moxios.requests.mostRecent();
+          request.respondWith({
+            status: 500,
+            response: {
+              message: 'Test'
+            }
+          }).then(() => {
+            view.vm.$nextTick();
+            sinon.assert.calledOnce(Base.error);
+            Base.error.restore();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  it('updateSettings error handler code 413', function (done) {
+    const spy = sinon.spy();
+    sinon.stub(Base, 'error').callsFake(spy);
+
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: 32,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        // Errors data 'logo_file' array is undefined at the beginning
+        expect(view.vm.$data.errors.logo_file).toBeUndefined();
+
+        // Save button, which triggers updateSettings method when clicked
+        const saveSettingsButton = view.find('#application-save-button');
+        expect(saveSettingsButton.exists()).toBeTruthy();
+        saveSettingsButton.trigger('click');
+        return view.vm.$nextTick();
+      }).then(() => {
+        moxios.wait(function () {
+          const request = moxios.requests.mostRecent();
+          request.respondWith({
+            status: env.HTTP_PAYLOAD_TOO_LARGE,
+            response: {
+              message: 'Test'
+            }
+          }).then(() => {
+            return view.vm.$nextTick();
+          }).then(() => {
+            sinon.assert.calledOnce(Base.error);
+            Base.error.restore();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  it('updateSettings error handler code 422', function (done) {
+    const spy = sinon.spy();
+    sinon.stub(Base, 'error').callsFake(spy);
+
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    moxios.wait(function () {
+      const request = moxios.requests.mostRecent();
+
+      request.respondWith({
+        status: 200,
+        response: {
+          data: {
+            logo: 'test.svg',
+            room_limit: -1,
+            pagination_page_size: 10,
+            own_rooms_pagination_page_size: 5
+          }
+        }
+      }).then(() => {
+        // Errors data logo file array is undefined at the beginning
+        expect(view.vm.$data.errors.pagination_page_size).toBeUndefined();
+
+        // Save button, which triggers updateSettings method when clicked
+        const saveSettingsButton = view.find('#application-save-button');
+        expect(saveSettingsButton.exists()).toBeTruthy();
+        saveSettingsButton.trigger('click');
+
+        moxios.wait(function () {
+          const request = moxios.requests.mostRecent();
+          request.respondWith({
+            status: env.HTTP_UNPROCESSABLE_ENTITY,
+            response: {
+              errors: {
+                logo: ['logo error'],
+                room_limit: ['room limit error'],
+                pagination_page_size: ['pagination page size error.'],
+                own_rooms_pagination_page_size: ['own rooms pagination page size error']
+              }
+            }
+          }).then(() => {
+            return view.vm.$nextTick();
+          }).then(() => {
+            // Errors data populated accordingly to error response for this code
+            expect(view.vm.$data.errors.logo.length).toBeGreaterThan(0);
+            expect(view.vm.$data.errors.room_limit.length).toBeGreaterThan(0);
+            expect(view.vm.$data.errors.pagination_page_size.length).toBeGreaterThan(0);
+            expect(view.vm.$data.errors.own_rooms_pagination_page_size.length).toBeGreaterThan(0);
+
+            Base.error.restore();
+            done();
+          });
+        });
+      });
+    });
+  });
+
+  it('uploadLogoFile watcher called base64Encode method when value of data props uploadLogoFile changed', async function () {
+    const view = mount(Application, {
+      localVue,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    // base64Encode method spy
+    const spy = sinon.spy(view.vm, 'base64Encode');
+
+    expect(spy.calledOnce).toBeFalsy();
+
+    expect(view.vm.$data.uploadLogoFile).toBe(null);
+    expect(view.vm.$data.uploadLogoFileSrc).toBe(null);
+
+    // Trigger watcher by setting to data props uploadLogoFile, empty array to avoid test warn
+    await view.setData({ uploadLogoFile: [] });
+
+    // baseEncode64 method should be called after value change of uploadLogoFileSrc
+    expect(spy.calledOnce).toBeTruthy();
+
+    expect(view.vm.$data.uploadFaviconFile).toBe(null);
+    expect(view.vm.$data.uploadFaviconFileSrc).toBe(null);
+
+    await view.setData({ uploadFaviconFile: [] });
+
+    expect(spy.calledTwice).toBeTruthy();
+  });
+
+  it('disable edit button if user does not have permission', function (done) {
+    PermissionService.setCurrentUser({ permissions: ['settings.viewAny', 'settings.manage'] });
+
+    const actions = {
+      getSettings () {
+      }
+    };
+
+    const store = new Vuex.Store({
+      modules:
+        {
+          session: { actions, namespaced: true }
+        }
+    });
+
+    const view = mount(Application, {
+      localVue,
+      store,
+      mocks: {
+        $t: key => key
+      },
+      attachTo: createContainer()
+    });
+
+    // Save button should be missing
+    const saveSettingsButton = view.find('#application-save-button');
+    expect(saveSettingsButton.exists()).toBeFalsy();
+    done();
+  });
+});
diff --git a/tests/Frontend/views/settings/roles/Index.spec.js b/tests/Frontend/views/settings/roles/Index.spec.js
index 8cbd60c48..0926785db 100644
--- a/tests/Frontend/views/settings/roles/Index.spec.js
+++ b/tests/Frontend/views/settings/roles/Index.spec.js
@@ -62,7 +62,7 @@ describe('RolesIndex', function () {
       }).then(() => {
         let html = view.findComponent(BTbody).findComponent(BTr).html();
         expect(html).toContain('Test');
-        expect(html).toContain('app.false');
+        expect(html).toContain('app.no');
         expect(html).toContain('1');
 
         view.vm.$root.$emit('bv::refresh::table', 'roles-table');
@@ -90,7 +90,7 @@ describe('RolesIndex', function () {
             html = view.findComponent(BTbody).findComponent(BTr).html();
 
             expect(html).toContain('app.roles.admin');
-            expect(html).toContain('app.true');
+            expect(html).toContain('app.yes');
             expect(html).toContain('2');
 
             view.destroy();