             if apply {
                 authorButton.setImage(authorImage, for: .normal)
             }
-            let authorButtonFrame = authorButton.wmf_preferredFrame(at: trailingPaneOrigin, maximumWidth: trailingPaneAvailableWidth, alignedBy: .forceLeftToRight, apply: apply)
+            let authorButtonFrame = authorButton.wmf_preferredFrame(at: trailingPaneOrigin, maximumWidth: trailingPaneAvailableWidth, alignedBy: semanticContentAttribute, apply: apply)
             trailingPaneOrigin.y += authorButtonFrame.layoutHeight(with: spacing * 3)
             authorButton.isHidden = false
         } else {

        roundedContent.frame = CGRect(x: layoutMargins.left, y: 0, width: widthMinusMargins, height: bounds.height)
        editableContent.frame = CGRect(x: 0, y: 0, width: widthMinusMargins, height: bounds.height)

        if willStartEditing {
            selectView.frame = CGRect(x: 0, y: 0, width: 30, height: bounds.height)
        } else if isEditing {
            selectView.frame.origin = CGPoint(x: self.roundedContent.frame.origin.x, y: 0)
            selectView.layoutIfNeeded()
            let spaceOccupiedBySelectView = selectView.frame.width * 2
            editableContent.frame = CGRect(x: editableContent.frame.origin.x + spaceOccupiedBySelectView, y: 0, width: widthMinusMargins - spaceOccupiedBySelectView, height: bounds.height)
        } else {
            selectView.frame.origin = CGPoint(x: 0, y: 0)
            editableContent.frame = CGRect(x: 0, y: 0, width: widthMinusMargins, height: bounds.height)
        }


                commentLabel.text = comment
            }
            // TODO: Make sure all icons have the same sizes
            let commentLabelFrame = commentLabel.wmf_preferredFrame(at: trailingPaneOrigin, maximumWidth: trailingPaneAvailableWidth, alignedBy: semanticContentAttribute, apply: apply)
            trailingPaneOrigin.y += commentLabelFrame.layoutHeight(with: spacing)
            commentLabel.isHidden = false
        } else {
