diff --git a/homeassistant/components/media_player/itunes.py b/homeassistant/components/media_player/itunes.py
index 5d08a7e95d41c7177131dadb1ae81424f5284ab7..1f51885d731c92874ca5a324ae8e33b0304ef7ae 100644
--- a/homeassistant/components/media_player/itunes.py
+++ b/homeassistant/components/media_player/itunes.py
@@ -14,8 +14,7 @@ from homeassistant.components.media_player import (
     MediaPlayerDevice, MEDIA_TYPE_MUSIC, MEDIA_TYPE_PLAYLIST, SUPPORT_PAUSE,
     SUPPORT_SEEK, SUPPORT_VOLUME_SET, SUPPORT_VOLUME_MUTE,
     SUPPORT_PREVIOUS_TRACK, SUPPORT_NEXT_TRACK, SUPPORT_TURN_ON,
-    SUPPORT_TURN_OFF, SUPPORT_PLAY_MEDIA,
-    ATTR_ENTITY_PICTURE, ATTR_SUPPORTED_MEDIA_COMMANDS)
+    SUPPORT_TURN_OFF, SUPPORT_PLAY_MEDIA)
 from homeassistant.const import (
     STATE_IDLE, STATE_PLAYING, STATE_PAUSED, STATE_OFF, STATE_ON)
 
@@ -40,7 +39,10 @@ class Itunes(object):
     @property
     def _base_url(self):
         """ Returns the base url for endpoints. """
-        return self.host + ":" + str(self.port)
+        if self.port:
+            return self.host + ":" + str(self.port)
+        else:
+            return self.host
 
     def _request(self, method, path, params=None):
         """ Makes the actual request and returns the parsed response. """
@@ -380,6 +382,14 @@ class AirPlayDevice(MediaPlayerDevice):
         """ Returns the name of the device. """
         return self.device_name
 
+    @property
+    def icon(self):
+        """ Icon to use in the frontend, if any. """
+        if self.selected is True:
+            return "mdi:volume-high"
+        else:
+            return "mdi:volume-off"
+
     @property
     def state(self):
         """ Returns the state of the device. """
@@ -405,23 +415,6 @@ class AirPlayDevice(MediaPlayerDevice):
         """ Flags of media commands that are supported. """
         return SUPPORT_AIRPLAY
 
-    @property
-    def device_state_attributes(self):
-        """ Return the state attributes. """
-        state_attr = {}
-        state_attr[ATTR_SUPPORTED_MEDIA_COMMANDS] = SUPPORT_AIRPLAY
-
-        if self.state == STATE_OFF:
-            state_attr[ATTR_ENTITY_PICTURE] = \
-                ('https://cloud.githubusercontent.com/assets/260/9833073'
-                 '/6eb5c906-5958-11e5-9b4a-472cdf36be16.png')
-        else:
-            state_attr[ATTR_ENTITY_PICTURE] = \
-                ('https://cloud.githubusercontent.com/assets/260/9833072'
-                 '/6eb13cce-5958-11e5-996f-e2aaefbc9a24.png')
-
-        return state_attr
-
     def set_volume_level(self, volume):
         """ set volume level, range 0..1. """
         volume = int(volume * 100)