diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index ecfd9ed..e1ff174 100644
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -465,7 +465,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
     content.Add( image );
 
     // Add stencil
-    ImageActor stencil = NewStencilImage();
+    Toolkit::ImageView stencil = NewStencilImage();
     stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     image.Add( stencil );
   }
@@ -490,20 +490,18 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
   return content;
 }
 
-ImageActor DaliTableView::NewStencilImage()
+Toolkit::ImageView DaliTableView::NewStencilImage()
 {
-  Image alpha = ResourceImage::New( TILE_BACKGROUND_ALPHA );
+  Toolkit::ImageView stencil = ImageView::New( TILE_BACKGROUND_ALPHA );
 
-  ImageActor stencilActor = ImageActor::New( alpha );
+  stencil.SetParentOrigin( ParentOrigin::CENTER );
+  stencil.SetAnchorPoint( AnchorPoint::CENTER );
+  stencil.SetDrawMode( DrawMode::STENCIL );
 
-  stencilActor.SetParentOrigin( ParentOrigin::CENTER );
-  stencilActor.SetAnchorPoint( AnchorPoint::CENTER );
-  stencilActor.SetDrawMode( DrawMode::STENCIL );
+  Property::Map shaderEffect = CreateAlphaDiscardEffect();
+  stencil.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderEffect );
 
-  Dali::ShaderEffect shaderEffect = CreateAlphaDiscardEffect();
-  stencilActor.SetShaderEffect( shaderEffect );
-
-  return stencilActor;
+  return stencil;
 }
 
 bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index 33c0e9b..aa2a469 100644
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -151,7 +151,7 @@ private: // Application callbacks & implementation
    *
    * @return The stencil image
    */
-  Dali::ImageActor NewStencilImage();
+  Dali::Toolkit::ImageView NewStencilImage();
 
   // Signal handlers
 
diff --git a/resources/images/item-background-alpha.9.png b/resources/images/item-background-alpha.9.png
index 3a1f611..64579dd 100644
--- a/resources/images/item-background-alpha.9.png
+++ b/resources/images/item-background-alpha.9.png