fix edit link and save only icon-name in DB
Merge branch 'master' into theradiocc