copland: #28 fix
lain: fix attempt for #29
fix attempt for #30
Merge remote-tracking branch 'upstream/master'
Copland theme: Additional layout icons