Fix some themes details (#15156)

Change-Id: I2ff7791d52f1e511cc5b35de01484fb25861bc5b