diff --git a/diagrams/azure/general.py b/diagrams/azure/general.py
new file mode 100644
index 00000000..500ad06d
--- /dev/null
+++ b/diagrams/azure/general.py
@@ -0,0 +1,111 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Azure
+
+
+class _General(_Azure):
+    _type = "general"
+    _icon_dir = "resources/azure/general"
+
+
+class AllResources(_General):
+    _icon = "all-resources.png"
+
+
+class Developertools(_General):
+    _icon = "developertools.png"
+
+
+class HelpSupport(_General):
+    _icon = "help-support.png"
+
+
+class Home(_General):
+    _icon = "home.png"
+
+
+class Information(_General):
+    _icon = "information.png"
+
+
+class ManagementGroups(_General):
+    _icon = "management-groups.png"
+
+
+class Marketplace(_General):
+    _icon = "marketplace.png"
+
+
+class QuickStartCenter(_General):
+    _icon = "quick-start-center.png"
+
+
+class Recent(_General):
+    _icon = "recent.png"
+
+
+class Reservations(_General):
+    _icon = "reservations.png"
+
+
+class ResourceGroups(_General):
+    _icon = "resource-groups.png"
+
+
+class Resource(_General):
+    _icon = "resource.png"
+
+
+class ServiceHealth(_General):
+    _icon = "service-health.png"
+
+
+class SharedDashboard(_General):
+    _icon = "shared-dashboard.png"
+
+
+class Subscriptions(_General):
+    _icon = "subscriptions.png"
+
+
+class SupportRequests(_General):
+    _icon = "support-requests.png"
+
+
+class Support(_General):
+    _icon = "support.png"
+
+
+class Tag(_General):
+    _icon = "tag.png"
+
+
+class Tags(_General):
+    _icon = "tags.png"
+
+
+class Templates(_General):
+    _icon = "templates.png"
+
+
+class TwoUserIcon(_General):
+    _icon = "two-user-icon.png"
+
+
+class UserHealthIcon(_General):
+    _icon = "user-health-icon.png"
+
+
+class UserIcon(_General):
+    _icon = "user-icon.png"
+
+
+class UserPrivacy(_General):
+    _icon = "user-privacy.png"
+
+
+class UserResource(_General):
+    _icon = "user-resource.png"
+
+
+# Aliases
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index 0f0f3947..29d27674 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -5,6 +5,47 @@ title: Azure
 
 Node classes list of azure provider.
 
+## azure.mobile
+
+- **diagrams.azure.mobile.AppServiceMobile**
+- **diagrams.azure.mobile.MobileEngagement**
+- **diagrams.azure.mobile.NotificationHubs**
+
+## azure.identity
+
+- **diagrams.azure.identity.AccessReview**
+- **diagrams.azure.identity.ActiveDirectoryConnectHealth**
+- **diagrams.azure.identity.ActiveDirectory**
+- **diagrams.azure.identity.ADB2C**
+- **diagrams.azure.identity.ADDomainServices**
+- **diagrams.azure.identity.ADIdentityProtection**
+- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
+- **diagrams.azure.identity.AppRegistrations**
+- **diagrams.azure.identity.ConditionalAccess**
+- **diagrams.azure.identity.EnterpriseApplications**
+- **diagrams.azure.identity.IdentityGovernance**
+- **diagrams.azure.identity.InformationProtection**
+- **diagrams.azure.identity.ManagedIdentities**
+
+## azure.storage
+
+- **diagrams.azure.storage.ArchiveStorage**
+- **diagrams.azure.storage.Azurefxtedgefiler**
+- **diagrams.azure.storage.BlobStorage**
+- **diagrams.azure.storage.DataBoxEdgeDataBoxGateway**
+- **diagrams.azure.storage.DataBox**
+- **diagrams.azure.storage.DataLakeStorage**
+- **diagrams.azure.storage.GeneralStorage**
+- **diagrams.azure.storage.NetappFiles**
+- **diagrams.azure.storage.QueuesStorage**
+- **diagrams.azure.storage.StorageAccountsClassic**
+- **diagrams.azure.storage.StorageAccounts**
+- **diagrams.azure.storage.StorageExplorer**
+- **diagrams.azure.storage.StorageSyncServices**
+- **diagrams.azure.storage.StorsimpleDataManagers**
+- **diagrams.azure.storage.StorsimpleDeviceManagers**
+- **diagrams.azure.storage.TableStorage**
+
 ## azure.database
 
 - **diagrams.azure.database.BlobStorage**
@@ -36,28 +77,6 @@ Node classes list of azure provider.
 - **diagrams.azure.devops.Repos**
 - **diagrams.azure.devops.TestPlans**
 
-## azure.identity
-
-- **diagrams.azure.identity.AccessReview**
-- **diagrams.azure.identity.ActiveDirectoryConnectHealth**
-- **diagrams.azure.identity.ActiveDirectory**
-- **diagrams.azure.identity.ADB2C**
-- **diagrams.azure.identity.ADDomainServices**
-- **diagrams.azure.identity.ADIdentityProtection**
-- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
-- **diagrams.azure.identity.AppRegistrations**
-- **diagrams.azure.identity.ConditionalAccess**
-- **diagrams.azure.identity.EnterpriseApplications**
-- **diagrams.azure.identity.IdentityGovernance**
-- **diagrams.azure.identity.InformationProtection**
-- **diagrams.azure.identity.ManagedIdentities**
-
-## azure.security
-
-- **diagrams.azure.security.KeyVaults**
-- **diagrams.azure.security.SecurityCenter**
-- **diagrams.azure.security.Sentinel**
-
 ## azure.web
 
 - **diagrams.azure.web.APIConnections**
@@ -71,54 +90,6 @@ Node classes list of azure provider.
 - **diagrams.azure.web.Search**
 - **diagrams.azure.web.Signalr**
 
-## azure.network
-
-- **diagrams.azure.network.ApplicationGateway**
-- **diagrams.azure.network.ApplicationSecurityGroups**
-- **diagrams.azure.network.CDNProfiles**
-- **diagrams.azure.network.Connections**
-- **diagrams.azure.network.DDOSProtectionPlans**
-- **diagrams.azure.network.DNSPrivateZones**
-- **diagrams.azure.network.DNSZones**
-- **diagrams.azure.network.ExpressrouteCircuits**
-- **diagrams.azure.network.Firewall**
-- **diagrams.azure.network.FrontDoors**
-- **diagrams.azure.network.LoadBalancers**
-- **diagrams.azure.network.LocalNetworkGateways**
-- **diagrams.azure.network.NetworkInterfaces**
-- **diagrams.azure.network.NetworkSecurityGroupsClassic**
-- **diagrams.azure.network.NetworkWatcher**
-- **diagrams.azure.network.OnPremisesDataGateways**
-- **diagrams.azure.network.PublicIpAddresses**
-- **diagrams.azure.network.ReservedIpAddressesClassic**
-- **diagrams.azure.network.RouteFilters**
-- **diagrams.azure.network.RouteTables**
-- **diagrams.azure.network.ServiceEndpointPolicies**
-- **diagrams.azure.network.TrafficManagerProfiles**
-- **diagrams.azure.network.VirtualNetworkClassic**
-- **diagrams.azure.network.VirtualNetworkGateways**
-- **diagrams.azure.network.VirtualNetworks**
-- **diagrams.azure.network.VirtualWans**
-
-## azure.storage
-
-- **diagrams.azure.storage.ArchiveStorage**
-- **diagrams.azure.storage.Azurefxtedgefiler**
-- **diagrams.azure.storage.BlobStorage**
-- **diagrams.azure.storage.DataBoxEdgeDataBoxGateway**
-- **diagrams.azure.storage.DataBox**
-- **diagrams.azure.storage.DataLakeStorage**
-- **diagrams.azure.storage.GeneralStorage**
-- **diagrams.azure.storage.NetappFiles**
-- **diagrams.azure.storage.QueuesStorage**
-- **diagrams.azure.storage.StorageAccountsClassic**
-- **diagrams.azure.storage.StorageAccounts**
-- **diagrams.azure.storage.StorageExplorer**
-- **diagrams.azure.storage.StorageSyncServices**
-- **diagrams.azure.storage.StorsimpleDataManagers**
-- **diagrams.azure.storage.StorsimpleDeviceManagers**
-- **diagrams.azure.storage.TableStorage**
-
 ## azure.iot
 
 - **diagrams.azure.iot.DeviceProvisioningServices**
@@ -132,29 +103,6 @@ Node classes list of azure provider.
 - **diagrams.azure.iot.TimeSeriesInsightsEventsSources**
 - **diagrams.azure.iot.Windows10IotCoreServices**
 
-## azure.compute
-
-- **diagrams.azure.compute.AvailabilitySets**
-- **diagrams.azure.compute.BatchAccounts**
-- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
-- **diagrams.azure.compute.CloudServicesClassic**
-- **diagrams.azure.compute.CloudServices**
-- **diagrams.azure.compute.CloudsimpleVirtualMachines**
-- **diagrams.azure.compute.ContainerInstances**
-- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
-- **diagrams.azure.compute.DiskSnapshots**
-- **diagrams.azure.compute.Disks**
-- **diagrams.azure.compute.FunctionApps**
-- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
-- **diagrams.azure.compute.MeshApplications**
-- **diagrams.azure.compute.SAPHANAOnAzure**
-- **diagrams.azure.compute.ServiceFabricClusters**
-- **diagrams.azure.compute.VMClassic**
-- **diagrams.azure.compute.VMImages**
-- **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMWindows**
-- **diagrams.azure.compute.VM**
-
 ## azure.ml
 
 - **diagrams.azure.ml.BatchAI**
@@ -166,12 +114,6 @@ Node classes list of azure provider.
 - **diagrams.azure.ml.MachineLearningStudioWebServices**
 - **diagrams.azure.ml.MachineLearningStudioWorkspaces**
 
-## azure.mobile
-
-- **diagrams.azure.mobile.AppServiceMobile**
-- **diagrams.azure.mobile.MobileEngagement**
-- **diagrams.azure.mobile.NotificationHubs**
-
 ## azure.migration
 
 - **diagrams.azure.migration.DatabaseMigrationServices**
@@ -191,3 +133,89 @@ Node classes list of azure provider.
 - **diagrams.azure.analytics.Hdinsightclusters**
 - **diagrams.azure.analytics.LogAnalyticsWorkspaces**
 - **diagrams.azure.analytics.StreamAnalyticsJobs**
+
+## azure.security
+
+- **diagrams.azure.security.KeyVaults**
+- **diagrams.azure.security.SecurityCenter**
+- **diagrams.azure.security.Sentinel**
+
+## azure.general
+
+- **diagrams.azure.general.AllResources**
+- **diagrams.azure.general.Developertools**
+- **diagrams.azure.general.HelpSupport**
+- **diagrams.azure.general.Home**
+- **diagrams.azure.general.Information**
+- **diagrams.azure.general.ManagementGroups**
+- **diagrams.azure.general.Marketplace**
+- **diagrams.azure.general.QuickStartCenter**
+- **diagrams.azure.general.Recent**
+- **diagrams.azure.general.Reservations**
+- **diagrams.azure.general.ResourceGroups**
+- **diagrams.azure.general.Resource**
+- **diagrams.azure.general.ServiceHealth**
+- **diagrams.azure.general.SharedDashboard**
+- **diagrams.azure.general.Subscriptions**
+- **diagrams.azure.general.SupportRequests**
+- **diagrams.azure.general.Support**
+- **diagrams.azure.general.Tag**
+- **diagrams.azure.general.Tags**
+- **diagrams.azure.general.Templates**
+- **diagrams.azure.general.TwoUserIcon**
+- **diagrams.azure.general.UserHealthIcon**
+- **diagrams.azure.general.UserIcon**
+- **diagrams.azure.general.UserPrivacy**
+- **diagrams.azure.general.UserResource**
+
+## azure.compute
+
+- **diagrams.azure.compute.AvailabilitySets**
+- **diagrams.azure.compute.BatchAccounts**
+- **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
+- **diagrams.azure.compute.CloudServicesClassic**
+- **diagrams.azure.compute.CloudServices**
+- **diagrams.azure.compute.CloudsimpleVirtualMachines**
+- **diagrams.azure.compute.ContainerInstances**
+- **diagrams.azure.compute.ContainerRegistries**, **ACR** (alias)
+- **diagrams.azure.compute.DiskSnapshots**
+- **diagrams.azure.compute.Disks**
+- **diagrams.azure.compute.FunctionApps**
+- **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
+- **diagrams.azure.compute.MeshApplications**
+- **diagrams.azure.compute.SAPHANAOnAzure**
+- **diagrams.azure.compute.ServiceFabricClusters**
+- **diagrams.azure.compute.VMClassic**
+- **diagrams.azure.compute.VMImages**
+- **diagrams.azure.compute.VMLinux**
+- **diagrams.azure.compute.VMWindows**
+- **diagrams.azure.compute.VM**
+
+## azure.network
+
+- **diagrams.azure.network.ApplicationGateway**
+- **diagrams.azure.network.ApplicationSecurityGroups**
+- **diagrams.azure.network.CDNProfiles**
+- **diagrams.azure.network.Connections**
+- **diagrams.azure.network.DDOSProtectionPlans**
+- **diagrams.azure.network.DNSPrivateZones**
+- **diagrams.azure.network.DNSZones**
+- **diagrams.azure.network.ExpressrouteCircuits**
+- **diagrams.azure.network.Firewall**
+- **diagrams.azure.network.FrontDoors**
+- **diagrams.azure.network.LoadBalancers**
+- **diagrams.azure.network.LocalNetworkGateways**
+- **diagrams.azure.network.NetworkInterfaces**
+- **diagrams.azure.network.NetworkSecurityGroupsClassic**
+- **diagrams.azure.network.NetworkWatcher**
+- **diagrams.azure.network.OnPremisesDataGateways**
+- **diagrams.azure.network.PublicIpAddresses**
+- **diagrams.azure.network.ReservedIpAddressesClassic**
+- **diagrams.azure.network.RouteFilters**
+- **diagrams.azure.network.RouteTables**
+- **diagrams.azure.network.ServiceEndpointPolicies**
+- **diagrams.azure.network.TrafficManagerProfiles**
+- **diagrams.azure.network.VirtualNetworkClassic**
+- **diagrams.azure.network.VirtualNetworkGateways**
+- **diagrams.azure.network.VirtualNetworks**
+- **diagrams.azure.network.VirtualWans**
diff --git a/resources/azure/general/All_Resources.png b/resources/azure/general/all-resources.png
similarity index 100%
rename from resources/azure/general/All_Resources.png
rename to resources/azure/general/all-resources.png
diff --git a/resources/azure/general/DeveloperTools.png b/resources/azure/general/developertools.png
similarity index 100%
rename from resources/azure/general/DeveloperTools.png
rename to resources/azure/general/developertools.png
diff --git a/resources/azure/general/Help_+_Support.png b/resources/azure/general/help-support.png
similarity index 100%
rename from resources/azure/general/Help_+_Support.png
rename to resources/azure/general/help-support.png
diff --git a/resources/azure/general/Azure_Home.png b/resources/azure/general/home.png
similarity index 100%
rename from resources/azure/general/Azure_Home.png
rename to resources/azure/general/home.png
diff --git a/resources/azure/general/Information.png b/resources/azure/general/information.png
similarity index 100%
rename from resources/azure/general/Information.png
rename to resources/azure/general/information.png
diff --git a/resources/azure/general/Management_Groups.png b/resources/azure/general/management-groups.png
similarity index 100%
rename from resources/azure/general/Management_Groups.png
rename to resources/azure/general/management-groups.png
diff --git a/resources/azure/general/Marketplace.png b/resources/azure/general/marketplace.png
similarity index 100%
rename from resources/azure/general/Marketplace.png
rename to resources/azure/general/marketplace.png
diff --git a/resources/azure/general/Quick_Start_Center.png b/resources/azure/general/quick-start-center.png
similarity index 100%
rename from resources/azure/general/Quick_Start_Center.png
rename to resources/azure/general/quick-start-center.png
diff --git a/resources/azure/general/Recent.png b/resources/azure/general/recent.png
similarity index 100%
rename from resources/azure/general/Recent.png
rename to resources/azure/general/recent.png
diff --git a/resources/azure/general/Reservations.png b/resources/azure/general/reservations.png
similarity index 100%
rename from resources/azure/general/Reservations.png
rename to resources/azure/general/reservations.png
diff --git a/resources/azure/general/Resource_Groups.png b/resources/azure/general/resource-groups.png
similarity index 100%
rename from resources/azure/general/Resource_Groups.png
rename to resources/azure/general/resource-groups.png
diff --git a/resources/azure/general/Resource.png b/resources/azure/general/resource.png
similarity index 100%
rename from resources/azure/general/Resource.png
rename to resources/azure/general/resource.png
diff --git a/resources/azure/general/Service_Health.png b/resources/azure/general/service-health.png
similarity index 100%
rename from resources/azure/general/Service_Health.png
rename to resources/azure/general/service-health.png
diff --git a/resources/azure/general/Shared_Dashboard.png b/resources/azure/general/shared-dashboard.png
similarity index 100%
rename from resources/azure/general/Shared_Dashboard.png
rename to resources/azure/general/shared-dashboard.png
diff --git a/resources/azure/general/Subscriptions.png b/resources/azure/general/subscriptions.png
similarity index 100%
rename from resources/azure/general/Subscriptions.png
rename to resources/azure/general/subscriptions.png
diff --git a/resources/azure/general/Support_Requests.png b/resources/azure/general/support-requests.png
similarity index 100%
rename from resources/azure/general/Support_Requests.png
rename to resources/azure/general/support-requests.png
diff --git a/resources/azure/general/Support.png b/resources/azure/general/support.png
similarity index 100%
rename from resources/azure/general/Support.png
rename to resources/azure/general/support.png
diff --git a/resources/azure/general/Tag.png b/resources/azure/general/tag.png
similarity index 100%
rename from resources/azure/general/Tag.png
rename to resources/azure/general/tag.png
diff --git a/resources/azure/general/Tags.png b/resources/azure/general/tags.png
similarity index 100%
rename from resources/azure/general/Tags.png
rename to resources/azure/general/tags.png
diff --git a/resources/azure/general/Templates.png b/resources/azure/general/templates.png
similarity index 100%
rename from resources/azure/general/Templates.png
rename to resources/azure/general/templates.png
diff --git a/resources/azure/general/Two_User_Icon.png b/resources/azure/general/two-user-icon.png
similarity index 100%
rename from resources/azure/general/Two_User_Icon.png
rename to resources/azure/general/two-user-icon.png
diff --git a/resources/azure/general/User_Health_Icon.png b/resources/azure/general/user-health-icon.png
similarity index 100%
rename from resources/azure/general/User_Health_Icon.png
rename to resources/azure/general/user-health-icon.png
diff --git a/resources/azure/general/User_Icon.png b/resources/azure/general/user-icon.png
similarity index 100%
rename from resources/azure/general/User_Icon.png
rename to resources/azure/general/user-icon.png
diff --git a/resources/azure/general/User_Privacy.png b/resources/azure/general/user-privacy.png
similarity index 100%
rename from resources/azure/general/User_Privacy.png
rename to resources/azure/general/user-privacy.png
diff --git a/resources/azure/general/User_Resource.png b/resources/azure/general/user-resource.png
similarity index 100%
rename from resources/azure/general/User_Resource.png
rename to resources/azure/general/user-resource.png