IDEX-534: change minimize button
Merge with master