diff --git a/src/core/client/stream/components/App.tsx b/src/core/client/stream/components/App.tsx
index 3e2dc2692..eb59b588e 100644
--- a/src/core/client/stream/components/App.tsx
+++ b/src/core/client/stream/components/App.tsx
@@ -3,18 +3,13 @@ import { StatelessComponent } from "react";
 
 import { Center } from "talk-ui/components";
 
-import AssetListContainer from "../containers/AssetListContainer";
 import StreamContainer from "../containers/StreamContainer";
 
 export interface AppProps {
-  assets?: any | null;
-  asset?: {} | null;
+  asset: {} | null;
 }
 
 const App: StatelessComponent<AppProps> = props => {
-  if (props.assets) {
-    return <AssetListContainer assets={props.assets} />;
-  }
   if (props.asset) {
     return (
       <Center>
diff --git a/src/core/client/stream/components/AssetList.tsx b/src/core/client/stream/components/AssetList.tsx
deleted file mode 100644
index a82c34fe6..000000000
--- a/src/core/client/stream/components/AssetList.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as React from "react";
-import { StatelessComponent } from "react";
-
-export interface AssetListProps {
-  assets: ReadonlyArray<{ id: string; title: string | null }>;
-}
-
-const AssetList: StatelessComponent<AssetListProps> = props => {
-  return (
-    <div>
-      {props.assets.map(asset => <div key={asset.id}>{asset.title}</div>)}
-    </div>
-  );
-};
-
-export default AssetList;
diff --git a/src/core/client/stream/components/Indent.css b/src/core/client/stream/components/Indent.css
index c8b46961a..dcf73c502 100644
--- a/src/core/client/stream/components/Indent.css
+++ b/src/core/client/stream/components/Indent.css
@@ -1,7 +1,6 @@
 .root {
-  margin-left: 2px;
-  border-left: 2px solid;
-  padding-left: 5px;
+  border-left: 3px solid;
+  padding-left: calc(2px * $spacing-unit);
 }
 
 .level0 {
diff --git a/src/core/client/stream/containers/AppContainer.tsx b/src/core/client/stream/containers/AppContainer.tsx
index 89acdea38..8b84660ca 100644
--- a/src/core/client/stream/containers/AppContainer.tsx
+++ b/src/core/client/stream/containers/AppContainer.tsx
@@ -18,14 +18,8 @@ const AppContainer: StatelessComponent<InnerProps> = props => {
 const enhanced = withFragmentContainer<{ data: Data }>({
   data: graphql`
     fragment AppContainer on Query
-      @argumentDefinitions(
-        assetID: { type: "ID!" }
-        showAssetList: { type: "Boolean!" }
-      ) {
-      assets @include(if: $showAssetList) {
-        ...AssetListContainer_assets
-      }
-      asset(id: $assetID) @skip(if: $showAssetList) {
+      @argumentDefinitions(assetID: { type: "ID!" }) {
+      asset(id: $assetID) {
         ...StreamContainer_asset
       }
     }
diff --git a/src/core/client/stream/containers/AssetListContainer.tsx b/src/core/client/stream/containers/AssetListContainer.tsx
deleted file mode 100644
index 42345cc16..000000000
--- a/src/core/client/stream/containers/AssetListContainer.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { StatelessComponent } from "react";
-import { graphql } from "react-relay";
-
-import { withFragmentContainer } from "talk-framework/lib/relay";
-import { PropTypesOf } from "talk-framework/types";
-import { AssetListContainer_assets as Data } from "talk-stream/__generated__/AssetListContainer_assets.graphql";
-
-import AssetList from "../components/AssetList";
-
-interface InnerProps {
-  assets: Data;
-}
-
-const AssetListContainer: StatelessComponent<InnerProps> = props => {
-  const assets = props.assets.edges.map(edge => edge.node);
-  return <AssetList assets={assets} />;
-};
-
-const enhanced = withFragmentContainer<{ assets: Data }>({
-  assets: graphql`
-    fragment AssetListContainer_assets on AssetsConnection {
-      edges {
-        node {
-          id
-          title
-        }
-      }
-    }
-  `,
-})(AssetListContainer);
-
-export type AssetListContainerProps = PropTypesOf<typeof enhanced>;
-export default enhanced;
diff --git a/src/core/client/stream/queries/AppQuery.tsx b/src/core/client/stream/queries/AppQuery.tsx
index 424a11dd6..3fe95b6d9 100644
--- a/src/core/client/stream/queries/AppQuery.tsx
+++ b/src/core/client/stream/queries/AppQuery.tsx
@@ -33,16 +33,12 @@ const AppQuery: StatelessComponent<InnerProps> = props => {
   return (
     <QueryRenderer<AppQueryVariables, AppQueryResponse>
       query={graphql`
-        query AppQuery($showAssetList: Boolean!, $assetID: ID!) {
-          ...AppContainer
-            @arguments(showAssetList: $showAssetList, assetID: $assetID)
+        query AppQuery($assetID: ID!) {
+          ...AppContainer @arguments(assetID: $assetID)
         }
       `}
       variables={{
-        // We cast `null` to any due to restrictions of the current graphql syntax.
-        assetID: props.local.assetID || (null as any),
-        // TODO: This is set to false, as server does not support querying assets yet.
-        showAssetList: !props.local.assetID && false,
+        assetID: props.local.assetID,
       }}
       render={render}
     />