20130925 Use new images.
20130925 Modify layout use new image.
fix conflict.