Merge "Change navbar icons when overview proxy service is enabled (1/2)"