diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 8b151a8df..1843b8db2 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -52,44 +52,6 @@ if (isset($config['enable_bgp']) && $config['enable_bgp'])
 
 <?php
 
-$i = 0;
-$config['device_types'][$i]['text'] = 'Servers';
-$config['device_types'][$i]['type'] = 'server';
-$config['device_types'][$i]['icon'] = 'server.png';
-
-$i++;
-$config['device_types'][$i]['text'] = 'Network';
-$config['device_types'][$i]['type'] = 'network';
-$config['device_types'][$i]['icon'] = 'network.png';
-
-$i++;
-$config['device_types'][$i]['text'] = 'Firewalls';
-$config['device_types'][$i]['type'] = 'firewall';
-$config['device_types'][$i]['icon'] = 'firewall.png';
-
-$i++;
-$config['device_types'][$i]['text'] = 'Power';
-$config['device_types'][$i]['type'] = 'power';
-$config['device_types'][$i]['icon'] = 'power.png';
-
-$i++;
-$config['device_types'][$i]['text'] = 'Environment';
-$config['device_types'][$i]['type'] = 'environment';
-$config['device_types'][$i]['icon'] = 'environment.png';
-
-$i++;
-$config['device_types'][$i]['text'] = 'Servers';
-$config['device_types'][$i]['type'] = 'server';
-$config['device_types'][$i]['icon'] = 'server.png';
-
-if (isset($config['enable_printers']) && $config['enable_printers'])
-{
-  $i++;
-  $config['device_types'][$i]['text'] = 'Printers';
-  $config['device_types'][$i]['type'] = 'printer';
-  $config['device_types'][$i]['icon'] = 'printer.png';
-}
-
 foreach ($config['device_types'] as $devtype)
 {
   echo '        <li><a href="devices/' . $devtype['type'] . '/"><img src="images/icons/' . $devtype['icon'] . '" border="0" align="absmiddle" /> ' . $devtype['text'] . '</a></li>';
diff --git a/includes/static-config.php b/includes/static-config.php
index 9578876c3..d57391553 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -470,6 +470,46 @@ $config['graph']['device']['netstats_ip_frag']   = "IP Fragmentation Statistics"
 $config['graph']['device']['netstats_udp']       = "UDP Statistics";
 $config['graph']['device']['netstats_snmp']      = "SNMP Statistics";
 
+### Device types
+
+$i = 0;
+$config['device_types'][$i]['text'] = 'Servers';
+$config['device_types'][$i]['type'] = 'server';
+$config['device_types'][$i]['icon'] = 'server.png';
+
+$i++;
+$config['device_types'][$i]['text'] = 'Network';
+$config['device_types'][$i]['type'] = 'network';
+$config['device_types'][$i]['icon'] = 'network.png';
+
+$i++;
+$config['device_types'][$i]['text'] = 'Firewalls';
+$config['device_types'][$i]['type'] = 'firewall';
+$config['device_types'][$i]['icon'] = 'firewall.png';
+
+$i++;
+$config['device_types'][$i]['text'] = 'Power';
+$config['device_types'][$i]['type'] = 'power';
+$config['device_types'][$i]['icon'] = 'power.png';
+
+$i++;
+$config['device_types'][$i]['text'] = 'Environment';
+$config['device_types'][$i]['type'] = 'environment';
+$config['device_types'][$i]['icon'] = 'environment.png';
+
+$i++;
+$config['device_types'][$i]['text'] = 'Servers';
+$config['device_types'][$i]['type'] = 'server';
+$config['device_types'][$i]['icon'] = 'server.png';
+
+if (isset($config['enable_printers']) && $config['enable_printers'])
+{
+  $i++;
+  $config['device_types'][$i]['text'] = 'Printers';
+  $config['device_types'][$i]['type'] = 'printer';
+  $config['device_types'][$i]['icon'] = 'printer.png';
+}
+
 
 
 ##############################