diff --git a/static/css/pages/error-view.css b/static/css/pages/error-view.css
index d140d7206..bee7921d6 100644
--- a/static/css/pages/error-view.css
+++ b/static/css/pages/error-view.css
@@ -7,6 +7,10 @@
     margin-bottom: 10px;
 }
 
+.error-view-element h2 .repo-circle {
+    margin-right: 16px;
+}
+
 .error-view-element h3 {
     font-size: 24px;
 }
diff --git a/static/partials/app-view.html b/static/partials/app-view.html
index d8d5d0587..5829ee806 100644
--- a/static/partials/app-view.html
+++ b/static/partials/app-view.html
@@ -1,5 +1,19 @@
 <div class="resource-view repository-view"
      resource="repositoryResource"
      error-message="'Application not found'">
-  <app-public-view repository="viewScope.repository"></app-public-view>
+    <!-- Image repository error -->
+    <div class="co-main-content-panel" ng-if="viewScope.repository.kind == 'image'">
+      <div class="error-view-element">
+        <h2><span class="repo-circle no-background" repo="viewScope.repository"></span>{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }}</h2>
+        <h3>This name refers to a <strong>container image</strong> repository</h3>
+        <div style="margin-bottom: 20px;">
+          View the <a href="/repository/{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }}/">{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }} image repository</a>
+        </div>
+      </div>
+    </div>
+
+    <!-- Application repository view -->
+    <div ng-if="viewScope.repository.kind == 'application'">
+      <app-public-view repository="viewScope.repository"></app-public-view>
+    </div>
 </div>
diff --git a/static/partials/repo-view.html b/static/partials/repo-view.html
index 9da90ba49..af949ed0d 100644
--- a/static/partials/repo-view.html
+++ b/static/partials/repo-view.html
@@ -2,26 +2,18 @@
      resource="repositoryResource"
      error-message="'Repository not found'">
   <div class="page-content">
-    <!-- New Public Repo Page experiment -->
-    <div ng-if="newRepoExperiment" class="rp-mainPanel">
-      <!-- React Components -->
-      <div class="rp-main col-md-8">
-        <!-- Header -->
-        <div class="rp-header">
-          <rp-header name="repository.name" namespace="repository.namespace"></rp-header>
+    <!-- Application repository error -->
+    <div class="co-main-content-panel" ng-if="viewScope.repository.kind == 'application'">
+      <div class="error-view-element">
+        <h2><span class="repo-circle no-background" repo="viewScope.repository"></span>{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }}</h2>
+        <h3>This name refers to an <strong>application</strong> repository</h3>
+        <div style="margin-bottom: 20px;">
+          View the <a href="/application/{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }}/">{{ viewScope.repository.namespace }}/{{ viewScope.repository.name }} application</a>
         </div>
-        <!-- Body -->
-        <div>
-          <rp-body description="repository.description" repository="repository"></rp-body>
-        </div>
-      </div>
-      <!-- Sidebar -->
-      <div class="rp-sidebar col-md-4">
-        <rp-sidebar is-public="repository.is_public" tags="repository.tags" repository="repository"></rp-sidebar>
       </div>
     </div>
-    <!-- Old Repo Page -->
-    <div ng-if="!newRepoExperiment">
+    <!-- Image repository view -->
+    <div ng-if="viewScope.repository.kind == 'image'">
       <div class="cor-title">
         <span class="cor-title-link">
           <a class="back-link" href="/repository">