diff --git a/assets/static/js/modules/aircraft-manager.js b/assets/static/js/modules/aircraft-manager.js
index 7b4dd2a..a5351cb 100644
--- a/assets/static/js/modules/aircraft-manager.js
+++ b/assets/static/js/modules/aircraft-manager.js
@@ -141,14 +141,57 @@ export class AircraftManager {
         const color = this.getAircraftColor(type);
         const size = aircraft.OnGround ? 12 : 16;
         
+        // Create different SVG shapes based on aircraft type
+        let aircraftPath;
+        
+        switch (type) {
+            case 'helicopter':
+                // Helicopter shape with rotor disc
+                aircraftPath = `
+                    <circle cx="0" cy="0" r="10" fill="none" stroke="${color}" stroke-width="1" opacity="0.3"/>
+                    <path d="M0,-8 L-6,6 L-1,6 L0,8 L1,6 L6,6 Z" fill="${color}"/>
+                    <path d="M0,-6 L0,-10" stroke="${color}" stroke-width="2"/>
+                    <path d="M0,6 L0,8" stroke="${color}" stroke-width="2"/>
+                `;
+                break;
+            case 'military':
+                // Swept-wing fighter jet shape
+                aircraftPath = `
+                    <path d="M0,-12 L-4,2 L-8,8 L-2,6 L0,12 L2,6 L8,8 L4,2 Z" fill="${color}"/>
+                `;
+                break;
+            case 'cargo':
+                // Wide-body cargo aircraft shape
+                aircraftPath = `
+                    <path d="M0,-12 L-10,8 L-3,8 L0,12 L3,8 L10,8 Z" fill="${color}"/>
+                    <rect x="-2" y="-6" width="4" height="8" fill="${color}"/>
+                `;
+                break;
+            case 'ga':
+                // Small general aviation aircraft
+                aircraftPath = `
+                    <path d="M0,-10 L-5,6 L-1,6 L0,10 L1,6 L5,6 Z" fill="${color}"/>
+                `;
+                break;
+            case 'ground':
+                // Ground vehicle - simplified truck/car shape
+                aircraftPath = `
+                    <rect x="-6" y="-4" width="12" height="8" fill="${color}" rx="2"/>
+                    <circle cx="-3" cy="2" r="2" fill="#333"/>
+                    <circle cx="3" cy="2" r="2" fill="#333"/>
+                `;
+                break;
+            default:
+                // Default commercial aircraft shape
+                aircraftPath = `
+                    <path d="M0,-12 L-8,8 L-2,8 L0,12 L2,8 L8,8 Z" fill="${color}"/>
+                `;
+        }
+        
         const svg = `
             <svg width="${size * 2}" height="${size * 2}" viewBox="0 0 32 32">
                 <g transform="translate(16,16)">
-                    <path d="M0,-12 L-8,8 L-2,8 L0,12 L2,8 L8,8 Z" 
-                          fill="${color}" 
-                          stroke="#ffffff" 
-                          stroke-width="1"
-                          filter="drop-shadow(0 0 4px rgba(0,212,255,0.8))"/>
+                    ${aircraftPath}
                 </g>
             </svg>
         `;
@@ -163,17 +206,43 @@ export class AircraftManager {
 
     getAircraftType(aircraft) {
         if (aircraft.OnGround) return 'ground';
+        
+        // Use ADS-B Category field for proper aircraft classification
         if (aircraft.Category) {
             const cat = aircraft.Category.toLowerCase();
-            if (cat.includes('military')) return 'military';
-            if (cat.includes('cargo') || cat.includes('heavy')) return 'cargo';
-            if (cat.includes('light') || cat.includes('glider')) return 'ga';
+            
+            // Standard ADS-B aircraft categories - check specific terms first
+            if (cat.includes('helicopter') || cat.includes('rotorcraft') || cat.includes('gyrocopter')) return 'helicopter';
+            if (cat.includes('military') || cat.includes('fighter') || cat.includes('bomber')) return 'military';
+            
+            // ADS-B weight-based categories (RTCA DO-260B standard)
+            if (cat.includes('heavy') || cat.includes('super') || cat.includes('136000kg')) return 'cargo'; // Heavy/Super category
+            if (cat.includes('light') || cat.includes('15500kg') || cat.includes('5700kg') || cat.includes('glider') || cat.includes('ultralight') || cat.includes('sport')) return 'ga'; // Light categories
+            if (cat.includes('medium') || cat.includes('34000kg')) return 'commercial'; // Medium category - typically commercial airliners
+            
+            // Specific aircraft type categories
+            if (cat.includes('cargo') || cat.includes('transport') || cat.includes('freighter')) return 'cargo';
+            if (cat.includes('airliner') || cat.includes('jet') || cat.includes('turboprop')) return 'commercial';
         }
+        
+        // Fallback to callsign analysis for classification
         if (aircraft.Callsign) {
             const cs = aircraft.Callsign.toLowerCase();
-            if (cs.includes('mil') || cs.includes('army') || cs.includes('navy')) return 'military';
-            if (cs.includes('cargo') || cs.includes('fedex') || cs.includes('ups')) return 'cargo';
+            
+            // Helicopter identifiers
+            if (cs.includes('heli') || cs.includes('rescue') || cs.includes('medevac') || cs.includes('lifeguard') || 
+                cs.includes('police') || cs.includes('sheriff') || cs.includes('medic')) return 'helicopter';
+            
+            // Military identifiers
+            if (cs.includes('mil') || cs.includes('army') || cs.includes('navy') || cs.includes('air force') ||
+                cs.includes('usaf') || cs.includes('usmc') || cs.includes('uscg')) return 'military';
+            
+            // Cargo identifiers
+            if (cs.includes('cargo') || cs.includes('fedex') || cs.includes('ups') || cs.includes('dhl') ||
+                cs.includes('freight') || cs.includes('express')) return 'cargo';
         }
+        
+        // Default to commercial for unclassified aircraft
         return 'commercial';
     }
 
@@ -183,7 +252,8 @@ export class AircraftManager {
             cargo: '#ff8c00',
             military: '#ff4444',
             ga: '#ffff00',
-            ground: '#888888'
+            ground: '#888888',
+            helicopter: '#ff00ff'  // Magenta for helicopters
         };
         return colors[type] || colors.commercial;
     }