Merge "Replace UDFPS circle with FP icon"