diff --git a/packages/strapi-admin/admin/src/components/Row/index.js b/packages/strapi-admin/admin/src/components/Row/index.js
index 4171583636..fc3c012a92 100644
--- a/packages/strapi-admin/admin/src/components/Row/index.js
+++ b/packages/strapi-admin/admin/src/components/Row/index.js
@@ -8,9 +8,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
 import { FormattedMessage } from 'react-intl';
+import { get } from 'lodash';
 
 // Design
-import Ico from 'components/Ico';
+import IcoContainer from 'components/IcoContainer';
 import ListRow from 'components/ListRow';
 import PopUpWarning from 'components/PopUpWarning';
 
@@ -31,6 +32,27 @@ class Row extends React.Component {
   }
 
   render() {
+    const uploadPath = `/plugins/upload/configurations/${get(this.context, ['appEnvironments', '0', 'name'])}`;
+    const icons = this.props.name === 'upload' ? [
+      {
+        icoType: 'cog',
+        onClick: (e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          this.context.router.history.push(uploadPath);
+        },
+      },
+      {
+        icoType: 'trash',
+        onClick: this.handleClick,
+      },
+    ] : [
+      {
+        icoType: 'trash',
+        onClick: this.handleClick,
+      },
+    ];
+
     return (
       <ListRow>
         <div className={cn("col-md-11", styles.nameWrapper)}>
@@ -44,7 +66,7 @@ class Row extends React.Component {
         </div>
         <div className="col-md-1">
           <div className={styles.actionContainer}>
-            <Ico onClick={this.handleClick} id={this.props.name} />
+            <IcoContainer icons={icons} />
           </div>
         </div>
         <PopUpWarning
@@ -58,6 +80,11 @@ class Row extends React.Component {
   }
 }
 
+Row.contextTypes = {
+  appEnvironments: PropTypes.array,
+  router: PropTypes.object,
+};
+
 Row.propTypes = {
   name: PropTypes.string.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
diff --git a/packages/strapi-plugin-upload/admin/src/components/FileIcon/extensions.json b/packages/strapi-plugin-upload/admin/src/components/FileIcon/extensions.json
index f821dee9ee..936f8fc66d 100644
--- a/packages/strapi-plugin-upload/admin/src/components/FileIcon/extensions.json
+++ b/packages/strapi-plugin-upload/admin/src/components/FileIcon/extensions.json
@@ -1,7 +1,7 @@
 {
   "archive":  ["rar", "zip"],
   "code": ["js", "json", "rb", "erb", "txt", "css", "scss", "html", "jsx"],
-  "img": ["jpg", "jpeg", "png", "gif"],
+  "img": ["jpg", "jpeg", "png", "gif", "ico"],
   "pdf": ["pdf"],
   "powerpoint": ["ppt", "key", "xls"],
   "video": ["mov", "avi", "mpg", "mp4", "m4v"],
diff --git a/packages/strapi-plugin-upload/admin/src/containers/App/index.js b/packages/strapi-plugin-upload/admin/src/containers/App/index.js
index c7c29482e0..0c90f21f39 100755
--- a/packages/strapi-plugin-upload/admin/src/containers/App/index.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/App/index.js
@@ -20,7 +20,7 @@ function App() {
   return (
     <div className={pluginId}>
       <Switch>
-        <Route path={`/plugins/${pluginId}/:env`} component={ConfigPage} exact />
+        <Route path={`/plugins/${pluginId}/configurations/:env`} component={ConfigPage} exact />
         <Route path={`/plugins/${pluginId}`} component={HomePage} exact />
         <Route component={NotFoundPage} />
       </Switch>