Adapted sample sources
Updated icons