Merge "Final icons in dream overlay status bar." into tm-dev