diff --git a/webapp/channels/src/components/browse_channels/browse_channels.scss b/webapp/channels/src/components/browse_channels/browse_channels.scss
index e6f0fd7fbc..cee7a26783 100644
--- a/webapp/channels/src/components/browse_channels/browse_channels.scss
+++ b/webapp/channels/src/components/browse_channels/browse_channels.scss
@@ -9,24 +9,24 @@
 
         .input-clear {
             top: 16px;
-            right: 46px;
+            right: 14px;
         }
 
         #searchIcon {
             position: absolute;
             z-index: 2;
             top: 16px;
-            left: 46px;
+            left: 42px;
             color: rgba(var(--center-channel-color-rgb), 0.64);
             pointer-events: none;
         }
 
         #searchChannelsTextbox {
             height: 48px;
-            padding-left: 40px;
             border: 1px solid rgba(var(--center-channel-color-rgb), 0.16);
             box-shadow: none;
             font-size: 16px;
+            padding-inline: 40px;
 
             &::placeholder {
                 color: var(--center-channel-color);
@@ -250,6 +250,7 @@
         margin-top: 8px;
         color: var(--center-channel-color);
         line-height: 28px;
+        word-wrap: break-word;
     }
 
     .secondary-message {
diff --git a/webapp/channels/src/components/browse_channels/browse_channels.tsx b/webapp/channels/src/components/browse_channels/browse_channels.tsx
index 8fe686e58e..1e6ca8be12 100644
--- a/webapp/channels/src/components/browse_channels/browse_channels.tsx
+++ b/webapp/channels/src/components/browse_channels/browse_channels.tsx
@@ -371,9 +371,9 @@ export default class BrowseChannels extends React.PureComponent<Props, State> {
 
         return (
             <GenericModal
-                onExited={this.handleExit}
                 id='browseChannelsModal'
                 aria-labelledby='browseChannelsModalLabel'
+                onExited={this.handleExit}
                 compassDesign={true}
                 modalHeaderText={title}
                 headerButton={createNewChannelButton('btn-secondary btn-sm')}
diff --git a/webapp/channels/src/components/custom_status/custom_status.scss b/webapp/channels/src/components/custom_status/custom_status.scss
index 981da22d10..3660d747f5 100644
--- a/webapp/channels/src/components/custom_status/custom_status.scss
+++ b/webapp/channels/src/components/custom_status/custom_status.scss
@@ -1,7 +1,7 @@
 .modal .StatusModal.GenericModal .StatusModal__clear-container.input-clear {
     position: absolute;
     top: 16px;
-    right: 20px;
+    right: 18px;
     color: rgba(var(--center-channel-color-rgb), 0.64);
     opacity: 1;
 }
diff --git a/webapp/channels/src/components/quick_input/quick_input.tsx b/webapp/channels/src/components/quick_input/quick_input.tsx
index edad41e638..09255766b6 100644
--- a/webapp/channels/src/components/quick_input/quick_input.tsx
+++ b/webapp/channels/src/components/quick_input/quick_input.tsx
@@ -92,7 +92,6 @@ export class QuickInput extends React.PureComponent<Props> {
         delayInputUpdate: false,
         value: '',
         clearable: false,
-        tooltipPosition: 'bottom',
     };
 
     componentDidMount() {
@@ -133,7 +132,7 @@ export class QuickInput extends React.PureComponent<Props> {
         this.input = input;
     };
 
-    private onClear = (e: React.MouseEvent<HTMLDivElement> | React.TouchEvent) => {
+    private onClear = (e: React.MouseEvent<HTMLButtonElement> | React.TouchEvent) => {
         e.preventDefault();
         e.stopPropagation();
 
@@ -187,29 +186,28 @@ export class QuickInput extends React.PureComponent<Props> {
         );
 
         const showClearButton = this.props.onClear && (clearableWithoutValue || (clearable && value));
-        return (<div className='input-wrapper'>
-            {inputElement}
-            {showClearButton &&
-            <div
-                data-testid='input-clear'
-                className={classNames(clearClassName, 'input-clear visible')}
-                onMouseDown={this.onClear}
-                onTouchEnd={this.onClear}
-                role='button'
-            >
-                <WithTooltip
-                    title={clearableTooltipText}
-                >
-                    <span
-                        className='input-clear-x'
-                        aria-hidden='true'
-                    >
-                        <i className='icon icon-close-circle'/>
-                    </span>
-                </WithTooltip>
+
+        return (
+            <div className='input-wrapper'>
+                {inputElement}
+                {showClearButton && (
+                    <WithTooltip title={clearableTooltipText}>
+                        <button
+                            data-testid='input-clear'
+                            className={classNames(clearClassName, 'input-clear visible')}
+                            onClick={this.onClear}
+                        >
+                            <span
+                                className='input-clear-x'
+                                aria-hidden='true'
+                            >
+                                <i className='icon icon-close-circle'/>
+                            </span>
+                        </button>
+                    </WithTooltip>
+                )}
             </div>
-            }
-        </div>);
+        );
     }
 }
 
diff --git a/webapp/channels/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap b/webapp/channels/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
index 00dc93e261..56335de057 100644
--- a/webapp/channels/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
+++ b/webapp/channels/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
@@ -43,10 +43,9 @@ exports[`components/search_bar/SearchBar should match snapshot with search 1`] =
             type="search"
             value="test"
           />
-          <div
+          <button
             class="input-clear visible"
             data-testid="input-clear"
-            role="button"
           >
             <span
               aria-hidden="true"
@@ -56,7 +55,7 @@ exports[`components/search_bar/SearchBar should match snapshot with search 1`] =
                 class="icon icon-close-circle"
               />
             </span>
-          </div>
+          </button>
         </div>
       </div>
     </form>
@@ -115,10 +114,9 @@ exports[`components/search_bar/SearchBar should match snapshot with search, with
             type="search"
             value="test"
           />
-          <div
+          <button
             class="input-clear visible"
             data-testid="input-clear"
-            role="button"
           >
             <span
               aria-hidden="true"
@@ -128,7 +126,7 @@ exports[`components/search_bar/SearchBar should match snapshot with search, with
                 class="icon icon-close-circle"
               />
             </span>
-          </div>
+          </button>
         </div>
       </div>
     </form>
diff --git a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
index a014ebaf86..a267334634 100644
--- a/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
+++ b/webapp/channels/src/components/user_group_popover/__snapshots__/user_group_popover.test.tsx.snap
@@ -194,7 +194,6 @@ exports[`component/user_group_popover should match snapshot 1`] = `
                   onChange={[Function]}
                   onClear={[Function]}
                   placeholder="Search members"
-                  tooltipPosition="bottom"
                   type="text"
                   value=""
                 >
diff --git a/webapp/channels/src/sass/components/_search.scss b/webapp/channels/src/sass/components/_search.scss
index fa205b4018..bc6d760581 100644
--- a/webapp/channels/src/sass/components/_search.scss
+++ b/webapp/channels/src/sass/components/_search.scss
@@ -63,9 +63,10 @@
     height: 100%;
     align-items: center;
     justify-content: center;
+    border: none;
     margin: 0;
+    background: none;
     color: rgba(var(--center-channel-color-rgb), 0.64);
-    cursor: pointer;
     font-size: 16px;
     visibility: hidden;