diff --git a/docs/html/design/tv/images/apps-games-rows.jpg b/docs/html/design/tv/images/apps-games-rows.jpg
index 5023655ece760..d18ac6a23b313 100644
Binary files a/docs/html/design/tv/images/apps-games-rows.jpg and b/docs/html/design/tv/images/apps-games-rows.jpg differ
diff --git a/docs/html/design/tv/images/atv-home.jpg b/docs/html/design/tv/images/atv-home.jpg
index 4b25bab803fbe..6040a49eb6471 100644
Binary files a/docs/html/design/tv/images/atv-home.jpg and b/docs/html/design/tv/images/atv-home.jpg differ
diff --git a/docs/html/design/tv/images/recommendations.png b/docs/html/design/tv/images/recommendations.png
index 942cd104f5367..fb6562f1a7fea 100644
Binary files a/docs/html/design/tv/images/recommendations.png and b/docs/html/design/tv/images/recommendations.png differ
diff --git a/docs/html/design/tv/images/settings.jpg b/docs/html/design/tv/images/settings.jpg
index 1c5bf31129d23..d96fed4530145 100644
Binary files a/docs/html/design/tv/images/settings.jpg and b/docs/html/design/tv/images/settings.jpg differ
diff --git a/docs/html/preview/tv/images/home-recommendations.png b/docs/html/images/tv/home-recommendations.png
similarity index 100%
rename from docs/html/preview/tv/images/home-recommendations.png
rename to docs/html/images/tv/home-recommendations.png
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 8b233a39c3593..0fee77156f5f3 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -902,7 +902,7 @@ include the action bar on devices running Android 2.1 or higher."
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>training/tv/discovery/index.html"
-             description="How to help users discovery content from your app.">
+             description="How to help users discover content from your app.">
              Helping Users Find Content on TV</a>
         </div>
         <ul>
@@ -924,8 +924,9 @@ include the action bar on devices running Android 2.1 or higher."
       </li>
 
       <li>
-        <a href="<?cs var:toroot ?>training/tv/tif/index.html">
-          TV Input Framework</a>
+        <a href="<?cs var:toroot ?>training/tv/tif/index.html"
+           description="How to build Live TV apps.">
+           Building Live TV Apps</a>
       </li>
     </ul>
   </li>
diff --git a/docs/html/training/tv/discovery/recommendations.jd b/docs/html/training/tv/discovery/recommendations.jd
index 048b649daa992..a6eb15284918f 100644
--- a/docs/html/training/tv/discovery/recommendations.jd
+++ b/docs/html/training/tv/discovery/recommendations.jd
@@ -29,7 +29,7 @@ trainingnavtop=true
   bring users back to your app.
 </p>
 
-<img src="{@docRoot}preview/tv/images/home-recommendations.png" alt="" id="figure1" />
+<img src="{@docRoot}images/tv/home-recommendations.png" alt="" id="figure1" />
 <p class="img-caption">
   <strong>Figure 1.</strong> An example of the recommendations row.
 </p>
diff --git a/docs/html/training/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd
index aac640cae91fe..dc191f957af9e 100644
--- a/docs/html/training/tv/tif/index.jd
+++ b/docs/html/training/tv/tif/index.jd
@@ -1,4 +1,4 @@
-page.title=TV Input Framework
+page.title=Building Live TV Apps
 page.tags=tif
 
 @jd:body
diff --git a/docs/html/tv/images/atv-framed.png b/docs/html/tv/images/atv-framed.png
index bec27e858dd0f..947f94e847285 100644
Binary files a/docs/html/tv/images/atv-framed.png and b/docs/html/tv/images/atv-framed.png differ