TraditionalOK GTK3: more adjustments from clearlook-phenix upstream