fix bug to check for empty note
adding settings icon
remove old icon folder
fix stuff
Merge branch 'master' into dev

* master:
  remove old icon folder
  adding settings icon