[#1869] + @Machaba-Machaba - Modified top bars