Fix icons dissapearing in dock (once and for all)

Change-Id: I9ac882cfdd913023c200c1104524d0d56646dfa0