diff --git a/config/config.php b/config/config.php
index c02ef442..15c809c7 100755
--- a/config/config.php
+++ b/config/config.php
@@ -23,6 +23,7 @@ define('RASPI_OPENVPN_CLIENT_CONFIG', '/etc/openvpn/client/client.conf');
 define('RASPI_OPENVPN_CLIENT_LOGIN', '/etc/openvpn/client/login.conf');
 define('RASPI_WIREGUARD_PATH', '/etc/wireguard/');
 define('RASPI_WIREGUARD_CONFIG', RASPI_WIREGUARD_PATH.'wg0.conf');
+define('RASPI_FIREWALL_ENABLED', true);
 define('RASPI_TORPROXY_CONFIG', '/etc/tor/torrc');
 define('RASPI_LIGHTTPD_CONFIG', '/etc/lighttpd/lighttpd.conf');
 define('RASPI_ACCESS_CHECK_IP', '1.1.1.1');
diff --git a/index.php b/index.php
index 3e6e9ff6..496fafd4 100755
--- a/index.php
+++ b/index.php
@@ -41,6 +41,7 @@ require_once 'includes/system.php';
 require_once 'includes/sysstats.php';
 require_once 'includes/configure_client.php';
 require_once 'includes/networking.php';
+require_once 'includes/firewall.php';
 require_once 'includes/themes.php';
 require_once 'includes/data_usage.php';
 require_once 'includes/about.php';
@@ -175,6 +176,11 @@ $bridgedEnabled = getBridgedState();
           <?php if (RASPI_TORPROXY_ENABLED) : ?>
         <li class="nav-item">
            <a class="nav-link" href="torproxy_conf"><i class="fas fa-eye-slash fa-fw mr-2"></i><span class="nav-label"><?php echo _("TOR proxy"); ?></a>
+        </li>
+          <?php endif; ?>
+          <?php if (RASPI_FIREWALL_ENABLED) : ?>
+        <li class="nav-item">
+          <a class="nav-link" href="firewall_conf"><span class="fas fa-shield-alt mr-2"></span><span class="nav-label"><?php echo _("Firewall"); ?></a>
         </li>
           <?php endif; ?>
           <?php if (RASPI_CONFAUTH_ENABLED) : ?>
@@ -274,6 +280,9 @@ $bridgedEnabled = getBridgedState();
         case "/torproxy_conf":
             DisplayTorProxyConfig();
             break;
+        case "/firewall_conf":
+            DisplayFirewallConfig();
+            break;
         case "/auth_conf":
             DisplayAuthConfig($config['admin_user'], $config['admin_pass']);
             break;