diff --git a/diagrams/generic/network.py b/diagrams/generic/network.py
index 40367ef0..03b6e600 100644
--- a/diagrams/generic/network.py
+++ b/diagrams/generic/network.py
@@ -8,10 +8,18 @@ class _Network(_Generic):
     _icon_dir = "resources/generic/network"
 
 
+class Accesspoint(_Network):
+    _icon = "accesspoint.png"
+
+
 class Firewall(_Network):
     _icon = "firewall.png"
 
 
+class Layer3Switch(_Network):
+    _icon = "layer-3-switch.png"
+
+
 class Router(_Network):
     _icon = "router.png"
 
@@ -28,4 +36,8 @@ class VPN(_Network):
     _icon = "vpn.png"
 
 
+class Workstation(_Network):
+    _icon = "workstation.png"
+
+
 # Aliases
diff --git a/diagrams/ibm/network.py b/diagrams/ibm/network.py
index 956d4cfa..605319d1 100644
--- a/diagrams/ibm/network.py
+++ b/diagrams/ibm/network.py
@@ -93,19 +93,3 @@ class VpnPolicy(_Network):
 
 
 # Aliases
-
-ACL = Rules
-CIS = InternetServices
-DL = DirectLink
-FIP = FloatingIp
-FloatingIP = FloatingIp
-FW = Firewall
-LB = LoadBalancer
-NLB = LoadBalancer 
-PublicGateway = Gateway
-SecurityGroupRules = Rules
-TG = TransitGateway
-VPC = Vpc
-VPNGateway = VpnGateway
-VPNConnection = VpnConnection
-VPNPolicy = VpnPolicy
diff --git a/diagrams/ibm/security.py b/diagrams/ibm/security.py
index 79486b8f..ba35efd5 100644
--- a/diagrams/ibm/security.py
+++ b/diagrams/ibm/security.py
@@ -65,4 +65,3 @@ class Vpn(_Security):
 
 
 # Aliases
-VPN = Vpn
diff --git a/docs/nodes/generic.md b/docs/nodes/generic.md
index 8e4249a1..054f84b4 100644
--- a/docs/nodes/generic.md
+++ b/docs/nodes/generic.md
@@ -24,11 +24,14 @@ Node classes list of generic provider.
 
 ## generic.network
 
+- **diagrams.generic.network.Accesspoint**
 - **diagrams.generic.network.Firewall**
+- **diagrams.generic.network.Layer3Switch**
 - **diagrams.generic.network.Router**
 - **diagrams.generic.network.Subnet**
 - **diagrams.generic.network.Switch**
 - **diagrams.generic.network.VPN**
+- **diagrams.generic.network.Workstation**
 
 ## generic.os
 
diff --git a/resources/generic/network/accesspoint.png b/resources/generic/network/accesspoint.png
new file mode 100644
index 00000000..858e49f6
Binary files /dev/null and b/resources/generic/network/accesspoint.png differ
diff --git a/resources/generic/network/firewall.png b/resources/generic/network/firewall.png
index e6c21830..74681f92 100644
Binary files a/resources/generic/network/firewall.png and b/resources/generic/network/firewall.png differ
diff --git a/resources/generic/network/layer-3-switch.png b/resources/generic/network/layer-3-switch.png
new file mode 100644
index 00000000..1f3ed9c0
Binary files /dev/null and b/resources/generic/network/layer-3-switch.png differ
diff --git a/resources/generic/network/router.png b/resources/generic/network/router.png
index 377e2b55..5731da2b 100644
Binary files a/resources/generic/network/router.png and b/resources/generic/network/router.png differ
diff --git a/resources/generic/network/switch.png b/resources/generic/network/switch.png
index 9699b691..48ac62ee 100644
Binary files a/resources/generic/network/switch.png and b/resources/generic/network/switch.png differ
diff --git a/resources/generic/network/workstation.png b/resources/generic/network/workstation.png
new file mode 100644
index 00000000..11dce14b
Binary files /dev/null and b/resources/generic/network/workstation.png differ