Merge branch 'bug-18160-use-icon-themes'
Conflicts: Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp