a bit of refactoring plus bookmark icons