diff --git a/__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap b/__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap
index e7d882aac1..5e0b1ae6b7 100644
--- a/__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap
+++ b/__tests__/pages/Organizations/screens/Organization/__snapshots__/OrganizationNotifications.test.jsx.snap
@@ -578,10 +578,31 @@ exports[`<OrganizationNotifications /> initially renders succesfully 1`] = `
                                                             tabIndex={null}
                                                             type="button"
                                                           >
-                                                            <i
-                                                              aria-hidden="true"
-                                                              className="fas fa-search"
-                                                            />
+                                                            <SearchIcon
+                                                              color="currentColor"
+                                                              size="sm"
+                                                              title={null}
+                                                            >
+                                                              <svg
+                                                                aria-hidden={true}
+                                                                aria-labelledby={null}
+                                                                fill="currentColor"
+                                                                height="1em"
+                                                                role="img"
+                                                                style={
+                                                                  Object {
+                                                                    "verticalAlign": "-0.125em",
+                                                                  }
+                                                                }
+                                                                viewBox="0 0 512 512"
+                                                                width="1em"
+                                                              >
+                                                                <path
+                                                                  d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                                                                  transform=""
+                                                                />
+                                                              </svg>
+                                                            </SearchIcon>
                                                           </button>
                                                         </Button>
                                                       </div>
diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index 4616370f76..790490eea2 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -77,11 +77,9 @@ class DataListToolbar extends React.Component {
                       />
                     </ToolbarItem>
                   </ToolbarGroup>
-                  { (showExpandCollapse || additionalControls.length) ? (
-                    <VerticalSeparator />
-                  ) : null}
                   {showExpandCollapse && (
                     <Fragment>
+                      <VerticalSeparator />
                       <ToolbarGroup>
                         <ExpandCollapse
                           isCompact={isCompact}
diff --git a/src/components/DataListToolbar/styles.scss b/src/components/DataListToolbar/styles.scss
index 8909439caa..0508ee99a0 100644
--- a/src/components/DataListToolbar/styles.scss
+++ b/src/components/DataListToolbar/styles.scss
@@ -105,10 +105,4 @@
     color: #d2d2d2;
   }
   background-color: white;
-}
-
-.pf-l-toolbar > div {
-  &:last-child{
-    display:none;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/components/Search/Search.jsx b/src/components/Search/Search.jsx
index ec23b2d071..e9da0b0cec 100644
--- a/src/components/Search/Search.jsx
+++ b/src/components/Search/Search.jsx
@@ -10,6 +10,9 @@ import {
   DropdownItem,
   TextInput
 } from '@patternfly/react-core';
+import {
+  SearchIcon
+} from '@patternfly/react-icons';
 
 class Search extends React.Component {
   constructor (props) {
@@ -103,7 +106,7 @@ class Search extends React.Component {
               aria-label={i18n._(t`Search`)}
               onClick={this.handleSearch}
             >
-              <i className="fas fa-search" aria-hidden="true" />
+              <SearchIcon />
             </Button>
           </div>
         )}