Make i.icon-link color #999 for white theme
Added fixes for additional themes