diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps-list/node-apps-list.component.ts b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps-list/node-apps-list.component.ts
index cf5651012..da0f210d0 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps-list/node-apps-list.component.ts
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps-list/node-apps-list.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, OnDestroy } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Observable, Subscription } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
 import { Application } from '../../../../../app.datatypes';
 import { AppsService } from '../../../../../services/apps.service';
@@ -16,7 +17,6 @@ import { SkysocksSettingsComponent } from '../node-apps/skysocks-settings/skysoc
 import { processServiceError } from 'src/app/utils/errors';
 import { OperationError } from 'src/app/utils/operation-error';
 import { SkysocksClientSettingsComponent } from '../node-apps/skysocks-client-settings/skysocks-client-settings.component';
-import { TranslateService } from '@ngx-translate/core';
 import { FilterProperties, FilterFieldTypes } from 'src/app/utils/filters';
 import { SortingColumn, SortingModes, DataSorter } from 'src/app/utils/lists/data-sorter';
 import { DataFilterer } from 'src/app/utils/lists/data-filterer';
@@ -70,6 +70,8 @@ export class NodeAppsListComponent implements OnDestroy {
   appsWithConfig = new Map<string, boolean>([
     ['skysocks', true],
     ['skysocks-client', true],
+    ['vpn-client', true],
+    ['vpn-server', true],
   ]);
 
   allApps: Application[];
@@ -411,9 +413,9 @@ export class NodeAppsListComponent implements OnDestroy {
    * Shows the appropriate modal window for configuring the app.
    */
   config(app: Application): void {
-    if (app.name === 'skysocks') {
+    if (app.name === 'skysocks' || app.name === 'vpn-server') {
       SkysocksSettingsComponent.openDialog(this.dialog, app);
-    } else if (app.name === 'skysocks-client') {
+    } else if (app.name === 'skysocks-client' || app.name === 'vpn-client') {
       SkysocksClientSettingsComponent.openDialog(this.dialog, app);
     } else {
       this.snackbarService.showError('apps.error');
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html
index 4227fff34..418bb940b 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html
@@ -1,7 +1,7 @@
-<app-dialog [headline]="'apps.skysocks-client-settings.change-note-dialog.title' | translate">
+<app-dialog [headline]="'apps.vpn-socks-client-settings.change-note-dialog.title' | translate">
   <form [formGroup]="form">
     <mat-form-field>
-      <input #firstInput [placeholder]="'apps.skysocks-client-settings.change-note-dialog.note' | translate" formControlName="note" maxlength="100" matInput>
+      <input #firstInput [placeholder]="'apps.vpn-socks-client-settings.change-note-dialog.note' | translate" formControlName="note" maxlength="100" matInput>
     </mat-form-field>
     <app-button class="float-right" color="primary" type="mat-raised-button" (action)="finish()">{{ 'common.save' | translate }}</app-button>
   </form>
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html
index 07f33236e..91baac3e1 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html
@@ -1,11 +1,38 @@
-<app-dialog [headline]="'apps.skysocks-client-settings.filter-dialog.title' | translate">
+<app-dialog [headline]="'apps.vpn-socks-client-settings.filter-dialog.title' | translate">
   <form [formGroup]="form">
+
+    <!-- Country. -->
+    <mat-form-field *ngIf="data.availableCountries.length > 0">
+      <mat-select formControlName="country" id="country" [placeholder]="'apps.vpn-socks-client-settings.filter-dialog.country' | translate">
+        <mat-option [value]="'-'">{{ 'apps.vpn-socks-client-settings.filter-dialog.any-country' | translate }}</mat-option>
+        <mat-option *ngFor="let country of data.availableCountries" [value]="country.toUpperCase()">
+          <div class="flag-container">
+            <div [style]="'background-image: url(\'assets/img/flags/' + country.toLocaleLowerCase() + '.png\');'"></div>
+          </div>
+          <ng-container *ngIf="completeCountriesList[country.toUpperCase()]">{{ completeCountriesList[country.toUpperCase()] }}</ng-container>
+          <ng-container *ngIf="!completeCountriesList[country.toUpperCase()]">{{ country.toUpperCase() }}</ng-container>
+        </mat-option>
+        <mat-select-trigger>
+          <ng-container *ngIf="form.get('country').value === '-'">
+            {{ 'apps.vpn-socks-client-settings.filter-dialog.any-country' | translate }}
+          </ng-container>
+          <ng-container *ngIf="form.get('country').value !== '-'">
+            <div class="flag-container">
+              <div [style]="'background-image: url(\'assets/img/flags/' + form.get('country').value.toLocaleLowerCase() + '.png\');'"></div>
+            </div>
+            <ng-container *ngIf="completeCountriesList[form.get('country').value]">{{ completeCountriesList[form.get('country').value] }}</ng-container>
+            <ng-container *ngIf="!completeCountriesList[form.get('country').value]">{{ form.get('country').value }}</ng-container>
+          </ng-container>
+        </mat-select-trigger>
+      </mat-select>
+    </mat-form-field>
+
     <!-- Location. -->
     <mat-form-field>
       <input
         formControlName="location-text"
         maxlength="100"
-        [placeholder]="'apps.skysocks-client-settings.filter-dialog.location' | translate"
+        [placeholder]="'apps.vpn-socks-client-settings.filter-dialog.location' | translate"
         matInput
       >
     </mat-form-field>
@@ -14,7 +41,7 @@
       <input
         formControlName="key-text"
         maxlength="66"
-        [placeholder]="'apps.skysocks-client-settings.filter-dialog.pub-key' | translate"
+        [placeholder]="'apps.vpn-socks-client-settings.filter-dialog.pub-key' | translate"
         matInput
       >
     </mat-form-field>
@@ -27,7 +54,7 @@
       color="primary"
       class="float-right"
     >
-      {{ 'apps.skysocks-client-settings.filter-dialog.apply' | translate }}
+      {{ 'apps.vpn-socks-client-settings.filter-dialog.apply' | translate }}
     </app-button>
   </form>
 </app-dialog>
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.ts b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.ts
index 1cce74de9..dc55381fb 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.ts
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.ts
@@ -3,18 +3,28 @@ import { FormBuilder, FormGroup } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef, MatDialog, MatDialogConfig } from '@angular/material/dialog';
 
 import { AppConfig } from 'src/app/app.config';
+import { countriesList } from 'src/app/utils/countries-list';
 
 /**
  * Filters the user selected using SkysocksClientFilterComponent. It is prepopulated with default
  * data which indicates that no filter has been selected.
  */
 export class SkysocksClientFilters {
+  country = '';
   location = '';
   key = '';
 }
 
 /**
- * Modal window for selecting the filters for the proxy list shown by
+ * Data for SkysocksClientFilterComponent.
+ */
+export interface FilterWindowData {
+  currentFilters: SkysocksClientFilters;
+  availableCountries: string[];
+}
+
+/**
+ * Modal window for selecting the filters for the elements list shown by
  * SkysocksClientSettingsComponent. If the user accepts the changes, the modal window is closed
  * and an instance of SkysocksClientFilters is returned in the "afterClosed" envent, with the
  * selected filters.
@@ -27,12 +37,14 @@ export class SkysocksClientFilters {
 export class SkysocksClientFilterComponent implements OnInit {
   form: FormGroup;
 
+  completeCountriesList = countriesList;
+
   /**
    * Opens the modal window. Please use this function instead of opening the window "by hand".
    */
-  public static openDialog(dialog: MatDialog, currentFilters: SkysocksClientFilters): MatDialogRef<SkysocksClientFilterComponent, any> {
+  public static openDialog(dialog: MatDialog, data: FilterWindowData): MatDialogRef<SkysocksClientFilterComponent, any> {
     const config = new MatDialogConfig();
-    config.data = currentFilters;
+    config.data = data;
     config.autoFocus = false;
     config.width = AppConfig.smallModalWidth;
 
@@ -40,15 +52,18 @@ export class SkysocksClientFilterComponent implements OnInit {
   }
 
   constructor(
-    @Inject(MAT_DIALOG_DATA) private data: SkysocksClientFilters,
+    @Inject(MAT_DIALOG_DATA) public data: FilterWindowData,
     private dialogRef: MatDialogRef<SkysocksClientFilterComponent>,
     private formBuilder: FormBuilder,
   ) { }
 
   ngOnInit() {
+    // The '-' value is used when the country field is empty, to be able to show the "any" label,
+    // due to the way in which Angular works.
     this.form = this.formBuilder.group({
-      'location-text': [this.data.location],
-      'key-text': [this.data.key],
+      'country': [this.data.currentFilters.country ? this.data.currentFilters.country : '-'],
+      'location-text': [this.data.currentFilters.location],
+      'key-text': [this.data.currentFilters.key],
     });
   }
 
@@ -56,6 +71,13 @@ export class SkysocksClientFilterComponent implements OnInit {
   apply() {
     const response = new SkysocksClientFilters();
 
+    // If the value of the country field is '-', it means that no country was selected.
+    let country = (this.form.get('country').value as string).trim();
+    if (country === '-') {
+      country = '';
+    }
+
+    response.country = country;
     response.location = (this.form.get('location-text').value as string).trim();
     response.key = (this.form.get('key-text').value as string).trim();
 
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.html b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.html
index b14f853ae..0f4b31cc2 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.html
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.html
@@ -1,24 +1,24 @@
-<app-dialog [headline]="'apps.skysocks-client-settings.title' | translate">
+<app-dialog [headline]="('apps.vpn-socks-client-settings.' + ( configuringVpn ? 'vpn-title' : 'socks-title')) | translate">
   <mat-tab-group>
     <!-- Form. -->
-    <mat-tab [label]="'apps.skysocks-client-settings.remote-visor-tab' | translate">
+    <mat-tab [label]="'apps.vpn-socks-client-settings.remote-visor-tab' | translate">
       <form [formGroup]="form">
         <mat-form-field>
           <input
             id="pk"
             formControlName="pk"
             maxlength="66"
-            [placeholder]="'apps.skysocks-client-settings.public-key' | translate"
+            [placeholder]="'apps.vpn-socks-client-settings.public-key' | translate"
             #firstInput
             matInput
           >
           <mat-error>
             <ng-container *ngIf="!this.form.get('pk').hasError('pattern');else hexError">
-              {{ 'apps.skysocks-client-settings.remote-key-length-error' | translate }}
+              {{ 'apps.vpn-socks-client-settings.remote-key-length-error' | translate }}
             </ng-container>
           </mat-error>
           <ng-template #hexError>
-            {{ 'apps.skysocks-client-settings.remote-key-chars-error' | translate }}
+            {{ 'apps.vpn-socks-client-settings.remote-key-chars-error' | translate }}
           </ng-template>
         </mat-form-field>
     
@@ -29,18 +29,18 @@
           color="primary"
           class="float-right"
         >
-          {{ 'apps.skysocks-client-settings.save' | translate }}
+          {{ 'apps.vpn-socks-client-settings.save' | translate }}
         </app-button>
       </form>
     </mat-tab>
     <!-- Discovery. -->
-    <mat-tab [label]="'apps.skysocks-client-settings.discovery-tab' | translate">
+    <mat-tab [label]="'apps.vpn-socks-client-settings.discovery-tab' | translate">
       <app-loading-indicator class="loading-indicator" [showWhite]="false" *ngIf="loadingFromDiscovery"></app-loading-indicator>
 
       <!-- No proxies in the discovery service msg. -->
       <div class="info-text" *ngIf="!loadingFromDiscovery && proxiesFromDiscovery.length === 0">
         <mat-icon [inline]="true">error</mat-icon>
-        {{ 'apps.skysocks-client-settings.no-elements' | translate }}
+        {{ 'apps.vpn-socks-client-settings.no-elements' | translate }}
       </div>
 
       <!-- Filters button. -->
@@ -56,14 +56,14 @@
             </div>
             <div>
               <div class="item" *ngIf="currentFiltersTexts.length === 0">
-                {{ 'apps.skysocks-client-settings.no-filter' | translate }}
+                {{ 'apps.vpn-socks-client-settings.no-filter' | translate }}
               </div>
               <div *ngFor="let filterTexts of currentFiltersTexts" class="item">
                 <span>{{ filterTexts[0] | translate }} </span>
                 <ng-container *ngIf="filterTexts[1]">{{ filterTexts[1] | translate }}</ng-container>
                 <ng-container *ngIf="filterTexts[2]">{{ filterTexts[2] }}</ng-container>
               </div>
-              <div class="item" class="blue-part">{{ 'apps.skysocks-client-settings.click-to-change' | translate }}</div>
+              <div class="item" class="blue-part">{{ 'apps.vpn-socks-client-settings.click-to-change' | translate }}</div>
             </div>
           </div>
         </button>
@@ -71,7 +71,7 @@
         <!-- No proxies with the current filters msg. -->
         <div class="info-text" *ngIf="filteredProxiesFromDiscovery.length === 0">
           <mat-icon [inline]="true">error</mat-icon>
-          {{ 'apps.skysocks-client-settings.no-elements-for-filters' | translate }}
+          {{ 'apps.vpn-socks-client-settings.no-elements-for-filters' | translate }}
         </div>
 
         <!-- Proxies list. -->
@@ -83,16 +83,23 @@
           >
             <div class="button-content">
               <div class="item">
-                <span>{{ 'apps.skysocks-client-settings.key' | translate }}</span>
+                <span>{{ 'apps.vpn-socks-client-settings.key' | translate }}</span>
                 <span>&nbsp;<ng-container *ngFor="let part of getHighlightedTextParts(proxy.pk, currentFilters.key); let i = index">
                   <span [ngClass]="{ highlighted: i % 2 !== 0 }">{{ part }}</span>
                 </ng-container></span>
               </div>
               <div class="item" *ngIf="proxy.location">
-                <span>{{ 'apps.skysocks-client-settings.location' | translate }}</span>
-                <span>&nbsp;<ng-container *ngFor="let part of getHighlightedTextParts(proxy.location, currentFilters.location); let i = index">
-                  <span [ngClass]="{ highlighted: i % 2 !== 0 }">{{ part }}</span>
-                </ng-container></span>
+                <span>{{ 'apps.vpn-socks-client-settings.location' | translate }}</span>
+                <span>&nbsp;
+                  <ng-container *ngIf="proxy.country">
+                    <div class="flag-container">
+                      <div [style]="'background-image: url(\'assets/img/flags/' + proxy.country.toLocaleLowerCase() + '.png\');'"></div>
+                    </div>
+                  </ng-container>
+                  <ng-container *ngFor="let part of getHighlightedTextParts(proxy.location, currentFilters.location); let i = index">
+                    <span [ngClass]="{ highlighted: i % 2 !== 0 }">{{ part }}</span>
+                  </ng-container>
+                </span>
               </div>
             </div>
           </button>
@@ -101,7 +108,7 @@
 
       <!-- Paginator. -->
       <div class="paginator" *ngIf="numberOfPages > 1">
-        <span>{{ 'apps.skysocks-client-settings.pagination-info' | translate:{currentElementsRange: currentRange, totalElements: filteredProxiesFromDiscovery.length} }}</span>
+        <span>{{ 'apps.vpn-socks-client-settings.pagination-info' | translate:{currentElementsRange: currentRange, totalElements: filteredProxiesFromDiscovery.length} }}</span>
 
         <button (click)="goToPreviousPage()" mat-icon-button class="hard-grey-button-background">
           <mat-icon>chevron_left</mat-icon>
@@ -112,12 +119,12 @@
       </div>
     </mat-tab>
     <!-- History. -->
-    <mat-tab [label]="'apps.skysocks-client-settings.history-tab' | translate">
+    <mat-tab [label]="'apps.vpn-socks-client-settings.history-tab' | translate">
       <!-- Msg shown if there is no history. -->
       <div *ngIf="history.length === 0">
         <div class="info-text">
           <mat-icon [inline]="true">error</mat-icon>
-          {{ 'apps.skysocks-client-settings.no-history' | translate:{number: maxHistoryElements} }}
+          {{ 'apps.vpn-socks-client-settings.no-history' | translate:{number: maxHistoryElements} }}
         </div>
       </div>
 
@@ -146,20 +153,20 @@
             <!-- Info. -->
             <div class="full-size-area">
               <div class="item">
-                <span>{{ 'apps.skysocks-client-settings.key' | translate }}</span>
+                <span>{{ 'apps.vpn-socks-client-settings.key' | translate }}</span>
                 <span> {{ entry.key }}</span>
               </div>
               <div class="item">
-                <span>{{ 'apps.skysocks-client-settings.note' | translate }}</span>
+                <span>{{ 'apps.vpn-socks-client-settings.note' | translate }}</span>
                 <ng-container *ngIf="entry.note">
                   <span> {{ entry.note }}</span>
                 </ng-container>
                 <ng-container *ngIf="!entry.note">
                   <ng-container *ngIf="entry.enteredManually">
-                    <span> {{ 'apps.skysocks-client-settings.note-entered-manually' | translate }}</span>
+                    <span> {{ 'apps.vpn-socks-client-settings.note-entered-manually' | translate }}</span>
                   </ng-container>
                   <ng-container *ngIf="!entry.enteredManually">
-                    <span> {{ 'apps.skysocks-client-settings.note-obtained' | translate }}</span>
+                    <span> {{ 'apps.vpn-socks-client-settings.note-obtained' | translate }}</span>
                     <ng-container *ngIf="entry.location">
                       <span> ({{ entry.location }})</span>
                     </ng-container>
@@ -172,7 +179,7 @@
               <button
                 (click)="$event.stopPropagation(); changeNote(entry)"
                 mat-icon-button
-                [matTooltip]="'apps.skysocks-client-settings.change-note' | translate"
+                [matTooltip]="'apps.vpn-socks-client-settings.change-note' | translate"
                 class="small-button hard-grey-button-background d-none d-md-inline"
               >
                 <mat-icon [inline]="true">edit</mat-icon>
@@ -180,7 +187,7 @@
               <button
                 (click)="$event.stopPropagation(); removeFromHistory(entry.key)"
                 mat-icon-button
-                [matTooltip]="'apps.skysocks-client-settings.remove-entry' | translate"
+                [matTooltip]="'apps.vpn-socks-client-settings.remove-entry' | translate"
                 class="small-button hard-grey-button-background d-none d-md-inline"
               >
                 <mat-icon [inline]="true">close</mat-icon>
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.ts b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.ts
index a61b69b4f..77efde916 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.ts
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-client-settings/skysocks-client-settings.component.ts
@@ -17,8 +17,10 @@ import { EditSkysocksClientNoteComponent } from './edit-skysocks-client-note/edi
 import { SelectableOption, SelectOptionComponent } from 'src/app/components/layout/select-option/select-option.component';
 import {
   SkysocksClientFilterComponent,
-  SkysocksClientFilters
+  SkysocksClientFilters,
+  FilterWindowData
 } from './skysocks-client-filter/skysocks-client-filter.component';
+import { countriesList } from 'src/app/utils/countries-list';
 
 /**
  * Data of the entries from the history.
@@ -44,7 +46,7 @@ export interface HistoryEntry {
 }
 
 /**
- * Modal window used for configuring the Skysocks-client app.
+ * Modal window used for configuring the Vpn-Client and Skysocks-Client apps.
  */
 @Component({
   selector: 'app-skysocks-client-settings',
@@ -52,8 +54,9 @@ export interface HistoryEntry {
   styleUrls: ['./skysocks-client-settings.component.scss']
 })
 export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
-  // Key for saving the history in persistent storage.
-  private readonly historyStorageKey = 'SkysocksClientHistory_';
+  // Keys for saving the history in persistent storage.
+  private readonly socksHistoryStorageKey = 'SkysocksClientHistory_';
+  private readonly vpnHistoryStorageKey = 'VpnClientHistory_';
   // Max elements the history can contain.
   readonly maxHistoryElements = 10;
   // How many elements to show per page on the proxy discovery tab.
@@ -65,22 +68,24 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
   // Entries to show on the history.
   history: HistoryEntry[];
 
-  // Proxies obtained from the discovery service.
+  // Proxies or vpn servers obtained from the discovery service.
   proxiesFromDiscovery: ProxyDiscoveryEntry[];
-  // Filtered proxies.
+  // List with the countries returned by the discovery service.
+  countriesFromDiscovery: Set<string> = new Set();
+  // Filtered proxies or vpn servers.
   filteredProxiesFromDiscovery: ProxyDiscoveryEntry[];
-  // Proxies to show in the currently selected page.
+  // Proxies or vpn servers to show in the currently selected page.
   proxiesFromDiscoveryToShow: ProxyDiscoveryEntry[];
-  // If the system is still getting the proxies from the discovery service.
+  // If the system is still getting the proxies or vpn servers from the discovery service.
   loadingFromDiscovery = true;
-  // How many pages with proxies there are.
+  // How many pages with proxies or vpn servers there are.
   numberOfPages = 1;
   // Current page.
   currentPage = 1;
   // Which elements are being shown in the currently selected page.
   currentRange = '1 - 1';
 
-  // Current filters for the poxies from the discovery service.
+  // Current filters for the list.
   currentFilters = new SkysocksClientFilters();
   // Texts to be shown on the filter button. Each element represents a filter and has 3
   // elements. The fist one is a translatable var which describes the filter, the second one has
@@ -88,6 +93,9 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
   // has the value selected by the user if the translate pipe is not needed,
   currentFiltersTexts: string[][] = [];
 
+  // True if configuring Vpn-Client, false if configuring Skysocks-Client.
+  configuringVpn = false;
+
   // If the operation in currently being made.
   private working = false;
   private operationSubscription: Subscription;
@@ -113,18 +121,30 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
     private snackbarService: SnackbarService,
     private dialog: MatDialog,
     private proxyDiscoveryService: ProxyDiscoveryService,
-  ) { }
+  ) {
+    if (data.name.toLocaleLowerCase().indexOf('vpn') !== -1) {
+      this.configuringVpn = true;
+    }
+  }
 
   ngOnInit() {
-    // Get the proxies from the discovery service.
-    this.discoverySubscription = this.proxyDiscoveryService.getProxies().subscribe(response => {
+    // Get the proxies or vpn servers from the discovery service.
+    this.discoverySubscription = this.proxyDiscoveryService.getServices(!this.configuringVpn).subscribe(response => {
       this.proxiesFromDiscovery = response;
+
+      // Save all countries.
+      this.proxiesFromDiscovery.forEach(entry => {
+        if (entry.country) {
+          this.countriesFromDiscovery.add(entry.country.toUpperCase());
+        }
+      });
+
       this.filterProxies();
       this.loadingFromDiscovery = false;
     });
 
     // Get the history.
-    const retrievedHistory = localStorage.getItem(this.historyStorageKey);
+    const retrievedHistory = localStorage.getItem(this.configuringVpn ? this.vpnHistoryStorageKey : this.socksHistoryStorageKey);
     if (retrievedHistory) {
       this.history = JSON.parse(retrievedHistory);
     } else {
@@ -162,7 +182,15 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
 
   // Opens the modal window for selecting the filters.
   changeFilters() {
-    SkysocksClientFilterComponent.openDialog(this.dialog, this.currentFilters).afterClosed().subscribe(response => {
+    const countries: string[] = [];
+    this.countriesFromDiscovery.forEach(v => countries.push(v));
+
+    const data: FilterWindowData = {
+      currentFilters: this.currentFilters,
+      availableCountries: countries,
+    };
+
+    SkysocksClientFilterComponent.openDialog(this.dialog, data).afterClosed().subscribe(response => {
       if (response) {
         this.currentFilters = response;
         this.filterProxies();
@@ -215,13 +243,19 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
     return response;
   }
 
-  // Filters the proxies obtained from the discovery service using the filters selected by
+  // Filters the elements obtained from the discovery service using the filters selected by
   // the user.
   private filterProxies() {
-    if (!this.currentFilters.location && !this.currentFilters.key) {
+    if (!this.currentFilters.country && !this.currentFilters.location && !this.currentFilters.key) {
       this.filteredProxiesFromDiscovery = this.proxiesFromDiscovery;
     } else {
       this.filteredProxiesFromDiscovery = this.proxiesFromDiscovery.filter(proxy => {
+        if (
+          this.currentFilters.country &&
+          (!proxy.country || !proxy.country.toUpperCase().includes(this.currentFilters.country.toUpperCase()))
+        ) {
+          return false;
+        }
         if (this.currentFilters.location && !proxy.location.toLowerCase().includes(this.currentFilters.location.toLowerCase())) {
           return false;
         }
@@ -241,11 +275,19 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
   private updateCurrentFilters() {
     this.currentFiltersTexts = [];
 
+    if (this.currentFilters.country) {
+      const country =
+        countriesList[this.currentFilters.country.toUpperCase()] ?
+        countriesList[this.currentFilters.country.toUpperCase()] :
+        this.currentFilters.country.toUpperCase();
+
+      this.currentFiltersTexts.push(['apps.vpn-socks-client-settings.filter-dialog.country', '', country]);
+    }
     if (this.currentFilters.location) {
-      this.currentFiltersTexts.push(['apps.skysocks-client-settings.filter-dialog.location', '', this.currentFilters.location]);
+      this.currentFiltersTexts.push(['apps.vpn-socks-client-settings.filter-dialog.location', '', this.currentFilters.location]);
     }
     if (this.currentFilters.key) {
-      this.currentFiltersTexts.push(['apps.skysocks-client-settings.filter-dialog.pub-key', '', this.currentFilters.key]);
+      this.currentFiltersTexts.push(['apps.vpn-socks-client-settings.filter-dialog.pub-key', '', this.currentFilters.key]);
     }
   }
 
@@ -299,15 +341,15 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
     const options: SelectableOption[] = [
       {
         icon: 'chevron_right',
-        label: 'apps.skysocks-client-settings.use',
+        label: 'apps.vpn-socks-client-settings.use',
       },
       {
         icon: 'edit',
-        label: 'apps.skysocks-client-settings.change-note',
+        label: 'apps.vpn-socks-client-settings.change-note',
       },
       {
         icon: 'close',
-        label: 'apps.skysocks-client-settings.remove-entry',
+        label: 'apps.vpn-socks-client-settings.remove-entry',
       }
     ];
 
@@ -325,13 +367,13 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
   // Removes an element from the history.
   removeFromHistory(key: String) {
     // Ask for confirmation.
-    const confirmationMsg = 'apps.skysocks-client-settings.remove-from-history-confirmation';
+    const confirmationMsg = 'apps.vpn-socks-client-settings.remove-from-history-confirmation';
     const confirmationDialog = GeneralUtils.createConfirmationDialog(this.dialog, confirmationMsg);
 
     confirmationDialog.componentInstance.operationAccepted.subscribe(() => {
       this.history = this.history.filter(value => value.key !== key);
       const dataToSave = JSON.stringify(this.history);
-      localStorage.setItem(this.historyStorageKey, dataToSave);
+      localStorage.setItem(this.configuringVpn ? this.vpnHistoryStorageKey : this.socksHistoryStorageKey, dataToSave);
 
       confirmationDialog.close();
     });
@@ -353,12 +395,12 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
 
         // Save the changes..
         const dataToSave = JSON.stringify(this.history);
-        localStorage.setItem(this.historyStorageKey, dataToSave);
+        localStorage.setItem(this.configuringVpn ? this.vpnHistoryStorageKey : this.socksHistoryStorageKey, dataToSave);
 
         if (!response) {
-          this.snackbarService.showWarning('apps.skysocks-client-settings.default-note-warning');
+          this.snackbarService.showWarning('apps.vpn-socks-client-settings.default-note-warning');
         } else {
-          this.snackbarService.showDone('apps.skysocks-client-settings.changes-made');
+          this.snackbarService.showDone('apps.vpn-socks-client-settings.changes-made');
         }
       }
     });
@@ -366,11 +408,11 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
 
   /**
    * Saves the settings. If no argument is provided, the function will take the public key
-   * from the form and fill the rest of the data. The arguments are mainly for proxies selected
+   * from the form and fill the rest of the data. The arguments are mainly for elements selected
    * from the discovery list and entries from the history.
    * @param publicKey New public key to be used.
    * @param enteredManually If the user manually entered the data using the form.
-   * @param location Location of the proxy server.
+   * @param location Location of the server.
    * @param note Personal note for the history.
    */
   saveChanges(publicKey: string = null, enteredManually: boolean = null, location: string = null, note: string = null) {
@@ -384,7 +426,7 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
     publicKey = publicKey ? publicKey : this.form.get('pk').value;
 
     // Ask for confirmation.
-    const confirmationMsg = 'apps.skysocks-client-settings.change-key-confirmation';
+    const confirmationMsg = 'apps.vpn-socks-client-settings.change-key-confirmation';
     const confirmationDialog = GeneralUtils.createConfirmationDialog(this.dialog, confirmationMsg);
     confirmationDialog.componentInstance.operationAccepted.subscribe(() => {
       confirmationDialog.close();
@@ -432,11 +474,11 @@ export class SkysocksClientSettingsComponent implements OnInit, OnDestroy {
     }
 
     const dataToSave = JSON.stringify(this.history);
-    localStorage.setItem(this.historyStorageKey, dataToSave);
+    localStorage.setItem(this.configuringVpn ? this.vpnHistoryStorageKey : this.socksHistoryStorageKey, dataToSave);
 
     // Close the window.
     NodeComponent.refreshCurrentDisplayedData();
-    this.snackbarService.showDone('apps.skysocks-client-settings.changes-made');
+    this.snackbarService.showDone('apps.vpn-socks-client-settings.changes-made');
     this.dialogRef.close();
   }
 
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html
index 91786bb3d..86cabc28b 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html
@@ -1,4 +1,6 @@
-<app-dialog [headline]="'apps.skysocks-settings.title' | translate">
+<app-dialog
+  [headline]="('apps.vpn-socks-server-settings.' + ( configuringVpn ? 'vpn-title' : 'socks-title')) | translate"
+>
   <form [formGroup]="form">
     <mat-form-field>
       <input
@@ -6,7 +8,7 @@
         type="password"
         formControlName="password"
         maxlength="100"
-        [placeholder]="'apps.skysocks-settings.new-password' | translate"
+        [placeholder]="'apps.vpn-socks-server-settings.new-password' | translate"
         #firstInput
         matInput
       >
@@ -17,12 +19,12 @@
         type="password"
         formControlName="passwordConfirmation"
         maxlength="100"
-        [placeholder]="'apps.skysocks-settings.repeat-password' | translate"
+        [placeholder]="'apps.vpn-socks-server-settings.repeat-password' | translate"
         #firstInput
         matInput
       >
       <mat-error>
-        {{ 'apps.skysocks-settings.passwords-not-match' | translate }}
+        {{ 'apps.vpn-socks-server-settings.passwords-not-match' | translate }}
       </mat-error>
     </mat-form-field>
 
@@ -33,7 +35,7 @@
       color="primary"
       class="float-right"
     >
-      {{ 'apps.skysocks-settings.save' | translate }}
+      {{ 'apps.vpn-socks-server-settings.save' | translate }}
     </app-button>
   </form>
 </app-dialog>
diff --git a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.ts b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.ts
index 79302de53..8a37d15b6 100644
--- a/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.ts
+++ b/static/skywire-manager-src/src/app/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.ts
@@ -14,7 +14,7 @@ import GeneralUtils from 'src/app/utils/generalUtils';
 import { Application } from 'src/app/app.datatypes';
 
 /**
- * Modal window used for configuring the Skysocks app.
+ * Modal window used for configuring the Skysocks and Vpn-Server apps.
  */
 @Component({
   selector: 'app-skysocks-settings',
@@ -26,6 +26,9 @@ export class SkysocksSettingsComponent implements OnInit, OnDestroy {
   @ViewChild('firstInput') firstInput: ElementRef;
   form: FormGroup;
 
+  // True if configuring Vpn-Server, false if configuring Skysocks.
+  configuringVpn = false;
+
   private operationSubscription: Subscription;
   private formSubscription: Subscription;
 
@@ -48,7 +51,11 @@ export class SkysocksSettingsComponent implements OnInit, OnDestroy {
     private dialogRef: MatDialogRef<SkysocksSettingsComponent>,
     private snackbarService: SnackbarService,
     private dialog: MatDialog,
-  ) { }
+  ) {
+    if (data.name.toLocaleLowerCase().indexOf('vpn') !== -1) {
+      this.configuringVpn = true;
+    }
+  }
 
   ngOnInit() {
     this.form = this.formBuilder.group({
@@ -81,7 +88,7 @@ export class SkysocksSettingsComponent implements OnInit, OnDestroy {
     // Ask for confirmation.
 
     const confirmationMsg = this.form.get('password').value ?
-      'apps.skysocks-settings.change-passowrd-confirmation' : 'apps.skysocks-settings.remove-passowrd-confirmation';
+      'apps.vpn-socks-server-settings.change-passowrd-confirmation' : 'apps.vpn-socks-server-settings.remove-passowrd-confirmation';
 
     const confirmationDialog = GeneralUtils.createConfirmationDialog(this.dialog, confirmationMsg);
     confirmationDialog.componentInstance.operationAccepted.subscribe(() => {
@@ -106,7 +113,7 @@ export class SkysocksSettingsComponent implements OnInit, OnDestroy {
 
   private onSuccess() {
     NodeComponent.refreshCurrentDisplayedData();
-    this.snackbarService.showDone('apps.skysocks-settings.changes-made');
+    this.snackbarService.showDone('apps.vpn-socks-server-settings.changes-made');
     this.dialogRef.close();
   }
 
diff --git a/static/skywire-manager-src/src/app/services/proxy-discovery.service.ts b/static/skywire-manager-src/src/app/services/proxy-discovery.service.ts
index 5deac4ed5..cec6ca8ea 100644
--- a/static/skywire-manager-src/src/app/services/proxy-discovery.service.ts
+++ b/static/skywire-manager-src/src/app/services/proxy-discovery.service.ts
@@ -5,6 +5,7 @@ import { retryWhen, delay, map } from 'rxjs/operators';
 
 import { ProxyDiscoveryEntry } from '../app.datatypes';
 import { environment } from 'src/environments/environment';
+import { countriesList } from '../utils/countries-list';
 
 /**
  * Allows to get the proxies registered in the proxy discovery service.
@@ -17,19 +18,21 @@ export class ProxyDiscoveryService {
    * URL of the proxy discovery service. While in dev mode the url is managed by the
    * dev server proxy.
    */
-  private readonly discoveryServiceUrl = 'https://service.discovery.skycoin.com/api/services?type=proxy';
+  private readonly discoveryServiceUrl = 'https://service.discovery.skycoin.com/api/services?type=';
 
   constructor(
     private http: HttpClient,
   ) {}
 
   /**
-   * Get the proxies registered in the proxy discovery service.
+   * Get the proxies or vpn servers registered in the discovery service.
+   * @param getProxies If true, the function will get the proxies. If false, the function
+   * will get vpn servers.
    */
-  getProxies(): Observable<ProxyDiscoveryEntry[]> {
+  getServices(getProxies: boolean): Observable<ProxyDiscoveryEntry[]> {
     const response: ProxyDiscoveryEntry[] = [];
 
-    return this.http.get(this.discoveryServiceUrl).pipe(
+    return this.http.get(this.discoveryServiceUrl + (getProxies ? 'proxy' : 'vpn')).pipe(
       // In case of error, retry.
       retryWhen(errors => errors.pipe(delay(4000))),
       map((result: any[]) => {
@@ -48,18 +51,20 @@ export class ProxyDiscoveryService {
 
             // Process the location.
             if (proxy.geo) {
-              if (proxy.geo.region) {
-                currentEntry.region = proxy.geo.region;
-                currentEntry.location += currentEntry.region;
+              if (proxy.geo.country) {
+                currentEntry.country = proxy.geo.country;
+                currentEntry.location += countriesList[proxy.geo.country.toUpperCase()] ?
+                  countriesList[proxy.geo.country.toUpperCase()] :
+                  proxy.geo.country;
               }
 
               if (proxy.geo.region && proxy.geo.country) {
                 currentEntry.location += ', ';
               }
 
-              if (proxy.geo.country) {
-                currentEntry.country = proxy.geo.country;
-                currentEntry.location += currentEntry.country;
+              if (proxy.geo.region) {
+                currentEntry.region = proxy.geo.region;
+                currentEntry.location += currentEntry.region;
               }
             }
 
diff --git a/static/skywire-manager-src/src/app/utils/countries-list.ts b/static/skywire-manager-src/src/app/utils/countries-list.ts
new file mode 100644
index 000000000..42a333a66
--- /dev/null
+++ b/static/skywire-manager-src/src/app/utils/countries-list.ts
@@ -0,0 +1,250 @@
+/**
+ * Contains the iso codes of the countries as properties, with their names as value.
+ */
+export const countriesList = {
+    'AF': 'Afghanistan',
+    'AX': 'Åland Islands',
+    'AL': 'Albania',
+    'DZ': 'Algeria',
+    'AS': 'American Samoa',
+    'AD': 'AndorrA',
+    'AO': 'Angola',
+    'AI': 'Anguilla',
+    'AQ': 'Antarctica',
+    'AG': 'Antigua and Barbuda',
+    'AR': 'Argentina',
+    'AM': 'Armenia',
+    'AW': 'Aruba',
+    'AU': 'Australia',
+    'AT': 'Austria',
+    'AZ': 'Azerbaijan',
+    'BS': 'Bahamas',
+    'BH': 'Bahrain',
+    'BD': 'Bangladesh',
+    'BB': 'Barbados',
+    'BY': 'Belarus',
+    'BE': 'Belgium',
+    'BZ': 'Belize',
+    'BJ': 'Benin',
+    'BM': 'Bermuda',
+    'BT': 'Bhutan',
+    'BO': 'Bolivia',
+    'BA': 'Bosnia and Herzegovina',
+    'BW': 'Botswana',
+    'BV': 'Bouvet Island',
+    'BR': 'Brazil',
+    'IO': 'British Indian Ocean Territory',
+    'BN': 'Brunei Darussalam',
+    'BG': 'Bulgaria',
+    'BF': 'Burkina Faso',
+    'BI': 'Burundi',
+    'KH': 'Cambodia',
+    'CM': 'Cameroon',
+    'CA': 'Canada',
+    'CV': 'Cape Verde',
+    'KY': 'Cayman Islands',
+    'CF': 'Central African Republic',
+    'TD': 'Chad',
+    'CL': 'Chile',
+    'CN': 'China',
+    'CX': 'Christmas Island',
+    'CC': 'Cocos (Keeling) Islands',
+    'CO': 'Colombia',
+    'KM': 'Comoros',
+    'CG': 'Congo',
+    'CD': 'Congo, Democratic Republic',
+    'CK': 'Cook Islands',
+    'CR': 'Costa Rica',
+    'CI': 'Cote D\'Ivoire',
+    'HR': 'Croatia',
+    'CU': 'Cuba',
+    'CY': 'Cyprus',
+    'CZ': 'Czech Republic',
+    'DK': 'Denmark',
+    'DJ': 'Djibouti',
+    'DM': 'Dominica',
+    'DO': 'Dominican Republic',
+    'EC': 'Ecuador',
+    'EG': 'Egypt',
+    'SV': 'El Salvador',
+    'GQ': 'Equatorial Guinea',
+    'ER': 'Eritrea',
+    'EE': 'Estonia',
+    'ET': 'Ethiopia',
+    'FK': 'Falkland Islands (Malvinas)',
+    'FO': 'Faroe Islands',
+    'FJ': 'Fiji',
+    'FI': 'Finland',
+    'FR': 'France',
+    'GF': 'French Guiana',
+    'PF': 'French Polynesia',
+    'TF': 'French Southern Territories',
+    'GA': 'Gabon',
+    'GM': 'Gambia',
+    'GE': 'Georgia',
+    'DE': 'Germany',
+    'GH': 'Ghana',
+    'GI': 'Gibraltar',
+    'GR': 'Greece',
+    'GL': 'Greenland',
+    'GD': 'Grenada',
+    'GP': 'Guadeloupe',
+    'GU': 'Guam',
+    'GT': 'Guatemala',
+    'GG': 'Guernsey',
+    'GN': 'Guinea',
+    'GW': 'Guinea-Bissau',
+    'GY': 'Guyana',
+    'HT': 'Haiti',
+    'HM': 'Heard Island and Mcdonald Islands',
+    'VA': 'Holy See (Vatican City State)',
+    'HN': 'Honduras',
+    'HK': 'Hong Kong',
+    'HU': 'Hungary',
+    'IS': 'Iceland',
+    'IN': 'India',
+    'ID': 'Indonesia',
+    'IR': 'Iran',
+    'IQ': 'Iraq',
+    'IE': 'Ireland',
+    'IM': 'Isle of Man',
+    'IL': 'Israel',
+    'IT': 'Italy',
+    'JM': 'Jamaica',
+    'JP': 'Japan',
+    'JE': 'Jersey',
+    'JO': 'Jordan',
+    'KZ': 'Kazakhstan',
+    'KE': 'Kenya',
+    'KI': 'Kiribati',
+    'KP': 'Korea (North)',
+    'KR': 'Korea (South)',
+    'XK': 'Kosovo',
+    'KW': 'Kuwait',
+    'KG': 'Kyrgyzstan',
+    'LA': 'Laos',
+    'LV': 'Latvia',
+    'LB': 'Lebanon',
+    'LS': 'Lesotho',
+    'LR': 'Liberia',
+    'LY': 'Libyan Arab Jamahiriya',
+    'LI': 'Liechtenstein',
+    'LT': 'Lithuania',
+    'LU': 'Luxembourg',
+    'MO': 'Macao',
+    'MK': 'Macedonia',
+    'MG': 'Madagascar',
+    'MW': 'Malawi',
+    'MY': 'Malaysia',
+    'MV': 'Maldives',
+    'ML': 'Mali',
+    'MT': 'Malta',
+    'MH': 'Marshall Islands',
+    'MQ': 'Martinique',
+    'MR': 'Mauritania',
+    'MU': 'Mauritius',
+    'YT': 'Mayotte',
+    'MX': 'Mexico',
+    'FM': 'Micronesia',
+    'MD': 'Moldova',
+    'MC': 'Monaco',
+    'MN': 'Mongolia',
+    'MS': 'Montserrat',
+    'MA': 'Morocco',
+    'MZ': 'Mozambique',
+    'MM': 'Myanmar',
+    'NA': 'Namibia',
+    'NR': 'Nauru',
+    'NP': 'Nepal',
+    'NL': 'Netherlands',
+    'AN': 'Netherlands Antilles',
+    'NC': 'New Caledonia',
+    'NZ': 'New Zealand',
+    'NI': 'Nicaragua',
+    'NE': 'Niger',
+    'NG': 'Nigeria',
+    'NU': 'Niue',
+    'NF': 'Norfolk Island',
+    'MP': 'Northern Mariana Islands',
+    'NO': 'Norway',
+    'OM': 'Oman',
+    'PK': 'Pakistan',
+    'PW': 'Palau',
+    'PS': 'Palestinian Territory, Occupied',
+    'PA': 'Panama',
+    'PG': 'Papua New Guinea',
+    'PY': 'Paraguay',
+    'PE': 'Peru',
+    'PH': 'Philippines',
+    'PN': 'Pitcairn',
+    'PL': 'Poland',
+    'PT': 'Portugal',
+    'PR': 'Puerto Rico',
+    'QA': 'Qatar',
+    'RE': 'Reunion',
+    'RO': 'Romania',
+    'RU': 'Russian Federation',
+    'RW': 'Rwanda',
+    'SH': 'Saint Helena',
+    'KN': 'Saint Kitts and Nevis',
+    'LC': 'Saint Lucia',
+    'PM': 'Saint Pierre and Miquelon',
+    'VC': 'Saint Vincent and the Grenadines',
+    'WS': 'Samoa',
+    'SM': 'San Marino',
+    'ST': 'Sao Tome and Principe',
+    'SA': 'Saudi Arabia',
+    'SN': 'Senegal',
+    'RS': 'Serbia',
+    'ME': 'Montenegro',
+    'SC': 'Seychelles',
+    'SL': 'Sierra Leone',
+    'SG': 'Singapore',
+    'SK': 'Slovakia',
+    'SI': 'Slovenia',
+    'SB': 'Solomon Islands',
+    'SO': 'Somalia',
+    'ZA': 'South Africa',
+    'GS': 'South Georgia and the South Sandwich Islands',
+    'ES': 'Spain',
+    'LK': 'Sri Lanka',
+    'SD': 'Sudan',
+    'SR': 'Suriname',
+    'SJ': 'Svalbard and Jan Mayen',
+    'SZ': 'Swaziland',
+    'SE': 'Sweden',
+    'CH': 'Switzerland',
+    'SY': 'Syrian Arab Republic',
+    'TW': 'Taiwan, Province of China',
+    'TJ': 'Tajikistan',
+    'TZ': 'Tanzania',
+    'TH': 'Thailand',
+    'TL': 'Timor-Leste',
+    'TG': 'Togo',
+    'TK': 'Tokelau',
+    'TO': 'Tonga',
+    'TT': 'Trinidad and Tobago',
+    'TN': 'Tunisia',
+    'TR': 'Turkey',
+    'TM': 'Turkmenistan',
+    'TC': 'Turks and Caicos Islands',
+    'TV': 'Tuvalu',
+    'UG': 'Uganda',
+    'UA': 'Ukraine',
+    'AE': 'United Arab Emirates',
+    'GB': 'United Kingdom',
+    'US': 'United States',
+    'UM': 'United States Minor Outlying Islands',
+    'UY': 'Uruguay',
+    'UZ': 'Uzbekistan',
+    'VU': 'Vanuatu',
+    'VE': 'Venezuela',
+    'VN': 'Viet Nam',
+    'VG': 'Virgin Islands, British',
+    'VI': 'Virgin Islands, U.S.',
+    'WF': 'Wallis and Futuna',
+    'EH': 'Western Sahara',
+    'YE': 'Yemen',
+    'ZM': 'Zambia',
+    'ZW': 'Zimbabwe'
+};
diff --git a/static/skywire-manager-src/src/assets/i18n/en.json b/static/skywire-manager-src/src/assets/i18n/en.json
index c8b5f4c82..910794fc0 100644
--- a/static/skywire-manager-src/src/assets/i18n/en.json
+++ b/static/skywire-manager-src/src/assets/i18n/en.json
@@ -308,8 +308,9 @@
         }
       }
     },
-    "skysocks-settings": {
-      "title": "Skysocks Settings",
+    "vpn-socks-server-settings": {
+      "socks-title": "Skysocks Settings",
+      "vpn-title": "VPN-Server Settings",
       "new-password": "New password (Leave empty to remove the password)",
       "repeat-password": "Repeat password",
       "passwords-not-match": "Passwords do not match.",
@@ -318,9 +319,10 @@
       "change-passowrd-confirmation": "Are you sure you want to change the password?",
       "changes-made": "The changes have been made."
     },
-    "skysocks-client-settings": {
-      "title": "Skysocks-Client Settings",
-      "discovery-tab": "Search visor",
+    "vpn-socks-client-settings": {
+      "socks-title": "Skysocks-Client Settings",
+      "vpn-title": "VPN-Client Settings",
+      "discovery-tab": "Search",
       "remote-visor-tab": "Enter manually",
       "history-tab": "History",
       "use": "Use this data",
@@ -356,6 +358,8 @@
 
       "filter-dialog": {
         "title": "Filters",
+        "country": "The country must be",
+        "any-country": "Any",
         "location": "The location must contain",
         "pub-key": "The public key must contain",
         "apply": "Apply"
diff --git a/static/skywire-manager-src/src/assets/i18n/es.json b/static/skywire-manager-src/src/assets/i18n/es.json
index c76f3c395..f41f14914 100644
--- a/static/skywire-manager-src/src/assets/i18n/es.json
+++ b/static/skywire-manager-src/src/assets/i18n/es.json
@@ -305,8 +305,9 @@
         }
       }
     },
-    "skysocks-settings": {
-      "title": "Configuración de Skysocks",
+    "vpn-socks-server-settings": {
+      "socks-title": "Configuración de Skysocks",
+      "vpn-title": "Configuración de VPN-Server",
       "new-password": "Nueva contraseña (dejar en blanco para eliminar la contraseña)",
       "repeat-password": "Repita la contraseña",
       "passwords-not-match": "Las contraseñas no coinciden.",
@@ -315,9 +316,10 @@
       "change-passowrd-confirmation": "¿Seguro que desea cambiar la contraseña?",
       "changes-made": "Los cambios han sido realizados."
     },
-    "skysocks-client-settings": {
-      "title": "Configuración de Skysocks-Client",
-      "discovery-tab": "Buscar visor",
+    "vpn-socks-client-settings": {
+      "socks-title": "Configuración de Skysocks-Client",
+      "vpn-title": "Configuración de VPN-Client",
+      "discovery-tab": "Buscar",
       "remote-visor-tab": "Introducir manualmente",
       "history-tab": "Historial",
       "use": "Usar estos datos",
@@ -353,6 +355,8 @@
 
       "filter-dialog": {
         "title": "Filtros",
+        "country": "El país debe ser",
+        "any-country": "Cualquiera",
         "location": "La ubicación debe contener",
         "pub-key": "La llave pública debe contener",
         "apply": "Aplicar"
diff --git a/static/skywire-manager-src/src/assets/i18n/es_base.json b/static/skywire-manager-src/src/assets/i18n/es_base.json
index bede8845f..6e8520de5 100644
--- a/static/skywire-manager-src/src/assets/i18n/es_base.json
+++ b/static/skywire-manager-src/src/assets/i18n/es_base.json
@@ -305,8 +305,9 @@
         }
       }
     },
-    "skysocks-settings": {
-      "title": "Skysocks Settings",
+    "vpn-socks-server-settings": {
+      "socks-title": "Skysocks Settings",
+      "vpn-title": "VPN-Server Settings",
       "new-password": "New password (Leave empty to remove the password)",
       "repeat-password": "Repeat password",
       "passwords-not-match": "Passwords do not match.",
@@ -315,9 +316,10 @@
       "change-passowrd-confirmation": "Are you sure you want to change the password?",
       "changes-made": "The changes have been made."
     },
-    "skysocks-client-settings": {
-      "title": "Skysocks-Client Settings",
-      "discovery-tab": "Search visor",
+    "vpn-socks-client-settings": {
+      "socks-title": "Skysocks-Client Settings",
+      "vpn-title": "VPN-Client Settings",
+      "discovery-tab": "Search",
       "remote-visor-tab": "Enter manually",
       "history-tab": "History",
       "use": "Use this data",
@@ -353,6 +355,8 @@
 
       "filter-dialog": {
         "title": "Filters",
+        "country": "The country must be",
+        "any-country": "Any",
         "location": "The location must contain",
         "pub-key": "The public key must contain",
         "apply": "Apply"
diff --git a/static/skywire-manager-src/src/assets/img/flags/ab.png b/static/skywire-manager-src/src/assets/img/flags/ab.png
new file mode 100644
index 000000000..290d11c3e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ab.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ad.png b/static/skywire-manager-src/src/assets/img/flags/ad.png
new file mode 100644
index 000000000..625ca84f9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ad.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ae.png b/static/skywire-manager-src/src/assets/img/flags/ae.png
new file mode 100644
index 000000000..ef3a1ecfc
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ae.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/af.png b/static/skywire-manager-src/src/assets/img/flags/af.png
new file mode 100644
index 000000000..a4742e299
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/af.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ag.png b/static/skywire-manager-src/src/assets/img/flags/ag.png
new file mode 100644
index 000000000..556d5504d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ag.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ai.png b/static/skywire-manager-src/src/assets/img/flags/ai.png
new file mode 100644
index 000000000..74ed29d92
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ai.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/al.png b/static/skywire-manager-src/src/assets/img/flags/al.png
new file mode 100644
index 000000000..92354cb6e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/al.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/am.png b/static/skywire-manager-src/src/assets/img/flags/am.png
new file mode 100644
index 000000000..344a2a86c
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/am.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/an.png b/static/skywire-manager-src/src/assets/img/flags/an.png
new file mode 100644
index 000000000..633e4b89f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/an.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ao.png b/static/skywire-manager-src/src/assets/img/flags/ao.png
new file mode 100644
index 000000000..bcbd1d6d4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ao.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/aq.png b/static/skywire-manager-src/src/assets/img/flags/aq.png
new file mode 100644
index 000000000..17ea9fc79
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/aq.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ar.png b/static/skywire-manager-src/src/assets/img/flags/ar.png
new file mode 100644
index 000000000..e5ef8f1fc
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ar.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/as.png b/static/skywire-manager-src/src/assets/img/flags/as.png
new file mode 100644
index 000000000..32f30e4ce
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/as.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/at.png b/static/skywire-manager-src/src/assets/img/flags/at.png
new file mode 100644
index 000000000..0f15f34f2
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/at.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/au.png b/static/skywire-manager-src/src/assets/img/flags/au.png
new file mode 100644
index 000000000..a01389a74
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/au.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/aw.png b/static/skywire-manager-src/src/assets/img/flags/aw.png
new file mode 100644
index 000000000..a3579c2d6
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/aw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ax.png b/static/skywire-manager-src/src/assets/img/flags/ax.png
new file mode 100644
index 000000000..1eea80a7b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ax.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/az.png b/static/skywire-manager-src/src/assets/img/flags/az.png
new file mode 100644
index 000000000..4ee9fe5ce
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/az.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ba.png b/static/skywire-manager-src/src/assets/img/flags/ba.png
new file mode 100644
index 000000000..c77499249
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ba.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bb.png b/static/skywire-manager-src/src/assets/img/flags/bb.png
new file mode 100644
index 000000000..0df19c71d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bb.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bd.png b/static/skywire-manager-src/src/assets/img/flags/bd.png
new file mode 100644
index 000000000..076a8bf87
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bd.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/be.png b/static/skywire-manager-src/src/assets/img/flags/be.png
new file mode 100644
index 000000000..d86ebc800
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/be.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bf.png b/static/skywire-manager-src/src/assets/img/flags/bf.png
new file mode 100644
index 000000000..ab5ce8fe1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bg.png b/static/skywire-manager-src/src/assets/img/flags/bg.png
new file mode 100644
index 000000000..0469f0607
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bh.png b/static/skywire-manager-src/src/assets/img/flags/bh.png
new file mode 100644
index 000000000..ea8ce6876
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bi.png b/static/skywire-manager-src/src/assets/img/flags/bi.png
new file mode 100644
index 000000000..5cc2e30cf
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bi.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bj.png b/static/skywire-manager-src/src/assets/img/flags/bj.png
new file mode 100644
index 000000000..1cc8b458a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bj.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bl.png b/static/skywire-manager-src/src/assets/img/flags/bl.png
new file mode 100644
index 000000000..d8462087e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bm.png b/static/skywire-manager-src/src/assets/img/flags/bm.png
new file mode 100644
index 000000000..c0c7aead8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bn.png b/static/skywire-manager-src/src/assets/img/flags/bn.png
new file mode 100644
index 000000000..8fb09849e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bo.png b/static/skywire-manager-src/src/assets/img/flags/bo.png
new file mode 100644
index 000000000..ce7ba522a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bo.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bq.png b/static/skywire-manager-src/src/assets/img/flags/bq.png
new file mode 100644
index 000000000..c1a13b265
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bq.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/br.png b/static/skywire-manager-src/src/assets/img/flags/br.png
new file mode 100644
index 000000000..9b1a5538b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/br.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bs.png b/static/skywire-manager-src/src/assets/img/flags/bs.png
new file mode 100644
index 000000000..639fa6cfa
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bs.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bt.png b/static/skywire-manager-src/src/assets/img/flags/bt.png
new file mode 100644
index 000000000..1d512dfff
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bv.png b/static/skywire-manager-src/src/assets/img/flags/bv.png
new file mode 100644
index 000000000..160b6b5b7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bw.png b/static/skywire-manager-src/src/assets/img/flags/bw.png
new file mode 100644
index 000000000..fcb103941
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/by.png b/static/skywire-manager-src/src/assets/img/flags/by.png
new file mode 100644
index 000000000..504774ec1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/by.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/bz.png b/static/skywire-manager-src/src/assets/img/flags/bz.png
new file mode 100644
index 000000000..be63ee1c6
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/bz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ca.png b/static/skywire-manager-src/src/assets/img/flags/ca.png
new file mode 100644
index 000000000..1f204193a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ca.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cc.png b/static/skywire-manager-src/src/assets/img/flags/cc.png
new file mode 100644
index 000000000..aed3d3b4e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cd.png b/static/skywire-manager-src/src/assets/img/flags/cd.png
new file mode 100644
index 000000000..5e4894248
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cd.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cf.png b/static/skywire-manager-src/src/assets/img/flags/cf.png
new file mode 100644
index 000000000..da687bdce
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cg.png b/static/skywire-manager-src/src/assets/img/flags/cg.png
new file mode 100644
index 000000000..a859792ef
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ch.png b/static/skywire-manager-src/src/assets/img/flags/ch.png
new file mode 100644
index 000000000..242ec01aa
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ch.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ci.png b/static/skywire-manager-src/src/assets/img/flags/ci.png
new file mode 100644
index 000000000..3f2c62eb4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ci.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ck.png b/static/skywire-manager-src/src/assets/img/flags/ck.png
new file mode 100644
index 000000000..746d3d6f7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ck.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cl.png b/static/skywire-manager-src/src/assets/img/flags/cl.png
new file mode 100644
index 000000000..29c6d61bd
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cm.png b/static/skywire-manager-src/src/assets/img/flags/cm.png
new file mode 100644
index 000000000..f65c5bd5a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cn.png b/static/skywire-manager-src/src/assets/img/flags/cn.png
new file mode 100644
index 000000000..891441462
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/co.png b/static/skywire-manager-src/src/assets/img/flags/co.png
new file mode 100644
index 000000000..a118ff4a1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/co.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cr.png b/static/skywire-manager-src/src/assets/img/flags/cr.png
new file mode 100644
index 000000000..c7a373179
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cs.png b/static/skywire-manager-src/src/assets/img/flags/cs.png
new file mode 100644
index 000000000..8254790ca
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cs.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cu.png b/static/skywire-manager-src/src/assets/img/flags/cu.png
new file mode 100644
index 000000000..083f1d611
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cv.png b/static/skywire-manager-src/src/assets/img/flags/cv.png
new file mode 100644
index 000000000..a63f7eaf6
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cw.png b/static/skywire-manager-src/src/assets/img/flags/cw.png
new file mode 100644
index 000000000..41b22479f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cx.png b/static/skywire-manager-src/src/assets/img/flags/cx.png
new file mode 100644
index 000000000..48e31adbf
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cx.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cy.png b/static/skywire-manager-src/src/assets/img/flags/cy.png
new file mode 100644
index 000000000..5b1ad6c07
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cy.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/cz.png b/static/skywire-manager-src/src/assets/img/flags/cz.png
new file mode 100644
index 000000000..c8403dd21
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/cz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/de.png b/static/skywire-manager-src/src/assets/img/flags/de.png
new file mode 100644
index 000000000..ac4a97736
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/de.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/dj.png b/static/skywire-manager-src/src/assets/img/flags/dj.png
new file mode 100644
index 000000000..582af364f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/dj.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/dk.png b/static/skywire-manager-src/src/assets/img/flags/dk.png
new file mode 100644
index 000000000..e2993d3c5
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/dk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/dm.png b/static/skywire-manager-src/src/assets/img/flags/dm.png
new file mode 100644
index 000000000..5fbffcba3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/dm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/do.png b/static/skywire-manager-src/src/assets/img/flags/do.png
new file mode 100644
index 000000000..5a04932d8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/do.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/dz.png b/static/skywire-manager-src/src/assets/img/flags/dz.png
new file mode 100644
index 000000000..335c2391d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/dz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ec.png b/static/skywire-manager-src/src/assets/img/flags/ec.png
new file mode 100644
index 000000000..0caa0b1e7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ec.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ee.png b/static/skywire-manager-src/src/assets/img/flags/ee.png
new file mode 100644
index 000000000..0c82efb7d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ee.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/eg.png b/static/skywire-manager-src/src/assets/img/flags/eg.png
new file mode 100644
index 000000000..8a3f7a10b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/eg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/eh.png b/static/skywire-manager-src/src/assets/img/flags/eh.png
new file mode 100644
index 000000000..90a1195b4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/eh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/england.png b/static/skywire-manager-src/src/assets/img/flags/england.png
new file mode 100644
index 000000000..3a7311d56
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/england.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/er.png b/static/skywire-manager-src/src/assets/img/flags/er.png
new file mode 100644
index 000000000..13065ae99
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/er.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/es.png b/static/skywire-manager-src/src/assets/img/flags/es.png
new file mode 100644
index 000000000..c2de2d711
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/es.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/et.png b/static/skywire-manager-src/src/assets/img/flags/et.png
new file mode 100644
index 000000000..2e893fa05
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/et.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fam.png b/static/skywire-manager-src/src/assets/img/flags/fam.png
new file mode 100644
index 000000000..cf50c759e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fam.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fi.png b/static/skywire-manager-src/src/assets/img/flags/fi.png
new file mode 100644
index 000000000..14ec091b8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fi.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fj.png b/static/skywire-manager-src/src/assets/img/flags/fj.png
new file mode 100644
index 000000000..cee998892
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fj.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fk.png b/static/skywire-manager-src/src/assets/img/flags/fk.png
new file mode 100644
index 000000000..ceaeb27de
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fm.png b/static/skywire-manager-src/src/assets/img/flags/fm.png
new file mode 100644
index 000000000..066bb2473
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fo.png b/static/skywire-manager-src/src/assets/img/flags/fo.png
new file mode 100644
index 000000000..cbceb809e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fo.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/fr.png b/static/skywire-manager-src/src/assets/img/flags/fr.png
new file mode 100644
index 000000000..8332c4ec2
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/fr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ga.png b/static/skywire-manager-src/src/assets/img/flags/ga.png
new file mode 100644
index 000000000..0e0d43436
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ga.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gb.png b/static/skywire-manager-src/src/assets/img/flags/gb.png
new file mode 100644
index 000000000..ff701e19f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gb.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gd.png b/static/skywire-manager-src/src/assets/img/flags/gd.png
new file mode 100644
index 000000000..9ab57f548
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gd.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ge.png b/static/skywire-manager-src/src/assets/img/flags/ge.png
new file mode 100644
index 000000000..728d97078
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ge.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gf.png b/static/skywire-manager-src/src/assets/img/flags/gf.png
new file mode 100644
index 000000000..8332c4ec2
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gg.png b/static/skywire-manager-src/src/assets/img/flags/gg.png
new file mode 100644
index 000000000..5031c0f67
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gh.png b/static/skywire-manager-src/src/assets/img/flags/gh.png
new file mode 100644
index 000000000..4e2f89659
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gi.png b/static/skywire-manager-src/src/assets/img/flags/gi.png
new file mode 100644
index 000000000..e76797f62
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gi.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gl.png b/static/skywire-manager-src/src/assets/img/flags/gl.png
new file mode 100644
index 000000000..ef12a73bf
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gm.png b/static/skywire-manager-src/src/assets/img/flags/gm.png
new file mode 100644
index 000000000..0720b667a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gn.png b/static/skywire-manager-src/src/assets/img/flags/gn.png
new file mode 100644
index 000000000..ea660b01f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gp.png b/static/skywire-manager-src/src/assets/img/flags/gp.png
new file mode 100644
index 000000000..dbb086d00
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gp.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gq.png b/static/skywire-manager-src/src/assets/img/flags/gq.png
new file mode 100644
index 000000000..ebe20a28d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gq.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gr.png b/static/skywire-manager-src/src/assets/img/flags/gr.png
new file mode 100644
index 000000000..8651ade7c
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gs.png b/static/skywire-manager-src/src/assets/img/flags/gs.png
new file mode 100644
index 000000000..7ef0bf598
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gs.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gt.png b/static/skywire-manager-src/src/assets/img/flags/gt.png
new file mode 100644
index 000000000..c43a70d36
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gu.png b/static/skywire-manager-src/src/assets/img/flags/gu.png
new file mode 100644
index 000000000..92f37c053
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gw.png b/static/skywire-manager-src/src/assets/img/flags/gw.png
new file mode 100644
index 000000000..b37bcf06b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/gy.png b/static/skywire-manager-src/src/assets/img/flags/gy.png
new file mode 100644
index 000000000..22cbe2f59
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/gy.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/hk.png b/static/skywire-manager-src/src/assets/img/flags/hk.png
new file mode 100644
index 000000000..d5c380ca9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/hk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/hm.png b/static/skywire-manager-src/src/assets/img/flags/hm.png
new file mode 100644
index 000000000..a01389a74
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/hm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/hn.png b/static/skywire-manager-src/src/assets/img/flags/hn.png
new file mode 100644
index 000000000..96f838859
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/hn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/hr.png b/static/skywire-manager-src/src/assets/img/flags/hr.png
new file mode 100644
index 000000000..696b51546
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/hr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ht.png b/static/skywire-manager-src/src/assets/img/flags/ht.png
new file mode 100644
index 000000000..416052af7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ht.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/hu.png b/static/skywire-manager-src/src/assets/img/flags/hu.png
new file mode 100644
index 000000000..7baafe44d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/hu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/id.png b/static/skywire-manager-src/src/assets/img/flags/id.png
new file mode 100644
index 000000000..c6bc0fafa
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/id.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ie.png b/static/skywire-manager-src/src/assets/img/flags/ie.png
new file mode 100644
index 000000000..26baa31e1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ie.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/il.png b/static/skywire-manager-src/src/assets/img/flags/il.png
new file mode 100644
index 000000000..2ca772d0b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/il.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/im.png b/static/skywire-manager-src/src/assets/img/flags/im.png
new file mode 100644
index 000000000..bb6801370
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/im.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/in.png b/static/skywire-manager-src/src/assets/img/flags/in.png
new file mode 100644
index 000000000..e4d7e81a9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/in.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/io.png b/static/skywire-manager-src/src/assets/img/flags/io.png
new file mode 100644
index 000000000..3e74b6a31
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/io.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/iq.png b/static/skywire-manager-src/src/assets/img/flags/iq.png
new file mode 100644
index 000000000..878a35140
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/iq.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ir.png b/static/skywire-manager-src/src/assets/img/flags/ir.png
new file mode 100644
index 000000000..c5fd136ae
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ir.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/is.png b/static/skywire-manager-src/src/assets/img/flags/is.png
new file mode 100644
index 000000000..b8f6d0f06
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/is.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/it.png b/static/skywire-manager-src/src/assets/img/flags/it.png
new file mode 100644
index 000000000..89692f74f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/it.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/je.png b/static/skywire-manager-src/src/assets/img/flags/je.png
new file mode 100644
index 000000000..bef6b9c09
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/je.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/jm.png b/static/skywire-manager-src/src/assets/img/flags/jm.png
new file mode 100644
index 000000000..7be119e03
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/jm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/jo.png b/static/skywire-manager-src/src/assets/img/flags/jo.png
new file mode 100644
index 000000000..11bd4972b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/jo.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/jp.png b/static/skywire-manager-src/src/assets/img/flags/jp.png
new file mode 100644
index 000000000..325fbad3f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/jp.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ke.png b/static/skywire-manager-src/src/assets/img/flags/ke.png
new file mode 100644
index 000000000..51879adf1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ke.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kg.png b/static/skywire-manager-src/src/assets/img/flags/kg.png
new file mode 100644
index 000000000..0a818f67e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kh.png b/static/skywire-manager-src/src/assets/img/flags/kh.png
new file mode 100644
index 000000000..30f6bb1b9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ki.png b/static/skywire-manager-src/src/assets/img/flags/ki.png
new file mode 100644
index 000000000..2dcce4b33
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ki.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/km.png b/static/skywire-manager-src/src/assets/img/flags/km.png
new file mode 100644
index 000000000..812b2f56c
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/km.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kn.png b/static/skywire-manager-src/src/assets/img/flags/kn.png
new file mode 100644
index 000000000..febd5b486
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kp.png b/static/skywire-manager-src/src/assets/img/flags/kp.png
new file mode 100644
index 000000000..d3d509aa8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kp.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kr.png b/static/skywire-manager-src/src/assets/img/flags/kr.png
new file mode 100644
index 000000000..9c0a78eb9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kw.png b/static/skywire-manager-src/src/assets/img/flags/kw.png
new file mode 100644
index 000000000..96546da32
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ky.png b/static/skywire-manager-src/src/assets/img/flags/ky.png
new file mode 100644
index 000000000..15c5f8e47
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ky.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/kz.png b/static/skywire-manager-src/src/assets/img/flags/kz.png
new file mode 100644
index 000000000..45a8c8874
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/kz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/la.png b/static/skywire-manager-src/src/assets/img/flags/la.png
new file mode 100644
index 000000000..e28acd018
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/la.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lb.png b/static/skywire-manager-src/src/assets/img/flags/lb.png
new file mode 100644
index 000000000..d0d452bf8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lb.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lc.png b/static/skywire-manager-src/src/assets/img/flags/lc.png
new file mode 100644
index 000000000..a47d06554
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/li.png b/static/skywire-manager-src/src/assets/img/flags/li.png
new file mode 100644
index 000000000..6469909c0
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/li.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lk.png b/static/skywire-manager-src/src/assets/img/flags/lk.png
new file mode 100644
index 000000000..088aad6db
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lr.png b/static/skywire-manager-src/src/assets/img/flags/lr.png
new file mode 100644
index 000000000..89a5bc7e7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ls.png b/static/skywire-manager-src/src/assets/img/flags/ls.png
new file mode 100644
index 000000000..33fdef101
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ls.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lt.png b/static/skywire-manager-src/src/assets/img/flags/lt.png
new file mode 100644
index 000000000..c8ef0da09
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lu.png b/static/skywire-manager-src/src/assets/img/flags/lu.png
new file mode 100644
index 000000000..4cabba98a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/lv.png b/static/skywire-manager-src/src/assets/img/flags/lv.png
new file mode 100644
index 000000000..49b699810
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/lv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ly.png b/static/skywire-manager-src/src/assets/img/flags/ly.png
new file mode 100644
index 000000000..b163a9f8a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ly.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ma.png b/static/skywire-manager-src/src/assets/img/flags/ma.png
new file mode 100644
index 000000000..f38677028
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ma.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mc.png b/static/skywire-manager-src/src/assets/img/flags/mc.png
new file mode 100644
index 000000000..1aa830f12
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/md.png b/static/skywire-manager-src/src/assets/img/flags/md.png
new file mode 100644
index 000000000..4e92c1890
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/md.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/me.png b/static/skywire-manager-src/src/assets/img/flags/me.png
new file mode 100644
index 000000000..ac7253558
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/me.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mf.png b/static/skywire-manager-src/src/assets/img/flags/mf.png
new file mode 100644
index 000000000..56f4754d0
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mg.png b/static/skywire-manager-src/src/assets/img/flags/mg.png
new file mode 100644
index 000000000..d2715b3d0
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mh.png b/static/skywire-manager-src/src/assets/img/flags/mh.png
new file mode 100644
index 000000000..fb523a8c3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mk.png b/static/skywire-manager-src/src/assets/img/flags/mk.png
new file mode 100644
index 000000000..db173aaff
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ml.png b/static/skywire-manager-src/src/assets/img/flags/ml.png
new file mode 100644
index 000000000..2cec8ba44
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ml.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mm.png b/static/skywire-manager-src/src/assets/img/flags/mm.png
new file mode 100644
index 000000000..f464f67ff
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mn.png b/static/skywire-manager-src/src/assets/img/flags/mn.png
new file mode 100644
index 000000000..9396355db
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mo.png b/static/skywire-manager-src/src/assets/img/flags/mo.png
new file mode 100644
index 000000000..deb801dda
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mo.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mp.png b/static/skywire-manager-src/src/assets/img/flags/mp.png
new file mode 100644
index 000000000..298d588b1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mp.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mq.png b/static/skywire-manager-src/src/assets/img/flags/mq.png
new file mode 100644
index 000000000..010143b38
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mq.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mr.png b/static/skywire-manager-src/src/assets/img/flags/mr.png
new file mode 100644
index 000000000..319546b10
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ms.png b/static/skywire-manager-src/src/assets/img/flags/ms.png
new file mode 100644
index 000000000..d4cbb433d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ms.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mt.png b/static/skywire-manager-src/src/assets/img/flags/mt.png
new file mode 100644
index 000000000..00af94871
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mu.png b/static/skywire-manager-src/src/assets/img/flags/mu.png
new file mode 100644
index 000000000..b7fdce1bd
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mv.png b/static/skywire-manager-src/src/assets/img/flags/mv.png
new file mode 100644
index 000000000..5073d9ec4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mw.png b/static/skywire-manager-src/src/assets/img/flags/mw.png
new file mode 100644
index 000000000..13886e9f8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mx.png b/static/skywire-manager-src/src/assets/img/flags/mx.png
new file mode 100644
index 000000000..5bc58ab3e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mx.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/my.png b/static/skywire-manager-src/src/assets/img/flags/my.png
new file mode 100644
index 000000000..9034cbab2
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/my.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/mz.png b/static/skywire-manager-src/src/assets/img/flags/mz.png
new file mode 100644
index 000000000..76405e063
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/mz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/na.png b/static/skywire-manager-src/src/assets/img/flags/na.png
new file mode 100644
index 000000000..63358c67d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/na.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nc.png b/static/skywire-manager-src/src/assets/img/flags/nc.png
new file mode 100644
index 000000000..2cad28378
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ne.png b/static/skywire-manager-src/src/assets/img/flags/ne.png
new file mode 100644
index 000000000..d85f424f3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ne.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nf.png b/static/skywire-manager-src/src/assets/img/flags/nf.png
new file mode 100644
index 000000000..f9bcdda12
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ng.png b/static/skywire-manager-src/src/assets/img/flags/ng.png
new file mode 100644
index 000000000..3eea2e020
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ng.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ni.png b/static/skywire-manager-src/src/assets/img/flags/ni.png
new file mode 100644
index 000000000..3969aaaae
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ni.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nl.png b/static/skywire-manager-src/src/assets/img/flags/nl.png
new file mode 100644
index 000000000..fe44791e3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/no.png b/static/skywire-manager-src/src/assets/img/flags/no.png
new file mode 100644
index 000000000..160b6b5b7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/no.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/np.png b/static/skywire-manager-src/src/assets/img/flags/np.png
new file mode 100644
index 000000000..aeb058b7e
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/np.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nr.png b/static/skywire-manager-src/src/assets/img/flags/nr.png
new file mode 100644
index 000000000..705fc337c
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nu.png b/static/skywire-manager-src/src/assets/img/flags/nu.png
new file mode 100644
index 000000000..c3ce4aedd
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/nz.png b/static/skywire-manager-src/src/assets/img/flags/nz.png
new file mode 100644
index 000000000..10d6306d1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/nz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/om.png b/static/skywire-manager-src/src/assets/img/flags/om.png
new file mode 100644
index 000000000..2ffba7e8c
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/om.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pa.png b/static/skywire-manager-src/src/assets/img/flags/pa.png
new file mode 100644
index 000000000..9b2ee9a78
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pa.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pe.png b/static/skywire-manager-src/src/assets/img/flags/pe.png
new file mode 100644
index 000000000..62a04977f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pe.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pf.png b/static/skywire-manager-src/src/assets/img/flags/pf.png
new file mode 100644
index 000000000..771a0f652
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pg.png b/static/skywire-manager-src/src/assets/img/flags/pg.png
new file mode 100644
index 000000000..10d623349
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ph.png b/static/skywire-manager-src/src/assets/img/flags/ph.png
new file mode 100644
index 000000000..b89e15935
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ph.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pk.png b/static/skywire-manager-src/src/assets/img/flags/pk.png
new file mode 100644
index 000000000..e9df70ca4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pl.png b/static/skywire-manager-src/src/assets/img/flags/pl.png
new file mode 100644
index 000000000..d413d010b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pm.png b/static/skywire-manager-src/src/assets/img/flags/pm.png
new file mode 100644
index 000000000..ba91d2c7a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pn.png b/static/skywire-manager-src/src/assets/img/flags/pn.png
new file mode 100644
index 000000000..aa9344f57
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pr.png b/static/skywire-manager-src/src/assets/img/flags/pr.png
new file mode 100644
index 000000000..82d9130da
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ps.png b/static/skywire-manager-src/src/assets/img/flags/ps.png
new file mode 100644
index 000000000..f5f547762
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ps.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pt.png b/static/skywire-manager-src/src/assets/img/flags/pt.png
new file mode 100644
index 000000000..ece798015
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/pw.png b/static/skywire-manager-src/src/assets/img/flags/pw.png
new file mode 100644
index 000000000..6178b254a
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/pw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/py.png b/static/skywire-manager-src/src/assets/img/flags/py.png
new file mode 100644
index 000000000..cb8723c06
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/py.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/qa.png b/static/skywire-manager-src/src/assets/img/flags/qa.png
new file mode 100644
index 000000000..ed4c621fa
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/qa.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/re.png b/static/skywire-manager-src/src/assets/img/flags/re.png
new file mode 100644
index 000000000..8332c4ec2
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/re.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ro.png b/static/skywire-manager-src/src/assets/img/flags/ro.png
new file mode 100644
index 000000000..57e74a651
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ro.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/rs.png b/static/skywire-manager-src/src/assets/img/flags/rs.png
new file mode 100644
index 000000000..9439a5b60
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/rs.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ru.png b/static/skywire-manager-src/src/assets/img/flags/ru.png
new file mode 100644
index 000000000..47da4214f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ru.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/rw.png b/static/skywire-manager-src/src/assets/img/flags/rw.png
new file mode 100644
index 000000000..535649178
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/rw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sa.png b/static/skywire-manager-src/src/assets/img/flags/sa.png
new file mode 100644
index 000000000..b4641c7e8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sa.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sb.png b/static/skywire-manager-src/src/assets/img/flags/sb.png
new file mode 100644
index 000000000..a9937ccf0
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sb.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sc.png b/static/skywire-manager-src/src/assets/img/flags/sc.png
new file mode 100644
index 000000000..39ee37184
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/scotland.png b/static/skywire-manager-src/src/assets/img/flags/scotland.png
new file mode 100644
index 000000000..a0e57b412
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/scotland.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sd.png b/static/skywire-manager-src/src/assets/img/flags/sd.png
new file mode 100644
index 000000000..eaab69eb7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sd.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/se.png b/static/skywire-manager-src/src/assets/img/flags/se.png
new file mode 100644
index 000000000..1994653da
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/se.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sg.png b/static/skywire-manager-src/src/assets/img/flags/sg.png
new file mode 100644
index 000000000..dd34d6121
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sh.png b/static/skywire-manager-src/src/assets/img/flags/sh.png
new file mode 100644
index 000000000..4b1d2a291
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sh.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/si.png b/static/skywire-manager-src/src/assets/img/flags/si.png
new file mode 100644
index 000000000..bb1476ff5
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/si.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sj.png b/static/skywire-manager-src/src/assets/img/flags/sj.png
new file mode 100644
index 000000000..160b6b5b7
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sj.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sk.png b/static/skywire-manager-src/src/assets/img/flags/sk.png
new file mode 100644
index 000000000..7ccbc8274
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sl.png b/static/skywire-manager-src/src/assets/img/flags/sl.png
new file mode 100644
index 000000000..12d812d29
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sm.png b/static/skywire-manager-src/src/assets/img/flags/sm.png
new file mode 100644
index 000000000..3df2fdcf8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sn.png b/static/skywire-manager-src/src/assets/img/flags/sn.png
new file mode 100644
index 000000000..eabb71db4
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/so.png b/static/skywire-manager-src/src/assets/img/flags/so.png
new file mode 100644
index 000000000..4a1ea4b29
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/so.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/southossetia.png b/static/skywire-manager-src/src/assets/img/flags/southossetia.png
new file mode 100644
index 000000000..2c0bc3e1b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/southossetia.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sr.png b/static/skywire-manager-src/src/assets/img/flags/sr.png
new file mode 100644
index 000000000..5eff9271d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ss.png b/static/skywire-manager-src/src/assets/img/flags/ss.png
new file mode 100644
index 000000000..e07ec4df0
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ss.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/st.png b/static/skywire-manager-src/src/assets/img/flags/st.png
new file mode 100644
index 000000000..2978557b1
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/st.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sv.png b/static/skywire-manager-src/src/assets/img/flags/sv.png
new file mode 100644
index 000000000..24987990b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sx.png b/static/skywire-manager-src/src/assets/img/flags/sx.png
new file mode 100644
index 000000000..5682b4c77
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sx.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sy.png b/static/skywire-manager-src/src/assets/img/flags/sy.png
new file mode 100644
index 000000000..f5ce30dcb
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sy.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/sz.png b/static/skywire-manager-src/src/assets/img/flags/sz.png
new file mode 100644
index 000000000..914ee861d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/sz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tc.png b/static/skywire-manager-src/src/assets/img/flags/tc.png
new file mode 100644
index 000000000..8fc1156be
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/td.png b/static/skywire-manager-src/src/assets/img/flags/td.png
new file mode 100644
index 000000000..667f21fd9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/td.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tf.png b/static/skywire-manager-src/src/assets/img/flags/tf.png
new file mode 100644
index 000000000..80529a436
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tg.png b/static/skywire-manager-src/src/assets/img/flags/tg.png
new file mode 100644
index 000000000..3aa00ad4d
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/th.png b/static/skywire-manager-src/src/assets/img/flags/th.png
new file mode 100644
index 000000000..dd8ba9171
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/th.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tj.png b/static/skywire-manager-src/src/assets/img/flags/tj.png
new file mode 100644
index 000000000..617bf6455
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tj.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tk.png b/static/skywire-manager-src/src/assets/img/flags/tk.png
new file mode 100644
index 000000000..67b8c8cb5
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tl.png b/static/skywire-manager-src/src/assets/img/flags/tl.png
new file mode 100644
index 000000000..77da181e9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tl.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tm.png b/static/skywire-manager-src/src/assets/img/flags/tm.png
new file mode 100644
index 000000000..828020ecd
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tn.png b/static/skywire-manager-src/src/assets/img/flags/tn.png
new file mode 100644
index 000000000..183cdd3dc
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/to.png b/static/skywire-manager-src/src/assets/img/flags/to.png
new file mode 100644
index 000000000..f89b8ba75
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/to.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tr.png b/static/skywire-manager-src/src/assets/img/flags/tr.png
new file mode 100644
index 000000000..be32f77e9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tr.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tt.png b/static/skywire-manager-src/src/assets/img/flags/tt.png
new file mode 100644
index 000000000..2a11c1e20
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tv.png b/static/skywire-manager-src/src/assets/img/flags/tv.png
new file mode 100644
index 000000000..28274c5fb
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tv.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tw.png b/static/skywire-manager-src/src/assets/img/flags/tw.png
new file mode 100644
index 000000000..f31c654c9
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/tz.png b/static/skywire-manager-src/src/assets/img/flags/tz.png
new file mode 100644
index 000000000..c00ff7961
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/tz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ua.png b/static/skywire-manager-src/src/assets/img/flags/ua.png
new file mode 100644
index 000000000..09563a219
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ua.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ug.png b/static/skywire-manager-src/src/assets/img/flags/ug.png
new file mode 100644
index 000000000..33f4affad
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ug.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/um.png b/static/skywire-manager-src/src/assets/img/flags/um.png
new file mode 100644
index 000000000..c1dd9654b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/um.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/unitednations.png b/static/skywire-manager-src/src/assets/img/flags/unitednations.png
new file mode 100644
index 000000000..08b3dd14f
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/unitednations.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/unknown.png b/static/skywire-manager-src/src/assets/img/flags/unknown.png
new file mode 100644
index 000000000..28961b2d5
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/unknown.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/us.png b/static/skywire-manager-src/src/assets/img/flags/us.png
new file mode 100644
index 000000000..10f451fe8
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/us.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/uy.png b/static/skywire-manager-src/src/assets/img/flags/uy.png
new file mode 100644
index 000000000..31d948a06
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/uy.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/uz.png b/static/skywire-manager-src/src/assets/img/flags/uz.png
new file mode 100644
index 000000000..fef5dc170
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/uz.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/va.png b/static/skywire-manager-src/src/assets/img/flags/va.png
new file mode 100644
index 000000000..b31eaf225
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/va.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/vc.png b/static/skywire-manager-src/src/assets/img/flags/vc.png
new file mode 100644
index 000000000..8fa17b061
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/vc.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ve.png b/static/skywire-manager-src/src/assets/img/flags/ve.png
new file mode 100644
index 000000000..00c90f9af
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ve.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/vg.png b/static/skywire-manager-src/src/assets/img/flags/vg.png
new file mode 100644
index 000000000..415690798
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/vg.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/vi.png b/static/skywire-manager-src/src/assets/img/flags/vi.png
new file mode 100644
index 000000000..ed26915a3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/vi.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/vn.png b/static/skywire-manager-src/src/assets/img/flags/vn.png
new file mode 100644
index 000000000..ec7cd48a3
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/vn.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/vu.png b/static/skywire-manager-src/src/assets/img/flags/vu.png
new file mode 100644
index 000000000..b3397bc63
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/vu.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/wales.png b/static/skywire-manager-src/src/assets/img/flags/wales.png
new file mode 100644
index 000000000..e0d7cee11
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/wales.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/wf.png b/static/skywire-manager-src/src/assets/img/flags/wf.png
new file mode 100644
index 000000000..9f9558734
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/wf.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ws.png b/static/skywire-manager-src/src/assets/img/flags/ws.png
new file mode 100644
index 000000000..c16950802
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ws.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/xk.png b/static/skywire-manager-src/src/assets/img/flags/xk.png
new file mode 100644
index 000000000..71a479503
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/xk.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/ye.png b/static/skywire-manager-src/src/assets/img/flags/ye.png
new file mode 100644
index 000000000..468dfad03
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/ye.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/yt.png b/static/skywire-manager-src/src/assets/img/flags/yt.png
new file mode 100644
index 000000000..c298f378b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/yt.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/za.png b/static/skywire-manager-src/src/assets/img/flags/za.png
new file mode 100644
index 000000000..57c58e211
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/za.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/zm.png b/static/skywire-manager-src/src/assets/img/flags/zm.png
new file mode 100644
index 000000000..c25b07bee
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/zm.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/zw.png b/static/skywire-manager-src/src/assets/img/flags/zw.png
new file mode 100644
index 000000000..53c97259b
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/zw.png differ
diff --git a/static/skywire-manager-src/src/assets/img/flags/zz.png b/static/skywire-manager-src/src/assets/img/flags/zz.png
new file mode 100644
index 000000000..c78597659
Binary files /dev/null and b/static/skywire-manager-src/src/assets/img/flags/zz.png differ
diff --git a/static/skywire-manager-src/src/styles.scss b/static/skywire-manager-src/src/styles.scss
index 10b0b8e00..dfeeb76a5 100644
--- a/static/skywire-manager-src/src/styles.scss
+++ b/static/skywire-manager-src/src/styles.scss
@@ -80,3 +80,16 @@ button:focus {
 .transparent-50 {
   opacity: 0.5;
 }
+
+.flag-container {
+  width: 16px;
+  height: 11px;
+  display: inline-block;
+  margin-right: 5px;
+  background-image: url('/assets/img/flags/unknown.png');
+
+  div {
+    width: 16px;
+    height: 11px;
+  }
+}