diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
index 7377a782b90..3dce5e6299a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
@@ -1,7 +1,7 @@
 <div class="field">{{i18n name}}</div>
 <div class="value">
   {{#if editing}}
-    {{text-field value=buffer autofocus="autofocus" autocomplete="discourse"}}
+    {{text-field value=buffer autofocus="autofocus" autocomplete="off"}}
   {{else}}
     <a href {{action "edit"}} class="inline-editable-field">
       <span>{{value}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs b/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
index 3e78f77b059..ab94ad2e39f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
@@ -26,9 +26,10 @@
     value=newValue
     placeholderKey="admin.site_settings.simple_list.add_item"
     class="add-value-input"
-    autocomplete="discourse"
+    autocomplete="off"
     autocorrect="off"
-    autocapitalize="off"}}
+    autocapitalize="off"
+  }}
 
   {{d-button
       action=(action "addValue")
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
index ab342b1b930..5639dc42c1e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
@@ -20,7 +20,8 @@
       {{input
         class="filter-input"
         placeholder=(i18n "admin.customize.theme.filter_placeholder")
-        autocomplete="discourse"
+        autocomplete="off"
+        type="search"
         value=(mut filterTerm)
       }}
       {{d-icon "search"}}
diff --git a/app/assets/javascripts/discourse/app/components/search-text-field.js b/app/assets/javascripts/discourse/app/components/search-text-field.js
index cad882f85c5..520a90c5525 100644
--- a/app/assets/javascripts/discourse/app/components/search-text-field.js
+++ b/app/assets/javascripts/discourse/app/components/search-text-field.js
@@ -4,7 +4,7 @@ import TextField from "discourse/components/text-field";
 import { applySearchAutocomplete } from "discourse/lib/search";
 
 export default TextField.extend({
-  autocomplete: "discourse-search",
+  autocomplete: "off",
 
   @discourseComputed("searchService.searchContextEnabled")
   placeholder(searchContextEnabled) {
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
index 56674525f17..55f7302f1e1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
@@ -5,7 +5,7 @@
   placeholderKey=composer.titlePlaceholder
   aria-label=(I18n composer.titlePlaceholder)
   disabled=disabled
-  autocomplete="discourse"
+  autocomplete="off"
 }}
 
 {{popup-input-tip validation=validation}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index b424143c3da..c1be4f69785 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -43,7 +43,7 @@
 
       {{conditional-loading-spinner condition=loading}}
       {{d-textarea
-        autocomplete="discourse"
+        autocomplete="off"
         tabindex=tabindex
         value=value
         class="d-editor-input"
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index 5584b496d44..6de3a63fd31 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -24,7 +24,8 @@
           class="filter"
           name="filter"
           placeholder=(i18n "emoji_picker.filter_placeholder")
-          autocomplete="discourse"
+          autocomplete="off"
+          type="search"
           autocorrect="off"
           autocapitalize="off"
           input=(action "onFilter")
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index 86aaea824b3..71c929e1379 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -4,7 +4,7 @@
       {{text-field
         value=filterInput
         placeholderKey=filterPlaceholder
-        autocomplete="discourse"
+        autocomplete="off"
         class="group-username-filter no-blur"
       }}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index cacd25edc79..cda2c355421 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -70,7 +70,7 @@
                 {{/if}}
 
                 <div class="input username-input input-group">
-                  {{input value=accountUsername class=(value-entered accountUsername) id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
+                  {{input value=accountUsername class=(value-entered accountUsername) id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
                   <label class="alt-placeholder" for="new-account-username">
                     {{i18n "user.username.title"}}
                     <span class="required">*</span>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
index 1da73125c3a..cb5bf2d6e48 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
@@ -2,7 +2,7 @@
   {{text-field
     value=filterInput
     placeholderKey=filterPlaceholder
-    autocomplete="discourse"
+    autocomplete="off"
     class="group-username-filter no-blur"
   }}
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index 3709f623b4f..ddb5cf59b9a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -49,7 +49,7 @@
                   maxlength=maxUsernameLength
                   aria-describedby="username-validation"
                   aria-invalid=usernameValidation.failed
-                  autocomplete="discourse"
+                  autocomplete="off"
                 }}
                 <label class="alt-placeholder" for="new-account-username">
                   {{i18n "user.username.title"}}
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index 105ce3924df..d9d8583c66f 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -12,7 +12,9 @@
         value=searchTerm
         placeholder=(i18n "bookmarks.search_placeholder")
         enter=(action "search")
-        id="bookmark-search" autocomplete="discourse"}}
+        id="bookmark-search"
+        autocomplete="off"
+      }}
       {{d-button
         class="btn-primary"
         action=(action "search")
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
index 9dc5578a85b..d213fed5a8f 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
@@ -4,7 +4,7 @@
     tabindex=0
     class="filter-input"
     placeholder=placeholder
-    autocomplete="discourse"
+    autocomplete="off"
     autocorrect="off"
     autocapitalize="off"
     name="filter-input-search"
@@ -14,6 +14,7 @@
     paste=(action "onPaste")
     keyDown=(action "onKeydown")
     keyUp=(action "onKeyup")
+    type="search"
   }}
 
   {{#if selectKit.options.filterIcon}}
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 6d79f84b538..9b253d36b8e 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -230,6 +230,14 @@ input {
   }
 }
 
+input[type="search"] {
+  &::-webkit-search-cancel-button,
+  &::-webkit-search-decoration {
+    -webkit-appearance: none;
+    appearance: none;
+  }
+}
+
 // Fixes Safari height inconsistency
 ::-webkit-datetime-edit {
   display: inline;