Fixes: #2500 merging gpg into develop (adding missing icons)
Fixes: #2501 merge repository into develop