diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index f1d550e77a..020771e5ee 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -1,5 +1,7 @@
-using System;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -19,12 +21,12 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The identifier.</value>
         public string Id { get; set; }
-        
+
         /// <summary>
-        /// Gets or sets the logo image tag.
+        /// Gets or sets the image tags.
         /// </summary>
-        /// <value>The logo image tag.</value>
-        public Guid? PrimaryImageTag { get; set; }
+        /// <value>The image tags.</value>
+        public Dictionary<ImageType, Guid> ImageTags { get; set; }
         
         /// <summary>
         /// Gets or sets the number.
@@ -61,5 +63,10 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The user data.</value>
         public UserItemDataDto UserData { get; set; }
+
+        public ChannelInfoDto()
+        {
+            ImageTags = new Dictionary<ImageType, Guid>();
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 4d3d877889..688a4cc647 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -87,7 +87,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 ServiceName = info.ServiceName,
                 ChannelType = info.ChannelType,
                 Number = info.ChannelNumber,
-                PrimaryImageTag = GetLogoImageTag(info),
                 Type = info.GetType().Name,
                 Id = info.Id.ToString("N"),
                 MediaType = info.MediaType
@@ -98,6 +97,13 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 dto.UserData = _dtoService.GetUserItemDataDto(_userDataManager.GetUserData(user.Id, info.GetUserDataKey()));
             }
 
+            var imageTag = GetLogoImageTag(info);
+
+            if (imageTag.HasValue)
+            {
+                dto.ImageTags[ImageType.Primary] = imageTag.Value;
+            }
+
             return dto;
         }
 
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 69f05631f3..9076777a5b 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -483,6 +483,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "livetvchannels.js",
                                       "livetvguide.js",
                                       "livetvrecordings.js",
+                                      "livetvtimer.js",
                                       "livetvtimers.js",
                                       "loginpage.js",
                                       "logpage.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 4aca619aa3..73b281d9a4 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -347,6 +347,12 @@
     <Content Include="dashboard-ui\scripts\livetvchannel.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\livetvtimer.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="dashboard-ui\scripts\livetvtimer.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\livetvtimers.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>