Revert "Mantis Ticket 4562 - Fixed default icons option"

This reverts commit 509ac57e511e3afe592ef9beb841483852a4df13.
Revert "Mantis Ticket 4562"

This reverts commit a261082d0750942b5057321536c8a8168c10c9c0.