diff --git a/.gitignore b/.gitignore
index 0de8272fc..292c993d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,6 @@ static/uploads
 
 cypress/videos
 cypress/screenshots/
+
+# Apple macOS folder attribute file
+.DS_Store
diff --git a/components/SearchInput.vue b/components/SearchInput.vue
index d9cd21290..9f5a8e293 100644
--- a/components/SearchInput.vue
+++ b/components/SearchInput.vue
@@ -6,19 +6,19 @@
     :class="{ 'is-active': isActive }"
   >
     <div class="field">
-      <div class="control has-icons-left has-icons-right">
+      <div class="control">
         <ds-input
           :id="id"
           ref="input"
           v-model="searchValue"
-          v-focus="focus"
           class="input"
           name="search"
-          type="text"
+          type="search"
           icon="search"
+          icon-right="times-circle"
           :placeholder="$t('search.placeholder')"
-          @keyup.exact="onInput"
-          @keyup.enter="onEnter"
+          @input="handleInput"
+          @keyup.native.enter="onEnter"
         />
       </div>
     </div>
@@ -43,22 +43,20 @@ export default {
     delay: {
       type: Number,
       default: 700
-    },
-    focus: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
     return {
+      // #: Bind to input text.
       searchValue: '',
       // #: Returned ID value of the timer given by "setTimeout()".
       searchProcess: null,
       // #!: Seems to be unused (unquestioned).
-      searching: false
+      typing: false
     }
   },
   computed: {
+    // #: Unused at the moment?
     isActive() {
       return !isEmpty(this.searchValue)
     }
@@ -82,10 +80,10 @@ export default {
         this.searchValue = this.value.toString()
       }
     },
-    onInput() {
+    handleInput() {
       // #: Prevent "setTimeout()" to call parameter function after "delay".
       clearTimeout(this.searchProcess)
-      this.searching = true
+      this.typing = true
       // skip on less then three letters
       if (this.searchValue && this.searchValue.toString().length < 3) {
         return
@@ -96,7 +94,7 @@ export default {
       }
       // #: Calls function in first parameter after a delay of "this.delay" milliseconds.
       this.searchProcess = setTimeout(() => {
-        this.searching = false
+        this.typing = false
         //-- avoid querying for dev -- this.$emit('search', this.searchValue.toString())
       }, this.delay)
     },
@@ -108,13 +106,14 @@ export default {
         // #: Prevent "setTimeout()" to call parameter function after "delay".
         clearTimeout(this.searchProcess)
       })
-      this.searching = false
+      this.typing = false
       //-- avoid querying for dev -- this.$emit('search', this.searchValue.toString())
+      console.log('Enter !!!!')
     },
     clear() {
       // #: Prevent "setTimeout()" to call parameter function after "delay".
       clearTimeout(this.searchProcess)
-      this.searching = false
+      this.typing = false
       this.searchValue = ''
       if (this.value !== this.searchValue) {
         //-- avoid querying for dev -- this.$emit('search', '')
@@ -187,14 +186,4 @@ export default {
     color: hsl(0, 0%, 71%);
   }
 }
-
-.input,
-.has-icons-left,
-.has-icons-right {
-  .icon,
-  i {
-    // color: lighten($grey-light, 15%);
-    transition: color 150ms ease-out !important;
-  }
-}
 </style>
diff --git a/locales/de.json b/locales/de.json
index 8ae7373c9..ae7cb46da 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -26,7 +26,7 @@
     "commented": "Kommentiert"
   },
   "search": {
-    "placeholder": "Suchen …"
+    "placeholder": "Suchen"
   },
   "settings": {
     "name": "Einstellungen",
diff --git a/locales/en.json b/locales/en.json
index 611a4a1e0..2bf0affc2 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -26,7 +26,7 @@
     "commented": "Commented"
   },
   "search": {
-    "placeholder": "Search …"
+    "placeholder": "Search"
   },
   "settings": {
     "name": "Settings",
diff --git a/styleguide/src/system/icons/svg/times-circle.svg b/styleguide/src/system/icons/svg/times-circle.svg
new file mode 100644
index 000000000..acf70ce3b
--- /dev/null
+++ b/styleguide/src/system/icons/svg/times-circle.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>times-circle</title>
+<path d="M16 3c7.168 0 13 5.832 13 13s-5.832 13-13 13-13-5.832-13-13 5.832-13 13-13zM16 5c-6.087 0-11 4.913-11 11s4.913 11 11 11 11-4.913 11-11-4.913-11-11-11zM12.219 10.781l3.781 3.781 3.781-3.781 1.438 1.438-3.781 3.781 3.781 3.781-1.438 1.438-3.781-3.781-3.781 3.781-1.438-1.438 3.781-3.781-3.781-3.781z"></path>
+</svg>