More color/icon consistency
More consisitency
Merge branch 'development' of github.com:open-keychain/open-keychain into development