diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
index e2f3cb73..8d7b43aa 100644
--- a/1080i/Includes_Images.xml
+++ b/1080i/Includes_Images.xml
@@ -15,7 +15,7 @@
     </variable>
 
     <variable name="Image_Info_PlayButton">
-        <value condition="String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season)">special://skin/extras/icons/folder.png</value>
+        <value condition="ListItem.IsFolder">special://skin/extras/icons/folder.png</value>
         <value>special://skin/extras/icons/play3.png</value>
     </variable>
 
diff --git a/1080i/Includes_Info.xml b/1080i/Includes_Info.xml
index 94fedb23..c07dd17f 100644
--- a/1080i/Includes_Info.xml
+++ b/1080i/Includes_Info.xml
@@ -204,16 +204,16 @@
             <include content="Object_Info_Button">
                 <param name="id" value="8" />
                 <param name="groupid" value="8008" />
-                <param name="label" value="$LOCALIZE[208]" />
-                <param name="icon" value="special://skin/extras/icons/play3.png" />
-                <param name="visible" value="Control.IsEnabled(8) + !ListItem.IsFolder" />
+                <param name="label" value="$VAR[Label_Info_PlayButton]" />
+                <param name="icon" value="$VAR[Image_Info_PlayButton]" />
+                <param name="visible" value="Control.IsEnabled(8) + [!ListItem.IsFolder | !String.IsEmpty(ListItem.DBID)]" />
             </include>
             <include content="Object_Info_Button">
                 <param name="id" value="8888" />
                 <param name="groupid" value="8808" />
                 <param name="label" value="$LOCALIZE[1024]" />
                 <param name="icon" value="special://skin/extras/icons/folder.png" />
-                <param name="visible" value="Control.IsEnabled(8) + ListItem.IsFolder" />
+                <param name="visible" value="Control.IsEnabled(8) + ListItem.IsFolder + String.IsEmpty(ListItem.DBID)" />
                 <onclick>Dialog.Close(12003)</onclick>
                 <onclick condition="Window.IsVisible(MyVideoNav.xml)">Container.Update($INFO[ListItem.FolderPath])</onclick>
                 <onclick condition="!Window.IsVisible(MyVideoNav.xml)">ActivateWindow(videos,$INFO[ListItem.FolderPath],return)</onclick>
diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
index 36303164..aa6515f1 100644
--- a/1080i/Includes_Labels.xml
+++ b/1080i/Includes_Labels.xml
@@ -15,7 +15,7 @@
     </variable>
 
     <variable name="Label_Info_PlayButton">
-        <value condition="String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season)">$LOCALIZE[1024]</value>
+        <value condition="ListItem.IsFolder">$LOCALIZE[1024]</value>
         <value>$LOCALIZE[208]</value>
     </variable>
 
diff --git a/addon.xml b/addon.xml
index 61fa2e52..a632362d 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.54-alpha4">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.54-alpha5">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />