diff --git a/src/components/celestials/CelestialFilters.vue b/src/components/celestials/CelestialFilters.vue
new file mode 100644
index 0000000..0b2bc00
--- /dev/null
+++ b/src/components/celestials/CelestialFilters.vue
@@ -0,0 +1,120 @@
+<template>
+  <div class="celestial-filters">
+    <ul class="no-style">
+      <li>
+        <button
+          class="btn btn-primary"
+          :class="[filters.all ? 'active' : '']"
+          @click="emitFilter('all')"
+        >
+          Tous
+        </button>
+        <button
+          class="btn btn-primary btn-icon"
+          :class="[filters.planets ? 'active' : '']"
+          @click="emitFilter('planets')"
+        >
+          Planètes
+          <img
+            src="icons/saturn-planet-shape-white.svg"
+            alt=""
+            class="fs-icon icon-sm"
+          />
+        </button>
+        <button
+          class="btn btn-primary btn-icon"
+          :class="[filters.moons ? 'active' : '']"
+          @click="emitFilter('moons')"
+        >
+          Lunes
+          <img
+            src="icons/moon-and-stars-in-a-cloud-white.svg"
+            alt=""
+            class="fs-icon icon-sm"
+          />
+        </button>
+        <button
+          class="btn btn-primary btn-icon"
+          :class="[filters.stars ? 'active' : '']"
+          @click="emitFilter('stars')"
+        >
+          Etoiles
+          <img src="icons/sun-shape-white.svg" alt="" class="fs-icon icon-sm" />
+        </button>
+        <button
+          class="btn btn-primary btn-icon"
+          :class="[filters.others ? 'active' : '']"
+          @click="emitFilter('others')"
+        >
+          Autres
+          <img
+            src="icons/stars-group-white.svg"
+            alt=""
+            class="fs-icon icon-sm"
+          />
+        </button>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  name: "celestial-filters",
+  props: {
+    celestials: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      filters: {
+        all: false,
+        planets: false,
+        moons: false,
+        stars: false,
+        others: false
+      }
+    };
+  },
+  methods: {
+    /**
+     * Emits the type of celestial body to filter for to parent
+     */
+    emitFilter(type: string) {
+      // Reset filter appearance
+      this.filters = {
+        all: false,
+        planets: false,
+        moons: false,
+        stars: false,
+        others: false
+      };
+
+      // Triggers the correct filter
+      if (type == "all") {
+        this.filters.all = true;
+      } else if (type == "planets") {
+        this.filters.planets = true;
+      } else if (type == "moons") {
+        this.filters.moons = true;
+      } else if (type == "stars") {
+        this.filters.stars = true;
+      } else if (type == "others") {
+        this.filters.others = true;
+      }
+
+      // Emit filter type
+      this.$emit("filter:celestials", type);
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.celestial-filters {
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/components/celestials/CelestialsList.vue b/src/components/celestials/CelestialsList.vue
index a84c21d..29cbf1c 100644
--- a/src/components/celestials/CelestialsList.vue
+++ b/src/components/celestials/CelestialsList.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="celestial-list-wrapper">
+    <celestial-filters @filter:celestials="filterCelestials" />
     <ul v-if="celestials" class="celestial-list grid no-style">
       <li
-        v-for="(celestial, index) in celestials"
+        v-for="(celestial, index) in sortedCelestials"
         :key="index"
         class="celestial-item"
       >
@@ -15,16 +16,83 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 
+// API
+import axios from "axios";
+// Global methods
+import { addCelestialType } from "@/plugins/methods";
+
 import CelestialCard from "@/components/celestials/CelestialCard.vue";
+import CelestialFilters from "./CelestialFilters.vue";
 
 export default defineComponent({
   name: "celestial-list",
   components: {
-    CelestialCard
+    CelestialCard,
+    CelestialFilters
   },
-  props: {
-    celestials: {
-      type: Array
+
+  // Initial state
+  data() {
+    return {
+      celestials: Array<any>(),
+      activeFilter: "all"
+    };
+  },
+
+  computed: {
+    sortedCelestials(): any {
+      if (this.activeFilter == "moons") {
+        return this.celestials.filter(e => e.type === "lune");
+      } else if (this.activeFilter == "planets") {
+        return this.celestials.filter(
+          e => e.type === "planète" || e.type === "planète à lunes"
+        );
+      } else if (this.activeFilter == "stars") {
+        return this.celestials.filter(e => e.type === "étoile");
+      } else if (this.activeFilter == "others") {
+        return this.celestials.filter(e => e.type === "autre");
+      } else {
+        return this.celestials;
+      }
+    }
+  },
+
+  mounted() {
+    // Fetches from API...
+    this.fetchCelestials().then(res => {
+      // ...and add type
+      this.celestials = this.addType(res);
+    });
+  },
+
+  methods: {
+    /**
+     * Fetches celestial bodies from API
+     */
+    fetchCelestials(): Promise<any> {
+      return axios
+        .get("https://api.le-systeme-solaire.net/rest/bodies/")
+        .then(res => {
+          return res.data.bodies;
+        })
+        .catch(err => {
+          console.log(err);
+          return [];
+        });
+    },
+
+    /**
+     * Assign a type from the celestial object provided
+     */
+    addType(bodies: Array<any>): Array<any> {
+      return bodies.map((e: any) => addCelestialType(e));
+    },
+
+    /**
+     * Applies the filter type to the data
+     */
+    filterCelestials(type: string) {
+      this.activeFilter = type;
     }
   }
 });
diff --git a/src/views/celestials/Celestials.vue b/src/views/celestials/Celestials.vue
index 744f357..0986c08 100644
--- a/src/views/celestials/Celestials.vue
+++ b/src/views/celestials/Celestials.vue
@@ -4,7 +4,7 @@
       <h1 class="heading-1">Le système solaire</h1>
     </header>
     <div class="section-content">
-      <celestials-list :celestials="celestials" />
+      <celestials-list />
     </div>
   </section>
 </template>
@@ -13,54 +13,10 @@
 import { defineComponent } from "vue";
 import CelestialsList from "@/components/celestials/CelestialsList.vue";
 
-// API
-import axios from "axios";
-// Global methods
-import { addCelestialType } from "@/plugins/methods";
-
 export default defineComponent({
   name: "Celestials",
   components: {
     CelestialsList
-  },
-
-  // Initial state
-  data() {
-    return {
-      celestials: Array<any>()
-    };
-  },
-
-  mounted() {
-    // Fetches from API...
-    this.fetchCelestials().then(res => {
-      // ...and add type
-      this.celestials = this.addType(res);
-    });
-  },
-
-  methods: {
-    /**
-     * Fetches celestial bodies from API
-     */
-    fetchCelestials(): Promise<any> {
-      return axios
-        .get("https://api.le-systeme-solaire.net/rest/bodies/")
-        .then(res => {
-          return res.data.bodies;
-        })
-        .catch(err => {
-          console.log(err);
-          return [];
-        });
-    },
-
-    /**
-     * Assign a type from the celestial object provided
-     */
-    addType(bodies: Array<any>): Array<any> {
-      return bodies.map((e: any) => addCelestialType(e));
-    }
   }
 });
 </script>
@@ -69,7 +25,7 @@ export default defineComponent({
 .celestials {
   position: relative;
   min-height: 100%;
-  padding: 25px 10%;
+  padding: 25px 5%;
 
   &:after {
     display: block;