diff --git a/app/src/component/fileListItem/view.js b/app/src/component/fileListItem/view.js
index 2db2fd9b..00f89914 100644
--- a/app/src/component/fileListItem/view.js
+++ b/app/src/component/fileListItem/view.js
@@ -51,7 +51,6 @@ class FileListItem extends React.PureComponent {
       claim,
       fileInfo,
       metadata,
-      featuredResult,
       isResolvingUri,
       isDownloaded,
       style,
@@ -73,10 +72,6 @@ class FileListItem extends React.PureComponent {
       fullChannelUri = channelClaimId ? `${channel}#${channelClaimId}` : channel;
     }
 
-    if (featuredResult && !isResolvingUri && !claim && !title && !name) {
-      return null;
-    }
-
     return (
       <View style={style}>
         <TouchableOpacity style={style} onPress={onPress}>
@@ -86,17 +81,15 @@ class FileListItem extends React.PureComponent {
                          title={(title || name)}
                          thumbnail={metadata ? metadata.thumbnail : null} />
           <View style={fileListStyle.detailsContainer}>
-            {featuredResult && <Text style={fileListStyle.featuredUri} numberOfLines={1}>{uri}</Text>}
-
             {!title && !name && !channel && isResolving && (
             <View>
               {(!title && !name) && <Text style={fileListStyle.uri}>{uri}</Text>}
               {(!title && !name) && <View style={fileListStyle.row}>
-                <ActivityIndicator size={"small"} color={featuredResult ? Colors.White : Colors.LbryGreen} />
+                <ActivityIndicator size={"small"} color={Colors.LbryGreen} />
               </View>}
             </View>)}
 
-            {(title || name) && <Text style={featuredResult ? fileListStyle.featuredTitle : fileListStyle.title}>{this.formatTitle(title) || this.formatTitle(name)}</Text>}
+            {(title || name) && <Text style={fileListStyle.title}>{this.formatTitle(title) || this.formatTitle(name)}</Text>}
             {channel &&
               <Link style={fileListStyle.publisher} text={channel} onPress={() => {
                 navigateToUri(navigation, normalizeURI(fullChannelUri));
diff --git a/app/src/component/uriBar/view.js b/app/src/component/uriBar/view.js
index 4cea8a3a..2313203d 100644
--- a/app/src/component/uriBar/view.js
+++ b/app/src/component/uriBar/view.js
@@ -32,29 +32,17 @@ class UriBar extends React.PureComponent {
       changeTextTimeout: null,
       currentValue: null,
       inputText: null,
-      focused: false,
-      // TODO: Add a setting to enable / disable direct search?
-      directSearch: true
+      focused: false
     };
   }
 
   handleChangeText = text => {
     const newValue = text ? text : '';
     clearTimeout(this.state.changeTextTimeout);
-    const { updateSearchQuery, onSearchSubmitted, navigation } = this.props;
+    const { updateSearchQuery } = this.props;
 
     let timeout = setTimeout(() => {
       updateSearchQuery(text);
-
-      if (!text.startsWith('lbry://')) {
-        // not a URI input, so this is a search, perform a direct search
-        if (onSearchSubmitted) {
-          onSearchSubmitted(text);
-        } else {
-          navigation.navigate({ routeName: 'Search', key: 'searchPage', params: { searchQuery: text }});
-        }
-      }
-
     }, UriBar.INPUT_TIMEOUT);
     this.setState({ inputText: newValue, currentValue: newValue, changeTextTimeout: timeout });
   }
@@ -153,7 +141,7 @@ class UriBar extends React.PureComponent {
                       }
                     }}/>
         </View>
-        {(this.state.focused && !this.state.directSearch) && (
+        {this.state.focused && (
         <View style={uriBarStyle.suggestions}>
           <FlatList style={uriBarStyle.suggestionList}
                     data={suggestions}
diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js
index 72b473d5..e369f37a 100644
--- a/app/src/page/file/view.js
+++ b/app/src/page/file/view.js
@@ -511,30 +511,32 @@ class FilePage extends React.PureComponent {
                                         onStartDownloadFailed={this.startDownloadFailed} />}
                   {!fileInfo && <FilePrice uri={uri} style={filePageStyle.filePriceContainer} textStyle={filePageStyle.filePriceText} />}
                 </View>
-                {canLoadMedia && fileInfo && <View style={playerBgStyle}
-                                                   ref={(ref) => { this.playerBackground = ref; }}
-                                                   onLayout={(evt) => {
-                                                    if (!this.state.playerBgHeight) {
-                                                      this.setState({ playerBgHeight: evt.nativeEvent.layout.height });
-                                                    }
-                                                  }} />}
-                {canLoadMedia && fileInfo && <MediaPlayer
-                                               fileInfo={fileInfo}
-                                               assignPlayer={(ref) => { this.player = ref; }}
-                                               uri={uri}
-                                               style={playerStyle}
-                                               autoPlay={autoplay || this.state.autoPlayMedia}
-                                               onFullscreenToggled={this.handleFullscreenToggle}
-                                               onLayout={(evt) => {
-                                                 if (!this.state.playerHeight) {
-                                                   this.setState({ playerHeight: evt.nativeEvent.layout.height });
-                                                 }
-                                               }}
-                                               onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)}
-                                               onPlaybackStarted={this.onPlaybackStarted}
-                                               onPlaybackFinished={this.onPlaybackFinished}
-                                               thumbnail={metadata.thumbnail}
-                                              />}
+                {(canLoadMedia && fileInfo && isPlayable) &&
+                  <View style={playerBgStyle}
+                    ref={(ref) => { this.playerBackground = ref; }}
+                    onLayout={(evt) => {
+                     if (!this.state.playerBgHeight) {
+                       this.setState({ playerBgHeight: evt.nativeEvent.layout.height });
+                     }
+                   }} />}
+                {(canLoadMedia && fileInfo && isPlayable) &&
+                  <MediaPlayer
+                    fileInfo={fileInfo}
+                    assignPlayer={(ref) => { this.player = ref; }}
+                    uri={uri}
+                    style={playerStyle}
+                    autoPlay={autoplay || this.state.autoPlayMedia}
+                    onFullscreenToggled={this.handleFullscreenToggle}
+                    onLayout={(evt) => {
+                      if (!this.state.playerHeight) {
+                        this.setState({ playerHeight: evt.nativeEvent.layout.height });
+                      }
+                    }}
+                    onMediaLoaded={() => this.onMediaLoaded(channelName, title, uri)}
+                    onPlaybackStarted={this.onPlaybackStarted}
+                    onPlaybackFinished={this.onPlaybackFinished}
+                    thumbnail={metadata.thumbnail}
+                   />}
 
                 {showActions &&
                 <View style={filePageStyle.actions}>
diff --git a/app/src/page/search/view.js b/app/src/page/search/view.js
index 56eb00ee..41a1bf35 100644
--- a/app/src/page/search/view.js
+++ b/app/src/page/search/view.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Lbry, parseURI, normalizeURI, isURIValid } from 'lbry-redux';
+import { Lbry } from 'lbry-redux';
 import {
   ActivityIndicator,
   Button,
@@ -8,19 +8,15 @@ import {
   View,
   ScrollView
 } from 'react-native';
-import { navigateToUri } from 'utils/helper';
-import Colors from 'styles/colors';
-import PageHeader from 'component/pageHeader';
-import FileListItem from 'component/fileListItem';
-import FloatingWalletBalance from 'component/floatingWalletBalance';
-import UriBar from 'component/uriBar';
-import searchStyle from 'styles/search';
+import { navigateToUri } from '../../utils/helper';
+import Colors from '../../styles/colors';
+import PageHeader from '../../component/pageHeader';
+import FileListItem from '../../component/fileListItem';
+import FloatingWalletBalance from '../../component/floatingWalletBalance';
+import UriBar from '../../component/uriBar';
+import searchStyle from '../../styles/search';
 
 class SearchPage extends React.PureComponent {
-  state = {
-    currentUri: null
-  }
-
   static navigationOptions = {
     title: 'Search Results'
   };
@@ -33,38 +29,22 @@ class SearchPage extends React.PureComponent {
     const { navigation, search } = this.props;
     const { searchQuery } = navigation.state.params;
     if (searchQuery && searchQuery.trim().length > 0) {
-      this.setState({ currentUri: (isURIValid(searchQuery)) ? normalizeURI(searchQuery) : null })
       search(searchQuery);
     }
   }
 
-  handleSearchSubmitted = (keywords) => {
-    const { search } = this.props;
-    this.setState({ currentUri: (isURIValid(keywords)) ? normalizeURI(keywords) : null });
-    search(keywords);
-  }
-
   render() {
-    const { isSearching, navigation, query, uris } = this.props;
+    const { isSearching, navigation, query, search, uris } = this.props;
     const { searchQuery } = navigation.state.params;
 
     return (
       <View style={searchStyle.container}>
         <UriBar value={searchQuery}
                 navigation={navigation}
-                onSearchSubmitted={this.handleSearchSubmitted} />
+                onSearchSubmitted={(keywords) => search(keywords)} />
         {!isSearching && (!uris || uris.length === 0) &&
             <Text style={searchStyle.noResultsText}>No results to display.</Text>}
         <ScrollView style={searchStyle.scrollContainer} contentContainerStyle={searchStyle.scrollPadding}>
-          {this.state.currentUri &&
-          <FileListItem
-            key={this.state.currentUri}
-            uri={this.state.currentUri}
-            featuredResult={true}
-            style={searchStyle.featuredResultItem}
-            navigation={navigation}
-            onPress={() => navigateToUri(navigation, this.state.currentUri)}
-          />}
           {!isSearching && uris && uris.length ? (
                 uris.map(uri => <FileListItem key={uri}
                                               uri={uri}
diff --git a/app/src/styles/fileList.js b/app/src/styles/fileList.js
index 297cada7..a9c9824e 100644
--- a/app/src/styles/fileList.js
+++ b/app/src/styles/fileList.js
@@ -20,16 +20,6 @@ const fileListStyle = StyleSheet.create({
   detailsContainer: {
     flex: 1
   },
-  featuredUri: {
-    fontFamily: 'Inter-UI-SemiBold',
-    fontSize: 24,
-    color: Colors.White
-  },
-  featuredTitle: {
-    fontFamily: 'Inter-UI-SemiBold',
-    fontSize: (screenWidthPixels <= 720) ? 12 : 16,
-    color: Colors.White
-  },
   thumbnail: {
     width: thumbnailWidth,
     height: thumbnailHeight,
diff --git a/app/src/styles/filePage.js b/app/src/styles/filePage.js
index 834d2d42..b600fa23 100644
--- a/app/src/styles/filePage.js
+++ b/app/src/styles/filePage.js
@@ -139,6 +139,7 @@ const filePageStyle = StyleSheet.create({
   },
   containedPlayerBackground: {
     width: '100%',
+    marginTop: 60,
     height: containedMediaHeight,
   },
   fullscreenPlayerBackground: {
diff --git a/app/src/styles/search.js b/app/src/styles/search.js
index 0b7bcdfa..8596cf44 100644
--- a/app/src/styles/search.js
+++ b/app/src/styles/search.js
@@ -1,5 +1,4 @@
 import { StyleSheet } from 'react-native';
-import Colors from 'styles/colors';
 
 const searchStyle = StyleSheet.create({
   container: {
@@ -11,6 +10,8 @@ const searchStyle = StyleSheet.create({
     flex: 1,
     width: '100%',
     height: '100%',
+    paddingLeft: 16,
+    paddingRight: 16,
     marginTop: 60
   },
   scrollPadding: {
@@ -20,19 +21,7 @@ const searchStyle = StyleSheet.create({
     flex: 1,
     flexDirection: 'row',
     justifyContent: 'space-between',
-    marginTop: 8,
-    marginLeft: 8,
-    marginRight: 8
-  },
-  featuredResultItem: {
-    flex: 1,
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    paddingTop: 8,
-    paddingBottom: 8,
-    paddingLeft: 8,
-    paddingRight: 8,
-    backgroundColor: Colors.Black
+    marginTop: 8
   },
   searchInput: {
     width: '100%',