Photo icon added
Photo icon moved
Colors and intencity from photo
Merge remote-tracking branch 'origin/master'