diff --git a/app/.vs/app/v16/.suo b/app/.vs/app/v16/.suo
index fe72afa..d8701a6 100644
Binary files a/app/.vs/app/v16/.suo and b/app/.vs/app/v16/.suo differ
diff --git a/app/.vs/slnx.sqlite b/app/.vs/slnx.sqlite
index 47dfb60..a305b4a 100644
Binary files a/app/.vs/slnx.sqlite and b/app/.vs/slnx.sqlite differ
diff --git a/app/src/app/networking/firewall-editor/firewall-editor.component.html b/app/src/app/networking/firewall-editor/firewall-editor.component.html
index 3624650..e8e06a7 100644
--- a/app/src/app/networking/firewall-editor/firewall-editor.component.html
+++ b/app/src/app/networking/firewall-editor/firewall-editor.component.html
@@ -34,12 +34,27 @@
             <span *ngIf="editorForm.get('protocol').value === 'ICMP'">Type and code</span>
           </h5>
 
-          <input type="text" class="form-control" id="protocolConfig" formControlName="protocolConfig"
-                 [appAutofocus]="!editorForm.get('protocolConfig').value && editorForm.get('protocol').value" [appAutofocusDelay]="250"
-                 [placeholder]="editorForm.get('protocol').value === 'icmp' ? 'Type:Code [0:255]' : 'Port [1-9999]'"
-                 [appAlphaOnly]="editorForm.get('protocol').value === 'icmp' ? '^[0-9:]+$' : '^[0-9]+$'">
+          <div class="input-group mb-3" dropdown placement="bottom right">
+            <button class="btn btn-outline-info dropdown-toggle" type="button" dropdownToggle>
+              <span *ngIf="editorForm.get('protocolConfig').value === 'all'">All ports</span>
+              <span *ngIf="editorForm.get('protocolConfig').value !== 'all'">Specific port</span>
+            </button>
+            <ul *dropdownMenu class="dropdown-menu" role="menu">
+              <li>
+                <button class="dropdown-item" (click)="setProtocolConfig()">Specific port</button>
+              </li>
+              <li>
+                <button class="dropdown-item" (click)="setProtocolConfig('all')">All ports</button>
+              </li>
+            </ul>
+            <input type="text" class="form-control text-capitalize" id="protocolConfig" formControlName="protocolConfig"
+                   [appAutofocus]="!editorForm.get('protocolConfig').value && editorForm.get('protocol').value" [appAutofocusDelay]="250"
+                   [placeholder]="editorForm.get('protocol').value === 'icmp' ? 'Type:Code [0:255]' : 'Port [1-9999]'"
+                   [appAlphaOnly]="editorForm.get('protocol').value === 'icmp' ? '^[0-9:]+$' : '^[0-9]+$'">
+          </div>
         </div>
-
+      </div>
+      <div class="row g-4">
         <div class="col-sm-6">
           <h5>From</h5>
           <div class="row">
diff --git a/app/src/app/networking/firewall-editor/firewall-editor.component.scss b/app/src/app/networking/firewall-editor/firewall-editor.component.scss
index c16ab2c..420ca56 100644
--- a/app/src/app/networking/firewall-editor/firewall-editor.component.scss
+++ b/app/src/app/networking/firewall-editor/firewall-editor.component.scss
@@ -38,3 +38,9 @@ h5
     }
   }
 }
+
+.input-group > .dropdown-toggle
+{
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
diff --git a/app/src/app/networking/firewall-editor/firewall-editor.component.ts b/app/src/app/networking/firewall-editor/firewall-editor.component.ts
index e9fd346..05ce45c 100644
--- a/app/src/app/networking/firewall-editor/firewall-editor.component.ts
+++ b/app/src/app/networking/firewall-editor/firewall-editor.component.ts
@@ -83,7 +83,10 @@ export class FirewallEditorComponent implements OnInit, OnDestroy
       {
         action: [this.firewallRule?.action.toUpperCase(), [Validators.required]],
         protocol: [this.firewallRule?.protocol.toLowerCase(), [Validators.required]],
-        protocolConfig: [this.firewallRule?.protocolConfig, [Validators.required]],
+        protocolConfig: [
+          { value: this.firewallRule?.protocolConfig, disabled: this.firewallRule?.protocolConfig === 'all' },
+          [Validators.required]
+        ],
         from,
         to,
         description: [this.firewallRule?.description || '']
@@ -159,6 +162,17 @@ export class FirewallEditorComponent implements OnInit, OnDestroy
         });
   }
 
+  // ----------------------------------------------------------------------------------------------------------------
+  setProtocolConfig(value?: string)
+  {
+    this.editorForm.get('protocolConfig').setValue(value);
+
+    if (value === 'all')
+      this.editorForm.get('protocolConfig').disable();
+    else
+      this.editorForm.get('protocolConfig').enable();
+  }
+
   // ----------------------------------------------------------------------------------------------------------------
   addFromRule(rule: { type: string; config: string })
   {
diff --git a/app/src/app/networking/firewall-rules/firewall-rules.component.html b/app/src/app/networking/firewall-rules/firewall-rules.component.html
index f701fda..e1ec3d3 100644
--- a/app/src/app/networking/firewall-rules/firewall-rules.component.html
+++ b/app/src/app/networking/firewall-rules/firewall-rules.component.html
@@ -114,7 +114,7 @@
                           tooltip="More options" container="body" placement="top" [adaptivePosition]="false">
                     <fa-icon icon="ellipsis-v" [fixedWidth]="true" size="sm"></fa-icon>
                   </button>
-                  <ul id="dropdown-split" *dropdownMenu class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="button-split">
+                  <ul *dropdownMenu class="dropdown-menu dropdown-menu-right" role="menu">
                     <li role="menuitem">
                       <button class="dropdown-item" (click)="deleteFirewallRule(fw)">
                         <fa-icon icon="trash" [fixedWidth]="true"></fa-icon>