diff --git a/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue b/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
index 7dc698cb6197758cc48d985571c89471fc2b3974..a5936b02c78e4dc5fa87e3597ba783b3c4e20b51 100644
--- a/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
+++ b/ee/app/assets/javascripts/analytics/productivity_analytics/components/app.vue
@@ -171,7 +171,6 @@ export default {
         __('Productivity analytics can help identify the problems that are delaying your team')
       "
       :svg-path="emptyStateSvgPath"
-      :svg-height="null"
       :description="
         __(
           'Start by choosing a group to start exploring the merge requests in that group. You can then proceed to filter by projects, labels, milestones and authors.',
@@ -183,7 +182,6 @@ export default {
       class="js-empty-state"
       :title="__('You don’t have access to Productivity Analytics in this group')"
       :svg-path="noAccessSvgPath"
-      :svg-height="null"
       :description="
         __(
           'Only ‘Reporter’ roles and above on tiers Premium and above can see Productivity Analytics.',
diff --git a/ee/app/views/groups/analytics/productivity_analytics/show.html.haml b/ee/app/views/groups/analytics/productivity_analytics/show.html.haml
index a519630583f1ba8d2f6e04e7ae513e7ced130441..2c79ece6e7a651300052a547d707d9f67bce7da6 100644
--- a/ee/app/views/groups/analytics/productivity_analytics/show.html.haml
+++ b/ee/app/views/groups/analytics/productivity_analytics/show.html.haml
@@ -3,12 +3,10 @@
 - data_attributes = @request_params.valid? ? @request_params.to_data_attributes : @request_params.to_default_data_attributes
 
 #js-productivity-analytics{ data: data_attributes.merge(hide_group_drop_down: 'true') }
-  .mb-3
-    %h3
-      = _('Productivity Analytics')
+  = render ::Layouts::PageHeadingComponent.new(_('Productivity Analytics'))
   .row-content-block.second-block.gl-flex.flex-column.flex-lg-row.mt-3.py-2.px-3
     .js-group-project-select-container
     .js-search-bar.filter-container.hide.gl-mr-0.mr-lg-3
       = render 'shared/issuable/search_bar', type: :productivity_analytics, placeholder: _('Filter results...')
     .js-timeframe-container{ data: { start_date: ProductivityAnalytics.start_date } }
-  .js-productivity-analytics-app-container{ data: { endpoint: group_analytics_productivity_analytics_path(@group), empty_state_svg_path: image_path('illustrations/productivity-analytics-empty-state.svg'), no_access_svg_path: image_path('illustrations/analytics/no-access.svg') } }
+  .js-productivity-analytics-app-container{ data: { endpoint: group_analytics_productivity_analytics_path(@group), empty_state_svg_path: image_path('illustrations/empty-state/empty-dashboard-md.svg'), no_access_svg_path: image_path('illustrations/status/status-fail-md.svg') } }