diff --git a/src/tools/air-codes/air-codes.vue b/src/tools/air-codes/air-codes.vue
new file mode 100644
index 00000000..27b893aa
--- /dev/null
+++ b/src/tools/air-codes/air-codes.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import { findAirline, findAirport } from 'aircodes';
+import SpanCopyable from '@/components/SpanCopyable.vue';
+
+const airline = ref('');
+const airport = ref('');
+const resultAirline = computed(() => findAirline(airline.value));
+const resultAirport = computed(() => findAirport(airport.value));
+</script>
+
+<template>
+  <div>
+    <c-card title="Airline search">
+      <n-space>
+        <n-form-item label="Airline query">
+          <n-input v-model:value="airline" />
+        </n-form-item>
+      </n-space>
+
+      <n-divider />
+
+      <n-form-item label="IATA">
+        <SpanCopyable :value="resultAirline?.iata" />
+      </n-form-item>
+      <n-form-item label="ICAO">
+        <SpanCopyable :value="resultAirline?.icao" />
+      </n-form-item>
+      <n-form-item label="Name">
+        <SpanCopyable :value="resultAirline?.name" />
+      </n-form-item>
+      <n-form-item label="Logo">
+        <img width="100" :alt="resultAirline?.name" :src="resultAirline?.logo">
+      </n-form-item>
+    </c-card>
+
+    <c-card title="Airport search">
+      <n-space>
+        <n-form-item label="Airline query">
+          <n-input v-model:value="airline" />
+        </n-form-item>
+      </n-space>
+
+      <n-divider />
+
+      <n-form-item label="IATA">
+        <SpanCopyable :value="resultAirport?.iata" />
+      </n-form-item>
+      <n-form-item label="ICAO">
+        <SpanCopyable :value="resultAirport?.icao" />
+      </n-form-item>
+      <n-form-item label="Name">
+        <SpanCopyable :value="resultAirport?.name" />
+      </n-form-item>
+      <n-form-item label="City">
+        <SpanCopyable :value="resultAirport?.city" />
+      </n-form-item>
+      <n-form-item label="State">
+        <SpanCopyable :value="resultAirport?.state" />
+      </n-form-item>
+      <n-form-item label="Country">
+        <SpanCopyable :value="resultAirport?.country" />
+      </n-form-item>
+    </c-card>
+  </div>
+</template>
diff --git a/src/tools/air-codes/index.ts b/src/tools/air-codes/index.ts
new file mode 100644
index 00000000..9447bcfc
--- /dev/null
+++ b/src/tools/air-codes/index.ts
@@ -0,0 +1,12 @@
+import { Plane } from '@vicons/tabler';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'Air Codes',
+  path: '/air-codes',
+  description: 'Get Airport and Airline info from name, ICAO code or IATA code',
+  keywords: ['airport', 'airline', 'air', 'plane', 'icao', 'iata'],
+  component: () => import('./air-codes.vue'),
+  icon: Plane,
+  createdAt: new Date('2024-04-20'),
+});
diff --git a/src/tools/index.ts b/src/tools/index.ts
index aa861c93..68effeef 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -6,6 +6,7 @@ import { tool as asciiTextDrawer } from './ascii-text-drawer';
 
 import { tool as textToUnicode } from './text-to-unicode';
 import { tool as safelinkDecoder } from './safelink-decoder';
+import { tool as airCodes } from './air-codes';
 import { tool as pdfSignatureChecker } from './pdf-signature-checker';
 import { tool as numeronymGenerator } from './numeronym-generator';
 import { tool as macAddressGenerator } from './mac-address-generator';