diff --git a/components/ButtonList.vue b/components/ButtonList.vue
new file mode 100644
index 00000000..5be50c2f
--- /dev/null
+++ b/components/ButtonList.vue
@@ -0,0 +1,69 @@
+<template>
+    <div>
+        <draggable tag="ul" v-model="iVal" ghostClass="ghost" @end="$emit('input', iVal)" :group="ulid"
+                   class="list-inline border rounded drop-empty px-3 py-2">
+            <li v-for="val in iVal" class="list-inline-item py-1">
+                <a href="#" class="badge badge-light border p-2" @click.prevent>
+                    <slot v-bind:v="val" v-bind:desc="options[val]">
+                        {{ val }}
+                    </slot>
+                </a>
+            </li>
+        </draggable>
+
+        <draggable tag="ul" v-model="remainingOptions" ghostClass="ghost" @end="$emit('input', iVal)" class="list-inline" :group="ulid">
+            <li v-for="val in remainingOptions" class="list-inline-item py-1">
+                <a href="#" class="badge badge-light p-2" @click.prevent>
+                    <slot v-bind:v="val" v-bind:desc="options[val]">
+                        {{ val }}
+                    </slot>
+                </a>
+            </li>
+        </draggable>
+    </div>
+</template>
+
+<script>
+    import draggable from 'vuedraggable';
+    import { ulid } from 'ulid';
+
+    export default {
+        components: {
+            draggable,
+        },
+        props: {
+            value: {},
+            options: {},
+        },
+        data() {
+            return {
+                iVal: this.value,
+                remainingOptions: this.buildRemainingOptions(),
+                ulid: ulid(),
+            }
+        },
+        watch: {
+            value() {
+                this.iVal = this.value;
+                this.remainingOptions = this.buildRemainingOptions();
+            },
+        },
+        methods: {
+            buildRemainingOptions() {
+                return Object.keys(this.options).filter(o => !this.value.includes(o));
+            },
+        },
+    }
+</script>
+
+
+<style lang="scss" scoped>
+    .ghost {
+        opacity: 0.5;
+        background: #c8ebfb;
+    }
+
+    .drop-empty:empty {
+        min-height: 3em;
+    }
+</style>
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 31ebf1ed..9583c5d4 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -690,6 +690,8 @@ profile:
     words: 'Słowa'
     birthday: 'Wiek'
     birthdayInfo: 'Nie pokazujemy publicznie pełnej daty urodzenia, jedynie obliczony wiek.'
+    flags: 'Flagi'
+    flagsInfo: 'Przeciągnij swoje pride''owe flagi do poniższej ramki.'
     links: 'Linki'
     column: 'Kolumna'
 
diff --git a/nuxt.config.js b/nuxt.config.js
index 9157a007..6494910e 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,6 +1,7 @@
 import translations from './server/translations';
 import config from './server/config';
 import fs from 'fs';
+import {buildDict} from "./src/helpers";
 
 const locale = config.locale;
 const title = translations.title;
@@ -87,6 +88,16 @@ export default {
         BASE_URL: process.env.BASE_URL,
         PUBLIC_KEY: fs.readFileSync(__dirname + '/keys/public.pem').toString(),
         LOCALE: config.locale,
+        FLAGS: buildDict(function *() {
+            for (let flag of fs.readdirSync(__dirname + '/static/flags/')) {
+                yield [
+                    flag.replace(new RegExp('\.png$'), ''),
+                    flag.replace(new RegExp('\.png$'), '')
+                        .replace(new RegExp('_', 'g'), '')
+                        .trim()
+                ];
+            }
+        }),
     },
     serverMiddleware: {
         '/': bodyParser.json(),
diff --git a/routes/profile.vue b/routes/profile.vue
index be23364c..663e76b3 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -33,7 +33,7 @@
             </p>
         </section>
 
-        <section v-if="Object.keys(profile.links).length">
+        <section v-if="profile.links.length">
             <ul class="list-inline">
                 <li v-for="link in profile.links" class="list-inline-item pr-2">
                     <ProfileLink :link="link"/>
@@ -41,10 +41,10 @@
             </ul>
         </section>
 
-        <section v-if="Object.keys(profile.flags).length">
+        <section v-if="profile.flags.length">
             <ul class="list-inline">
-                <li v-for="(name, flag) in profile.flags" class="list-inline-item pr-2">
-                    <Flag :name="name" :src="`/flags/${flag}.png`"/>
+                <li v-for="flag in profile.flags" class="list-inline-item pr-2">
+                    <Flag :name="allFlags[flag]" :src="`/flags/${flag}.png`"/>
                 </li>
             </ul>
         </section>
@@ -102,6 +102,7 @@
                 username: this.$route.params.pathMatch,
                 profiles: {},
                 glue: ' ' + this.$t('template.or') + ' ',
+                allFlags: process.env.FLAGS,
             }
         },
         async asyncData({ app, route }) {
diff --git a/routes/profileEditor.vue b/routes/profileEditor.vue
index eea3669d..4ea2010d 100644
--- a/routes/profileEditor.vue
+++ b/routes/profileEditor.vue
@@ -28,10 +28,10 @@
                     <Icon v="link"/>
                     <T>profile.pronouns</T>
                 </h3>
-                <OpinionListInput v-model="pronouns"/>
-                <p class="small text-muted">
+                <p class="small text-muted mb-0">
                     <T>profile.pronounsInfo</T>
                 </p>
+                <OpinionListInput v-model="pronouns"/>
             </div>
 
             <div class="form-group">
@@ -42,6 +42,19 @@
                 <textarea class="form-control" v-model="description" maxlength="256" rows="4"/>
             </div>
 
+            <div class="form-group">
+                <h3 class="h4">
+                    <Icon v="flag"/>
+                    <T>profile.flags</T>
+                </h3>
+                <p class="small text-muted mb-0">
+                    <T>profile.flagsInfo</T>
+                </p>
+                <ButtonList v-model="flags" :options="allFlags" v-slot="s">
+                    <Flag :name="s.desc" :src="`/flags/${s.v}.png`"/>
+                </ButtonList>
+            </div>
+
             <div class="form-group">
                 <h3 class="h4">
                     <Icon v="link"/>
@@ -57,10 +70,10 @@
                     <Icon v="birthday-cake"/>
                     <T>profile.birthday</T>
                 </h3>
-                <input type="date" class="form-control" v-model="birthday"/>
-                <p class="small text-muted">
+                <p class="small text-muted mb-0">
                     <T>profile.birthdayInfo</T>
                 </p>
+                <input type="date" class="form-control" v-model="birthday"/>
             </div>
 
             <div class="form-group">
@@ -100,6 +113,7 @@
         data() {
             return {
                 saving: false,
+                allFlags: process.env.FLAGS,
             };
         },
         async asyncData({ app, store }) {
@@ -123,7 +137,7 @@
                         description: profile.description,
                         birthday: profile.birthday,
                         links: Object.keys(profile.links).length ? profile.links : [],
-                        flags: dictToList(profile.flags),
+                        flags: profile.flags,
                         words: profile.words.map(x => dictToList(x)),
                     };
                 }
@@ -140,7 +154,7 @@
                     description: '',
                     birthday: profile.birthday,
                     links: Object.keys(profile.links).length ? profile.links : [],
-                    flags: dictToList(profile.flags),
+                    flags: profile.flags,
                     words: defaultWords,
                 };
             }
@@ -166,8 +180,8 @@
                     pronouns: listToDict(this.pronouns),
                     description: this.description,
                     birthday: this.birthday,
-                    links: this.links,
-                    flags: listToDict(this.flags),
+                    links: [...this.links],
+                    flags: [...this.flags],
                     words: this.words.map(x => listToDict(x)),
                 }, { headers: this.$auth() });
                 this.saving = false;
diff --git a/static/flags/Achillean.png b/static/flags/Achillean.png
new file mode 100644
index 00000000..8d6720df
Binary files /dev/null and b/static/flags/Achillean.png differ
diff --git a/static/flags/Agender.png b/static/flags/Agender.png
new file mode 100644
index 00000000..0a3f828c
Binary files /dev/null and b/static/flags/Agender.png differ
diff --git a/static/flags/Aroace.png b/static/flags/Aroace.png
new file mode 100644
index 00000000..36a0ed37
Binary files /dev/null and b/static/flags/Aroace.png differ
diff --git a/static/flags/Aromantic.png b/static/flags/Aromantic.png
new file mode 100644
index 00000000..0e87e890
Binary files /dev/null and b/static/flags/Aromantic.png differ
diff --git a/static/flags/Asexual.png b/static/flags/Asexual.png
new file mode 100644
index 00000000..ac2cfb85
Binary files /dev/null and b/static/flags/Asexual.png differ
diff --git a/static/flags/Bear.png b/static/flags/Bear.png
new file mode 100644
index 00000000..c300f3f2
Binary files /dev/null and b/static/flags/Bear.png differ
diff --git a/static/flags/Bisexual.png b/static/flags/Bisexual.png
new file mode 100644
index 00000000..6d5c92d0
Binary files /dev/null and b/static/flags/Bisexual.png differ
diff --git a/static/flags/Demiboy.png b/static/flags/Demiboy.png
new file mode 100644
index 00000000..8f6af14d
Binary files /dev/null and b/static/flags/Demiboy.png differ
diff --git a/static/flags/Demigirl.png b/static/flags/Demigirl.png
new file mode 100644
index 00000000..388f0e2c
Binary files /dev/null and b/static/flags/Demigirl.png differ
diff --git a/static/flags/Diamoric.png b/static/flags/Diamoric.png
new file mode 100644
index 00000000..4f76e230
Binary files /dev/null and b/static/flags/Diamoric.png differ
diff --git a/static/flags/Gay.png b/static/flags/Gay.png
new file mode 100644
index 00000000..d9d2ab26
Binary files /dev/null and b/static/flags/Gay.png differ
diff --git a/static/flags/Genderfluid.png b/static/flags/Genderfluid.png
new file mode 100644
index 00000000..7132443b
Binary files /dev/null and b/static/flags/Genderfluid.png differ
diff --git a/static/flags/Genderqueer.png b/static/flags/Genderqueer.png
new file mode 100644
index 00000000..fc781fb0
Binary files /dev/null and b/static/flags/Genderqueer.png differ
diff --git a/static/flags/Intersex.png b/static/flags/Intersex.png
new file mode 100644
index 00000000..7bdd62cf
Binary files /dev/null and b/static/flags/Intersex.png differ
diff --git a/static/flags/LGBTQ.png b/static/flags/LGBTQ.png
new file mode 100644
index 00000000..d9d2ab26
Binary files /dev/null and b/static/flags/LGBTQ.png differ
diff --git a/static/flags/Leather Pride.png b/static/flags/Leather Pride.png
new file mode 100644
index 00000000..643b85d8
Binary files /dev/null and b/static/flags/Leather Pride.png differ
diff --git a/static/flags/Lesbian.png b/static/flags/Lesbian.png
new file mode 100644
index 00000000..c9d239ab
Binary files /dev/null and b/static/flags/Lesbian.png differ
diff --git a/static/flags/Lesbian_.png b/static/flags/Lesbian_.png
new file mode 100644
index 00000000..3d9043eb
Binary files /dev/null and b/static/flags/Lesbian_.png differ
diff --git a/static/flags/Lipstick Lesbian.png b/static/flags/Lipstick Lesbian.png
new file mode 100644
index 00000000..1e3872c8
Binary files /dev/null and b/static/flags/Lipstick Lesbian.png differ
diff --git a/static/flags/Lipstick Lesbian_.png b/static/flags/Lipstick Lesbian_.png
new file mode 100644
index 00000000..72cfd9f9
Binary files /dev/null and b/static/flags/Lipstick Lesbian_.png differ
diff --git a/static/flags/Nonbinary.png b/static/flags/Nonbinary.png
new file mode 100644
index 00000000..6e8a50b3
Binary files /dev/null and b/static/flags/Nonbinary.png differ
diff --git a/static/flags/Pansexual.png b/static/flags/Pansexual.png
new file mode 100644
index 00000000..ea7843a8
Binary files /dev/null and b/static/flags/Pansexual.png differ
diff --git a/static/flags/Polyamorous.png b/static/flags/Polyamorous.png
new file mode 100644
index 00000000..f70fffea
Binary files /dev/null and b/static/flags/Polyamorous.png differ
diff --git a/static/flags/Polyamorous_.png b/static/flags/Polyamorous_.png
new file mode 100644
index 00000000..e03b8c58
Binary files /dev/null and b/static/flags/Polyamorous_.png differ
diff --git a/static/flags/Polyamorous__.png b/static/flags/Polyamorous__.png
new file mode 100644
index 00000000..5318c2c8
Binary files /dev/null and b/static/flags/Polyamorous__.png differ
diff --git a/static/flags/Polysexual.png b/static/flags/Polysexual.png
new file mode 100644
index 00000000..aa4f1e7d
Binary files /dev/null and b/static/flags/Polysexual.png differ
diff --git a/static/flags/progress_pride.png b/static/flags/Progress Pride.png
similarity index 100%
rename from static/flags/progress_pride.png
rename to static/flags/Progress Pride.png
diff --git a/static/flags/Rubber Pride.png b/static/flags/Rubber Pride.png
new file mode 100644
index 00000000..e142b70f
Binary files /dev/null and b/static/flags/Rubber Pride.png differ
diff --git a/static/flags/Sapphic.png b/static/flags/Sapphic.png
new file mode 100644
index 00000000..312f794d
Binary files /dev/null and b/static/flags/Sapphic.png differ
diff --git a/static/flags/Straight Ally.png b/static/flags/Straight Ally.png
new file mode 100644
index 00000000..4dfdd491
Binary files /dev/null and b/static/flags/Straight Ally.png differ
diff --git a/static/flags/TeamLocked Pride.png b/static/flags/TeamLocked Pride.png
new file mode 100644
index 00000000..17e0c555
Binary files /dev/null and b/static/flags/TeamLocked Pride.png differ
diff --git a/static/flags/Toric.png b/static/flags/Toric.png
new file mode 100644
index 00000000..387dfea3
Binary files /dev/null and b/static/flags/Toric.png differ
diff --git a/static/flags/Transgender.png b/static/flags/Transgender.png
new file mode 100644
index 00000000..546cac44
Binary files /dev/null and b/static/flags/Transgender.png differ
diff --git a/static/flags/Trixic.png b/static/flags/Trixic.png
new file mode 100644
index 00000000..825adecb
Binary files /dev/null and b/static/flags/Trixic.png differ
diff --git a/static/flags/european.png b/static/flags/european.png
deleted file mode 100644
index 708a5fbb..00000000
Binary files a/static/flags/european.png and /dev/null differ