Added fix for first rotation and also add action icons