diff --git a/packages/editor/src/components/post-publish-modal/index.js b/packages/editor/src/components/post-publish-modal/index.js
index 24139e28e0fcc1..37ac097690d5aa 100644
--- a/packages/editor/src/components/post-publish-modal/index.js
+++ b/packages/editor/src/components/post-publish-modal/index.js
@@ -101,7 +101,7 @@ export class PostPublishModal extends Component {
 				<div className="editor-post-publish-modal__content" { ...propsForModal }>
 					{ isPrePublish && (
 						isSaving ?
-							<div className="editor-post-publish-modal-pending">
+							<div className="editor-post-publish-modal__publishing-animation">
 								<Spinner />
 							</div> :
 							<>
@@ -113,16 +113,15 @@ export class PostPublishModal extends Component {
 									checked={ isPublishSidebarEnabled }
 									onChange={ onTogglePublishSidebar }
 								/>
-								<div className="editor-post-publish-modal__content-publish-controls">
+								<div className="editor-post-publish-modal__prepublish-controls">
 									<Button
 										isLink
-										className="editor-post-publish-modal__content-cancel-button"
+										className="editor-post-publish-modal__prepublish-cancel-button"
 										onClick={ onClose }
 									>
 										{ __( 'Cancel' ) }
 									</Button>
-									<PostPublishButton isLarge className="editor-post-publish-modal__content-cancel-button" focusOnMount={ true } onSubmit={ this.onSubmit } forceIsDirty={ forceIsDirty } forceIsSaving={ forceIsSaving } />
-									<span className="editor-post-publish-modal__spacer"></span>
+									<PostPublishButton isLarge className="editor-post-publish-modal__content-publish-button" focusOnMount={ true } onSubmit={ this.onSubmit } forceIsDirty={ forceIsDirty } forceIsSaving={ forceIsSaving } />
 								</div>
 							</>
 					) }
diff --git a/packages/editor/src/components/post-publish-modal/postpublish.js b/packages/editor/src/components/post-publish-modal/postpublish.js
index b95c7da6c25dd6..2c1d3ca4dd3f6c 100644
--- a/packages/editor/src/components/post-publish-modal/postpublish.js
+++ b/packages/editor/src/components/post-publish-modal/postpublish.js
@@ -62,8 +62,8 @@ class PostPublishModalPostpublish extends Component {
 		const viewPostLabel = get( postType, [ 'labels', 'view_item' ] );
 
 		return (
-			<div className="post-publish-modal__postpublish">
-				<p className="post-publish-modal__postpublish-post-text">
+			<div className="editor-editor-post-publish-modal__prepublish">
+				<p className="editor-post-publish-modal__postpublish-post-text">
 					{
 						sprintf(
 							/* translators: %s: post type singular name */
@@ -71,10 +71,10 @@ class PostPublishModalPostpublish extends Component {
 						)
 					}
 				</p>
-				<div className="post-publish-modal__postpublish-post-address">
+				<div className="editor-post-publish-modal__postpublish-post-address">
 					<TextControl
 						disabled
-						className="post-publish-modal__postpublish-post-url"
+						className="editor-post-publish-modal__postpublish-post-url"
 						label={
 							sprintf(
 								/* translators: %s: post type singular name */
@@ -86,7 +86,7 @@ class PostPublishModalPostpublish extends Component {
 					<ClipboardButton
 						isDefault
 						isLarge
-						className="post-publish-modal__postpublish-post-copy"
+						className="editor-post-publish-modal__postpublish-post-copy"
 						text={ post.link }
 						onCopy={ this.onCopy }
 					>
@@ -94,7 +94,7 @@ class PostPublishModalPostpublish extends Component {
 					</ClipboardButton>
 				</div>
 				{ ! isScheduled && (
-					<div className="editor-post-publish-modal__content-publish-controls">
+					<div className="editor-post-publish-modal__postpublish-controls">
 						<Button
 							href={ post.link }
 							isPrimary
diff --git a/packages/editor/src/components/post-publish-modal/style.scss b/packages/editor/src/components/post-publish-modal/style.scss
index f653487db625a3..393014fdda19af 100644
--- a/packages/editor/src/components/post-publish-modal/style.scss
+++ b/packages/editor/src/components/post-publish-modal/style.scss
@@ -3,6 +3,7 @@
 	width: 35vw;
 }
 
+/* Override default modal styles */
 .editor-post-publish-modal .components-modal__header {
 	border-bottom: none;
 	margin-bottom: 12px;
@@ -44,30 +45,40 @@
 	clear: both;
 }
 
-.editor-post-publish-modal-pending {
+/* Pre-publish Modal Styles */
+.editor-post-publish-modal__prepublish-controls {
+	text-align: right;
+	padding: 24px 0 0;
+}
+
+.editor-post-publish-modal__prepublish-controls .editor-post-publish-modal__prepublish-cancel-button,
+.editor-post-publish-modal__prepublish-controls .editor-post-publish-modal__prepublish-publish-button {
+	padding: 0 24px 2px;
+}
+
+/* Publishing Modal Styles */
+.editor-post-publish-modal__publishing-animation {
 	display: flex;
 	justify-content: center;
 }
 
-.post-publish-modal__postpublish-post-address {
+/* Post Publish Modal Styles */
+.editor-post-publish-modal__postpublish-post-address {
 	display: flex;
 	align-items: flex-end;
 	padding: 12px 0;
 }
-.post-publish-modal__postpublish-post-url {
+
+.editor-post-publish-modal__postpublish-post-url {
 	flex: auto;
 	padding-right: 8px;
 }
-.post-publish-modal__postpublish-post-copy {
+
+.editor-post-publish-modal__postpublish-post-copy {
 	margin-bottom: 9px;
 }
 
-.editor-post-publish-modal__content-publish-controls {
+.editor-post-publish-modal__postpublish-controls {
 	text-align: right;
 	padding: 24px 0 0;
 }
-
-.editor-post-publish-modal__content-publish-controls button.is-link,
-.editor-post-publish-modal__content-publish-controls button.is-large {
-	padding: 0 24px 2px;
-}