diff --git a/components/InclusiveDictionary.vue b/components/InclusiveDictionary.vue
index 93942c48..e1990a5e 100644
--- a/components/InclusiveDictionary.vue
+++ b/components/InclusiveDictionary.vue
@@ -21,7 +21,7 @@
                     <T>nouns.submit.action</T>
                 </button>
             </div>
-            <div class="btn-group mb-3 d-none d-lg-flex bg-white category-filter">
+            <div class="btn-group mb-3 d-none d-md-flex bg-white category-filter">
                 <button v-for="category in config.nouns.inclusive.categories"
                    :class="['btn btn-sm', filter === ':' + category ? 'btn-primary' : 'btn-outline-primary']"
                    @click="filter = filter === ':' + category ? '' : ':' + category"
@@ -62,7 +62,7 @@
                         </li>
                     </ul>
 
-                    <small v-if="s.el.base && entries[s.el.base]">
+                    <div v-if="s.el.base && entries[s.el.base]" class="small">
                         <p><strong><T>nouns.edited</T>:</strong></p>
                         <ul class="list-untyled">
                             <li v-for="w in entries[s.el.base].insteadOf" class="text-strike"><LinkedText :text="w" noicons/></li>
@@ -75,7 +75,7 @@
                             </span>
                             </li>
                         </ul>
-                    </small>
+                    </div>
                 </td>
                 <td>
                     <ul class="list-untyled">
@@ -324,10 +324,12 @@
         }
     }
 
-    .text-filter {
-        * {
-            border-bottom-left-radius: 0;
-            border-bottom-right-radius: 0;
+    @include media-breakpoint-up('md', $grid-breakpoints) {
+        .text-filter {
+            * {
+                border-bottom-left-radius: 0;
+                border-bottom-right-radius: 0;
+            }
         }
     }
     .category-filter {
diff --git a/components/TermsDictionary.vue b/components/TermsDictionary.vue
index 1cd5c209..3ffaf33a 100644
--- a/components/TermsDictionary.vue
+++ b/components/TermsDictionary.vue
@@ -8,7 +8,7 @@
         </section>
 
         <section class="sticky-top">
-            <div class="input-group mb-3 bg-white">
+            <div class="input-group bg-white text-filter">
                 <span class="input-group-text">
                     <Icon v="filter"/>
                 </span>
@@ -21,6 +21,14 @@
                     <T>nouns.submit.action</T>
                 </button>
             </div>
+            <div class="btn-group mb-3 d-none d-md-flex bg-white category-filter">
+                <button v-for="category in config.nouns.terms.categories"
+                    :class="['btn btn-sm', filter === ':' + category ? 'btn-primary' : 'btn-outline-primary']"
+                    @click="filter = filter === ':' + category ? '' : ':' + category"
+                >
+                    {{ category }}
+                </button>
+            </div>
         </section>
 
         <Table :data="visibleEntries()" :columns="1" fixed :marked="(el) => !el.approved" ref="dictionarytable">
@@ -43,6 +51,14 @@
                         </template>
                     </p>
 
+                    <ul class="list-inline">
+                        <li v-for="category in s.el.categories" class="list-inline-item">
+                            <span class="badge bg-primary text-white">
+                                {{category}}
+                            </span>
+                        </li>
+                    </ul>
+
                     <p v-if="s.el.flags.length || s.el.images.length" class="text-center">
                         <img v-for="flag in s.el.flags" :src="`/flags/${flag}.png`" class="flag m-1"/>
                         <img v-for="image in s.el.images" :src="buildImageUrl(image, 'big')" class="flag m-1"/>
@@ -62,6 +78,14 @@
                                 </span>
                             </template>
                         </p>
+
+                        <ul class="list-inline">
+                            <li v-for="category in entries[s.el.base].categories" class="list-inline-item">
+                            <span class="badge bg-primary text-white">
+                                {{category}}
+                            </span>
+                            </li>
+                        </ul>
                     </div>
                 </td>
                 <td>
@@ -283,4 +307,20 @@
     .flag {
         height: 96px;
     }
+
+    @include media-breakpoint-up('md', $grid-breakpoints) {
+        .text-filter {
+            * {
+                border-bottom-left-radius: 0;
+                border-bottom-right-radius: 0;
+            }
+        }
+    }
+    .category-filter {
+        margin-top: -1px;
+        .btn {
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+    }
 </style>
diff --git a/components/TermsSubmitForm.vue b/components/TermsSubmitForm.vue
index 9df23585..6e29c405 100644
--- a/components/TermsSubmitForm.vue
+++ b/components/TermsSubmitForm.vue
@@ -39,13 +39,13 @@
             </div>
 
             <div class="form-group">
-                <label class="text-nowrap"><strong>
-                    <T>nouns.terms.category</T>
-                </strong></label>
-                <select v-model="form.category" class="form-control form-control-sm">
-                    <option value=""></option>
-                    <option v-for="category in config.nouns.terms.categories" :value="category">{{category}}</option>
-                </select>
+                <label><strong><T>nouns.terms.category</T>:</strong></label>
+                <a v-for="category in config.nouns.terms.categories"
+                   href="#" :class="['badge border mx-1 text-decoration-none', form.categories.includes(category) ? 'bg-primary text-white' : 'bg-light text-primary']"
+                   @click.prevent="form.categories = form.categories.includes(category) ? form.categories.filter(c => c !== category) : [...form.categories, category]"
+                >
+                    {{ category }}
+                </a>
             </div>
 
             <div class="row" v-if="$isGranted('terms')">
@@ -102,7 +102,7 @@
                     term: [''],
                     original: [],
                     definition: '',
-                    category: '',
+                    categories: [],
                     flags: [],
                     images: [],
                     base: null,
@@ -122,7 +122,7 @@
                         term: [''],
                         original: [],
                         definition: '',
-                        category: '',
+                        categories: [],
                         flags: [],
                         images: [],
                         base: null,
@@ -136,7 +136,7 @@
                     term: word.term,
                     original: word.original,
                     definition: word.definition,
-                    category: word.category,
+                    categories: word.categories,
                     flags: word.flags,
                     images: word.images,
                     base: word.id,
diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index 2b912b5e..2a6f4580 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -93,7 +93,6 @@ nouns:
             - 'orientacja seksualna'
             - 'orientacja romantyczna'
             - 'orientacja tertiarna'
-            - 'określenie orientacji romantycznej i seksualnej'
             - 'płeć'
             - 'ekspresja płciowa'
             - 'model relacji'
diff --git a/migrations/033-terms-multiple-categories.sql b/migrations/033-terms-multiple-categories.sql
new file mode 100644
index 00000000..e938e05f
--- /dev/null
+++ b/migrations/033-terms-multiple-categories.sql
@@ -0,0 +1,7 @@
+-- Up
+
+UPDATE terms SET category = 'orientacja seksualna,orientacja romantyczna' WHERE category='określenie orientacji romantycznej i seksualnej';
+
+-- Down
+
+UPDATE terms SET category = 'określenie orientacji romantycznej i seksualnej' WHERE category='orientacja seksualna,orientacja romantyczna';
diff --git a/server/routes/terms.js b/server/routes/terms.js
index 208e0ac7..c5cdf3b5 100644
--- a/server/routes/terms.js
+++ b/server/routes/terms.js
@@ -63,7 +63,7 @@ router.post('/terms/submit', handleErrorAsync(async (req, res) => {
             ${id},
             ${req.body.term.join('|')}, ${req.body.original.join('|')}, ${req.body.definition},
             0, ${req.body.base}, ${global.config.locale}, ${req.user ? req.user.id : null},
-            ${req.body.category}, ${JSON.stringify(req.body.flags)}, ${req.body.images}
+            ${req.body.categories.join(',')}, ${JSON.stringify(req.body.flags)}, ${req.body.images}
         )
     `);
 
diff --git a/src/classes.js b/src/classes.js
index 61910aa5..1414c6d4 100644
--- a/src/classes.js
+++ b/src/classes.js
@@ -725,7 +725,7 @@ export class TermsEntry {
         this.original = original ? original.split('|') : [];
         this.definition = definition;
         this.author = author;
-        this.category = category;
+        this.categories = category ? category.split(',') : [];
         this.flags = JSON.parse(flags);
         this.images = images ? images.split(',') : [];
         this.approved = !!approved;
@@ -737,6 +737,10 @@ export class TermsEntry {
             return true;
         }
 
+        if (filter.startsWith(':')) {
+            return this.categories.includes(filter.substring(1));
+        }
+
         for (let field of ['term', 'original']) {
             for (let value of this[field]) {
                 if (value.toLowerCase().indexOf(filter.toLowerCase()) > -1) {