diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss
index 848877d2ddc70..756ecc4b6ce1f 100644
--- a/assets/stylesheets/_components.scss
+++ b/assets/stylesheets/_components.scss
@@ -36,7 +36,6 @@
 @import 'blocks/post-edit-button/style';
 @import 'blocks/post-item/style';
 @import 'blocks/post-likes/style';
-@import 'blocks/post-share/style';
 @import 'blocks/privacy-policy-banner/style';
 @import 'blocks/sharing-preview-pane/style';
 @import 'blocks/site-address-changer/style';
diff --git a/client/blocks/post-share/connections-list.jsx b/client/blocks/post-share/connections-list.jsx
index 73ba047e2eb23..46476dcd9b36f 100644
--- a/client/blocks/post-share/connections-list.jsx
+++ b/client/blocks/post-share/connections-list.jsx
@@ -1,19 +1,13 @@
-/** @format */
-
 /**
  * External dependencies
  */
-
 import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
-import { localize } from 'i18n-calypso';
 
 /**
  * Internal dependencies
  */
 import Connection from './connection';
-import Notice from 'components/notice';
-import NoticeAction from 'components/notice/notice-action';
 
 class ConnectionsList extends PureComponent {
 	static propTypes = {
@@ -21,11 +15,6 @@ class ConnectionsList extends PureComponent {
 		onToggle: PropTypes.func,
 		siteId: PropTypes.number,
 		siteSlug: PropTypes.string,
-
-		// connects and helpers
-		moment: PropTypes.func,
-		numberFormat: PropTypes.func,
-		translater: PropTypes.func,
 	};
 
 	static defaultProps = {
@@ -69,14 +58,4 @@ class ConnectionsList extends PureComponent {
 	}
 }
 
-export const NoConnectionsNotice = ( { siteSlug, translate } ) => (
-	<Notice
-		status="is-warning"
-		showDismiss={ false }
-		text={ translate( 'Connect an account to get started.' ) }
-	>
-		<NoticeAction href={ `/sharing/${ siteSlug }` }>{ translate( 'Settings' ) }</NoticeAction>
-	</Notice>
-);
-
-export default localize( ConnectionsList );
+export default ConnectionsList;
diff --git a/client/blocks/post-share/index.jsx b/client/blocks/post-share/index.jsx
index 6854e8601fe9b..3d39a03ec726d 100644
--- a/client/blocks/post-share/index.jsx
+++ b/client/blocks/post-share/index.jsx
@@ -51,9 +51,10 @@ import {
 	isRequestingSitePlans as siteIsRequestingPlans,
 } from 'state/sites/plans/selectors';
 import { FEATURE_REPUBLICIZE } from 'lib/plans/constants';
-import { UpgradeToPremiumNudge } from 'blocks/post-share/nudges';
+import { UpgradeToPremiumNudge } from './nudges';
 import SharingPreviewModal from './sharing-preview-modal';
-import ConnectionsList, { NoConnectionsNotice } from './connections-list';
+import ConnectionsList from './connections-list';
+import NoConnectionsNotice from './no-connections-notice';
 import ActionsList from './publicize-actions-list';
 import CalendarButton from 'blocks/calendar-button';
 import EventsTooltip from 'components/date-picker/events-tooltip';
@@ -61,6 +62,11 @@ import analytics from 'lib/analytics';
 import TrackComponentView from 'lib/analytics/track-component-view';
 import { sectionify } from 'lib/route';
 
+/**
+ * Style dependencies
+ */
+import './style.scss';
+
 class PostShare extends Component {
 	static propTypes = {
 		// parent prps
@@ -318,7 +324,6 @@ class PostShare extends Component {
 						showOutsideDays={ false }
 						title={ translate( 'Set date and time' ) }
 						selectedDay={ this.state.scheduledDate }
-						tabIndex={ 3 }
 						siteId={ siteId }
 						onDateChange={ this.scheduleDate }
 						onDayMouseEnter={ this.showCalendarTooltip }
@@ -484,21 +489,14 @@ class PostShare extends Component {
 	}
 
 	renderPrimarySection() {
-		const { hasFetchedConnections, hasRepublicizeFeature, siteSlug, translate } = this.props;
+		const { hasFetchedConnections, hasRepublicizeFeature, siteSlug } = this.props;
 
 		if ( ! hasFetchedConnections ) {
 			return null;
 		}
 
 		if ( ! this.hasConnections() ) {
-			return (
-				<NoConnectionsNotice
-					{ ...{
-						siteSlug,
-						translate,
-					} }
-				/>
-			);
+			return <NoConnectionsNotice siteSlug={ siteSlug } />;
 		}
 
 		if ( ! hasRepublicizeFeature ) {
diff --git a/client/blocks/post-share/no-connections-notice.jsx b/client/blocks/post-share/no-connections-notice.jsx
new file mode 100644
index 0000000000000..bc84bdb7ba1cf
--- /dev/null
+++ b/client/blocks/post-share/no-connections-notice.jsx
@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { localize } from 'i18n-calypso';
+
+/**
+ * Internal dependencies
+ */
+import Notice from 'components/notice';
+import NoticeAction from 'components/notice/notice-action';
+
+const NoConnectionsNotice = ( { siteSlug, translate } ) => (
+	<Notice
+		status="is-warning"
+		showDismiss={ false }
+		text={ translate( 'Connect an account to get started.' ) }
+	>
+		<NoticeAction href={ `/sharing/${ siteSlug }` }>{ translate( 'Settings' ) }</NoticeAction>
+	</Notice>
+);
+
+export default localize( NoConnectionsNotice );
diff --git a/client/blocks/post-share/style.scss b/client/blocks/post-share/style.scss
index 6e195aeb6e2c4..a389d288f2f42 100644
--- a/client/blocks/post-share/style.scss
+++ b/client/blocks/post-share/style.scss
@@ -1,4 +1,3 @@
-
 $section-border: solid 1px darken( $sidebar-bg-color, 5% );
 
 .post-share .card.banner,
@@ -13,9 +12,13 @@ $section-border: solid 1px darken( $sidebar-bg-color, 5% );
 	position: relative;
 	background-color: var( --color-white );
 
-	& .notice {
-		margin: 0 0 16px;
-		border-radius: 0;
+	.notice {
+		margin-bottom: 0;
+
+		&,
+		.notice__icon-wrapper {
+			border-radius: 0;
+		}
 	}
 }