diff --git a/src/js/components/Track.js b/src/js/components/Track.js
index a1e881ff..3956f04e 100755
--- a/src/js/components/Track.js
+++ b/src/js/components/Track.js
@@ -40,7 +40,7 @@ export default class Track extends React.Component{
 		if( typeof(track.selected) !== 'undefined' && track.selected ) className += ' selected';
 		if( typeof(track.type) !== 'undefined' ) className += ' '+track.type;
 		if( track.playing ) className += ' playing';
-
+		
 		var album = '-'
 		if( track.album ){
 			if( track.album.uri ){
@@ -136,6 +136,7 @@ export default class Track extends React.Component{
 					{ this.props.track.selected ? <FontAwesome name="check" className="select-state" fixedWidth /> : null }
 					{ this.props.track.playing ? <FontAwesome name="play" className="play-state" fixedWidth /> : null }
 					{ track_columns }
+					{ this.props.show_source_icon ? <FontAwesome name={helpers.sourceIcon(track.uri)} className="source" fixedWidth /> : null }
 			</div>
 		);
 	}
diff --git a/src/js/components/TrackList.js b/src/js/components/TrackList.js
index 6f7828a6..50fc1079 100755
--- a/src/js/components/TrackList.js
+++ b/src/js/components/TrackList.js
@@ -322,7 +322,7 @@ class TrackList extends React.Component{
 					this.state.tracks.map(
 						(track, index) => {
 							return <Track
-									show_source_icon={ this.props.show_source_icon }
+									show_source_icon={this.props.show_source_icon}
 									key={track.key} 
 									track={track} 
 									context={this.props.context} 
diff --git a/src/js/services/spotify/actions.js b/src/js/services/spotify/actions.js
index d77f0762..25e0cb40 100755
--- a/src/js/services/spotify/actions.js
+++ b/src/js/services/spotify/actions.js
@@ -906,9 +906,12 @@ export function getPlaylist( uri ){
         .then( response => {
 
             // convert links in description
-            var description = response.description
-            description = description.split('<a href="spotify:artist:').join('<a href="#'+global.baseURL+'artist/spotify:artist:')
-            description = description.split('<a href="spotify:album:').join('<a href="#'+global.baseURL+'album/spotify:album:')
+            var description = null
+            if (response.description){
+                description = response.description
+                description = description.split('<a href="spotify:artist:').join('<a href="#'+global.baseURL+'artist/spotify:artist:')
+                description = description.split('<a href="spotify:album:').join('<a href="#'+global.baseURL+'album/spotify:album:')
+            }
 
             var playlist = Object.assign(
                 {},
diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss
index 68c0f639..d123b793 100755
--- a/src/scss/components/_lists.scss
+++ b/src/scss/components/_lists.scss
@@ -35,6 +35,13 @@
 			border-top: 0;
 			padding-bottom: 2px;
 		}
+
+		.source {
+			color: $mid_grey;
+			position: absolute;
+			top: 14px;
+			right: 12px;
+		}
 	}
 
 	&.track-list .list-item {