diff --git a/app/components/Page.js b/app/components/Page.js
index 00f64f2..da3796b 100644
--- a/app/components/Page.js
+++ b/app/components/Page.js
@@ -6,9 +6,9 @@ const Page = ({ title, children }) => (
       <title>{title}</title>
       <meta name="viewport" content="width=device-width, initial-scale=1" />
       <meta name="theme-color" content="#ffffff" />
-      <link rel="manifest" href="/static/manifest.webmanifest" />
-      <link rel="icon" sizes="192x192" href="/static/icon.png" />
-      <link rel="apple-touch-icon" href="/static/launcher-icon.png" />
+      <link rel="manifest" href="/manifest.webmanifest" />
+      <link rel="icon" sizes="192x192" href="/icon.png" />
+      <link rel="apple-touch-icon" href="/launcher-icon.png" />
     </Head>
     {children}
     <style jsx global>{`
diff --git a/app/pages/_app.js b/app/pages/_app.js
index 9dfc16f..a61e905 100644
--- a/app/pages/_app.js
+++ b/app/pages/_app.js
@@ -2,7 +2,7 @@ import 'cross-fetch/polyfill'
 import { InMemoryCache } from 'apollo-cache-inmemory'
 import { ApolloClient } from 'apollo-client'
 import { createUploadLink } from 'apollo-upload-client'
-import App, { Container } from 'next/app'
+import App from 'next/app'
 import Head from 'next/head'
 import { ApolloProvider, getDataFromTree } from 'react-apollo'
 
@@ -46,13 +46,11 @@ export default class CustomApp extends App {
     this.props.apolloClient || createApolloClient(this.props.apolloCache)
 
   render() {
-    const { Component, pageProps } = this.props
+    const { Component, pageProps = {} } = this.props
     return (
-      <Container>
-        <ApolloProvider client={this.apolloClient}>
-          <Component {...pageProps} />
-        </ApolloProvider>
-      </Container>
+      <ApolloProvider client={this.apolloClient}>
+        <Component {...pageProps} />
+      </ApolloProvider>
     )
   }
 }
diff --git a/app/static/icon.png b/app/public/icon.png
similarity index 100%
rename from app/static/icon.png
rename to app/public/icon.png
diff --git a/app/static/launcher-icon.png b/app/public/launcher-icon.png
similarity index 100%
rename from app/static/launcher-icon.png
rename to app/public/launcher-icon.png
diff --git a/app/static/manifest.webmanifest b/app/public/manifest.webmanifest
similarity index 100%
rename from app/static/manifest.webmanifest
rename to app/public/manifest.webmanifest