Resolve type errors resulted from merge

packages/grafana-ui/src/types/icon.ts

@@ -15,6 +15,7 @@ export type IconName =
   | 'times'
   | 'step-backward'
   | 'square-shape'
+  | 'filter'
   | 'share-alt'
   | 'forward'
   | 'check'

public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx

@@ -154,7 +154,7 @@ export const OptionsPaneContent: React.FC<{
                   ref={elem => elem && elem.focus()}
                   placeholder="Search all options"
                   suffix={
-                    <Icon name="remove" onClick={() => setSearchMode(false)} className={styles.searchRemoveIcon} />
+                    <Icon name="times" onClick={() => setSearchMode(false)} className={styles.searchRemoveIcon} />
                   }
                 />
               </div>
@@ -183,7 +183,7 @@ export const OptionsPaneContent: React.FC<{
                 <div className="flex-grow-1" />
                 <div className={styles.tabsButton}>
                   <DashNavButton
-                    icon="fa fa-search"
+                    icon="search"
                     tooltip="Search all options"
                     classSuffix="search-options"
                     onClick={() => setSearchMode(true)}
@@ -191,7 +191,7 @@ export const OptionsPaneContent: React.FC<{
                 </div>
                 <div className={styles.tabsButton}>
                   <DashNavButton
-                    icon="fa fa-chevron-right"
+                    icon="angle-right"
                     tooltip="Close options pane"
                     classSuffix="close-options"
                     onClick={onClose}

public/app/features/dashboard/components/PanelEditor/PanelEditor.tsx

@@ -223,7 +223,7 @@ export class PanelEditorUnconnected extends PureComponent<Props> {
         {!uiState.isPanelOptionsVisible && (
           <div className={styles.toolbarItem}>
             <DashNavButton onClick={this.onTogglePanelOptions} tooltip="Open options pane" classSuffix="close-options">
-              <Icon name="chevron-left" /> <span style={{ paddingLeft: '6px' }}>Show options</span>
+              <Icon name="angle-left" /> <span style={{ paddingLeft: '6px' }}>Show options</span>
             </DashNavButton>
           </div>
         )}