AOO-276 Menu icon not displayed on android phones
Merge remote-tracking branch 'origin/master'