core-4970 fix image viewer