diff --git a/components/PostCard.vue b/components/PostCard.vue
index 27f1977ae..450e69959 100644
--- a/components/PostCard.vue
+++ b/components/PostCard.vue
@@ -33,10 +33,11 @@
       <template slot="footer">
         <div style="display: inline-block; opacity: .5;">
           <ds-icon
-            v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
             v-for="category in post.categories"
             :key="category.id"
-            :name="category.icon" />&nbsp;
+            v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
+            :name="category.icon"
+          />&nbsp;
         </div>
         <div style="display: inline-block; float: right">
           <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
diff --git a/components/ShoutButton.vue b/components/ShoutButton.vue
index 5cb9030d3..075006b2e 100644
--- a/components/ShoutButton.vue
+++ b/components/ShoutButton.vue
@@ -8,7 +8,8 @@
       danger
       size="x-large"
       icon="bullhorn"
-      @click="shout" />
+      @click="shout"
+    />
     <ds-space margin-bottom="xx-small" />
     <ds-text color="soft">
       <ds-heading
diff --git a/pages/admin/categories.vue b/pages/admin/categories.vue
index 045542541..e09db79c0 100644
--- a/pages/admin/categories.vue
+++ b/pages/admin/categories.vue
@@ -1,13 +1,17 @@
 <template>
   <ds-card space="small">
-    <ds-heading tag="h3">Themen / Kategorien</ds-heading>
+    <ds-heading tag="h3">
+      Themen / Kategorien
+    </ds-heading>
     <ds-table
       :data="Category"
       :fields="['icon', 'name', 'postCount']"
-      condensed>
+      condensed
+    >
       <template
         slot="icon"
-        slot-scope="scope">
+        slot-scope="scope"
+      >
         <ds-icon :name="scope.row.icon" />
       </template>
     </ds-table>
diff --git a/pages/admin/tags.vue b/pages/admin/tags.vue
index 45ab9a2a3..a0866fb8e 100644
--- a/pages/admin/tags.vue
+++ b/pages/admin/tags.vue
@@ -1,13 +1,17 @@
 <template>
   <ds-card space="small">
-    <ds-heading tag="h3">Tags</ds-heading>
+    <ds-heading tag="h3">
+      Tags
+    </ds-heading>
     <ds-table
       :data="Tag"
       :fields="fields"
-      condensed>
+      condensed
+    >
       <template
         slot="id"
-        slot-scope="scope">
+        slot-scope="scope"
+      >
         {{ scope.index + 1 }}
       </template>
     </ds-table>
diff --git a/pages/post/_slug/index.vue b/pages/post/_slug/index.vue
index 243858f68..949263e95 100644
--- a/pages/post/_slug/index.vue
+++ b/pages/post/_slug/index.vue
@@ -24,11 +24,12 @@
     />
     <!-- Categories -->
     <ds-icon
-      v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
       v-for="category in post.categories"
       :key="category.id"
+      v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
       :name="category.icon"
-      size="large" />&nbsp;
+      size="large"
+    />&nbsp;
     <ds-space margin-bottom="small" />
     <!--<div class="tags">
       <ds-icon name="compass" /> <ds-tag
@@ -37,7 +38,7 @@
       >
         {{ category.name }}
       </ds-tag>
-    </div>
+    </div>-->
     <!-- Tags -->
     <template v-if="post.tags && post.tags.length">
       <ds-space margin="xx-small" />
diff --git a/pages/post/_slug/more-info.vue b/pages/post/_slug/more-info.vue
index 7d96679fd..fc3e20421 100644
--- a/pages/post/_slug/more-info.vue
+++ b/pages/post/_slug/more-info.vue
@@ -7,12 +7,12 @@
     <ds-space />
     <h3><ds-icon name="compass" /> Themenkategorien</h3>
     <div class="tags">
-      <ds-icon
-        v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
+      <ds-tag
         v-for="category in post.categories"
         :key="category.id"
+        v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
       >
-        {{ category.name }}
+        <ds-icon :name="category.icon" /> {{ category.name }}
       </ds-tag>
     </div>
     <template v-if="post.tags && post.tags.length">
diff --git a/pages/profile/_slug.vue b/pages/profile/_slug.vue
index b99945946..f55ed7d37 100644
--- a/pages/profile/_slug.vue
+++ b/pages/profile/_slug.vue
@@ -28,7 +28,8 @@
             <ds-text
               align="center"
               color="soft"
-              size="small">
+              size="small"
+            >
               Mitglied seit {{ user.createdAt | date('MMMM yyyy') }}
             </ds-text>
           </ds-space>
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index bacf5769c..9562ece58 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -5,29 +5,37 @@
       v-model="form.name"
       icon="user"
       label="Dein Name"
-      placeholder="Dein Name"/>
+      placeholder="Dein Name"
+    />
+    <!-- eslint-disable vue/use-v-on-exact -->
     <ds-select
       id="city"
-      :options="cities"
       v-model="city"
+      :options="cities"
       icon="map-marker"
       label="Deine Stadt"
       placeholder="Deine Stadt"
       @input="handleCitySelection"
-      @input.native="handleCityInput" />
+      @input.native="handleCityInput"
+    />
+    <!-- eslint-enable vue/use-v-on-exact -->
     <ds-input
       id="bio"
       v-model="form.about"
       type="textarea"
       rows="3"
       label="Erzähl doch ein wenig (in zwei Sätzen) über dich"
-      placeholder="Über mich"/>
+      placeholder="Über mich"
+    />
     <template slot="footer">
       <ds-button
         style="float: right;"
         icon="check"
         primary
-        @click.prevent="submit">Speichern</ds-button>
+        @click.prevent="submit"
+      >
+        Speichern
+      </ds-button>
     </template>
   </ds-card>
 </template>
@@ -110,7 +118,6 @@ export default {
           // and then with the real result of the mutation
           update: (store, { data: { UpdateUser } }) => {
             // this.$store.dispatch('auth/refresh', UpdateUser)
-
             // Read the data from our cache for this query.
             // const data = store.readQuery({ query: TAGS_QUERY })
             // Add our tag from the mutation to the end
diff --git a/styleguide/src/system/components/data-input/shared/input.scss b/styleguide/src/system/components/data-input/shared/input.scss
index adbfa7489..2a880c28e 100755
--- a/styleguide/src/system/components/data-input/shared/input.scss
+++ b/styleguide/src/system/components/data-input/shared/input.scss
@@ -84,15 +84,6 @@
     }
   }
 
-    .ds-input-size-small & {
-      width: $input-height-small;
-    }
-
-    .ds-input-size-large & {
-      width: $input-height-large;
-    }
-  }
-
   .#{$class}-icon-right {
     right: 0;
     left: auto;