Configuration fixes: default values, merging logo-icon and logo-image options.