Alignment of clock and shade

Test: visual
Change-Id: If7ff8c34a5053d5df8f6dc38c53cc728fef89ede
Fixes: 72968018
Fixes: 72417398
Fixes: 73087486
Fixes: 72566197
17 files changed