deleted that stupid edit button...

deleted edit icon, added edit button
Merge remote-tracking branch 'origin/master'