diff --git a/packages/strapi-plugin-upload/admin/src/components/ListHeader/index.js b/packages/strapi-plugin-upload/admin/src/components/ListHeader/index.js
index f14ab90cea..fb0279918e 100644
--- a/packages/strapi-plugin-upload/admin/src/components/ListHeader/index.js
+++ b/packages/strapi-plugin-upload/admin/src/components/ListHeader/index.js
@@ -20,21 +20,24 @@ function ListHeader({ changeSort, sort }) {
     '',
     '',
   ];
+  console.log(sort);
 
   const handleChangeSort = name => {
-    if (sort === name) {
-      changeSort(`-${name}`);
-    } else if (sort === `-${name}`) {
-      changeSort('hash');
+    if (sort === `${name}:ASC`) {
+      changeSort(`${name}:DESC`);
+    } else if (sort === `${name}:DESC`) {
+      changeSort('hash:ASC');
     } else if (name === 'updated' || name === 'related') {
-      changeSort('hash');
+      changeSort('hash:ASC');
     } else {
-      changeSort(name);
+      changeSort(`${name}:ASC`);
     }
   };
 
   const shouldDisplaySort = title =>
-    (sort === title && 'icon') || (sort === `-${title}` && 'iconDesc') || '';
+    (sort === `${title}:ASC` && 'icon') ||
+    (sort === `${title}:DESC` && 'iconDesc') ||
+    '';
 
   return (
     <StyledLi>
diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/Label.js b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/Label.js
new file mode 100644
index 0000000000..eeffbfb5f6
--- /dev/null
+++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/Label.js
@@ -0,0 +1,82 @@
+import styled, { css, keyframes } from 'styled-components';
+
+const Label = styled.label`
+  position: relative;
+  height: 146px;
+  width: 100%;
+  padding-top: 28px;
+  border: 2px dashed #e3e9f3;
+  border-radius: 2px;
+  text-align: center;
+
+  > input {
+    display: none;
+  }
+
+  .icon {
+    width: 82px;
+    path {
+      fill: ${({ showLoader }) => (showLoader ? '#729BEF' : '#ccd0da')};
+      transition: fill 0.3s ease;
+    }
+  }
+
+  .isDraging {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+
+  .underline {
+    color: #1c5de7;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
+  &:hover {
+    cursor: pointer;
+  }
+
+  ${({ isDraging }) => {
+    if (isDraging) {
+      return css`
+        background-color: rgba(28, 93, 231, 0.01) !important;
+        border: 2px dashed rgba(28, 93, 231, 0.1) !important;
+      `;
+    }
+  }}
+
+  ${({ showLoader }) => {
+    if (showLoader) {
+      return css`
+        -webkit-animation: ${smoothBlink('transparent', 'rgba(28,93,231,0.05)')}
+          2s linear infinite;
+        -moz-animation: ${smoothBlink('transparent', 'rgba(28,93,231,0.05)')} 2s
+          linear infinite;
+        -o-animation: ${smoothBlink('transparent', 'rgba(28,93,231,0.05)')} 2s
+          linear infinite;
+        animation: ${smoothBlink('transparent', 'rgba(28,93,231,0.05)')} 2s
+          linear infinite;
+      `;
+    }
+  }}
+`;
+
+const smoothBlink = (firstColor, secondColor) => keyframes`
+  0% {
+    fill: ${firstColor};
+    background-color: ${firstColor};
+  }
+  26% {
+    fill: ${secondColor};
+    background-color: ${secondColor};
+  }
+  76% {
+    fill: ${firstColor};
+    background-color: ${firstColor};
+  }
+`;
+
+export default Label;
diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/P.js b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/P.js
new file mode 100644
index 0000000000..d8b2695a2c
--- /dev/null
+++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/P.js
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+
+const P = styled.p`
+  margin-top: 10px;
+  text-align: center;
+  font-size: 13px;
+  color: #9ea7b8;
+
+  u {
+    color: #1c5de7;
+  }
+`;
+
+export default P;
diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js
index 612ce4daf8..014543c6af 100644
--- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js
+++ b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/index.js
@@ -7,9 +7,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import cn from 'classnames';
-
-import styles from './styles.scss';
+import Label from './Label';
+import P from './P';
 
 /* eslint-disable react/no-string-refs */
 /* eslint-disable jsx-a11y/label-has-for */
@@ -37,17 +36,14 @@ class PluginInputFile extends React.PureComponent {
     const { isDraging } = this.state;
     const link = (
       <FormattedMessage id="upload.PluginInputFile.link">
-        {message => <span className={styles.underline}>{message}</span>}
+        {message => <span className="underline">{message}</span>}
       </FormattedMessage>
     );
 
     return (
-      <label
-        className={cn(
-          styles.pluginInputFile,
-          isDraging && styles.pluginInputFileHover,
-          showLoader && styles.quadrat
-        )}
+      <Label
+        showLoader={showLoader}
+        isDraging={isDraging}
         onDragEnter={this.handleDragEnter}
         onDragOver={e => {
           e.preventDefault();
@@ -56,7 +52,7 @@ class PluginInputFile extends React.PureComponent {
         onDrop={this.handleDrop}
       >
         <svg
-          className={styles.icon}
+          className="icon"
           xmlns="http://www.w3.org/2000/svg"
           viewBox="0 0 104.40317 83.13328"
         >
@@ -115,7 +111,7 @@ class PluginInputFile extends React.PureComponent {
             />
           </g>
         </svg>
-        <p className={styles.textWrapper}>
+        <P>
           {!showLoader && (
             <FormattedMessage
               id="upload.PluginInputFile.text"
@@ -125,13 +121,10 @@ class PluginInputFile extends React.PureComponent {
           {showLoader && (
             <FormattedMessage id="upload.PluginInputFile.loading" />
           )}
-        </p>
-        <div
-          onDragLeave={this.handleDragLeave}
-          className={cn(isDraging && styles.isDraging)}
-        />
+        </P>
+        <div onDragLeave={this.handleDragLeave} className="isDraging" />
         <input multiple name={name} onChange={this.handleChange} type="file" />
-      </label>
+      </Label>
     );
   }
 }
diff --git a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss b/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss
deleted file mode 100644
index 8a8bae1dd9..0000000000
--- a/packages/strapi-plugin-upload/admin/src/components/PluginInputFile/styles.scss
+++ /dev/null
@@ -1,102 +0,0 @@
-.isDraging {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-
-.pluginInputFile {
-  position: relative;
-  height: 146px;
-  width: 100%;
-  padding-top: 28px;
-  border: 2px dashed #E3E9F3;
-  border-radius: 2px;
-  text-align: center;
-
-  > input {
-    display: none;
-  }
-
-  .icon{
-    width: 82px;
-    path{
-      fill: #CCD0DA;
-      transition: fill .3s ease;
-    }
-  }
-
-  &:hover{
-    cursor: pointer;
-  }
-}
-
-.textWrapper {
-  margin-top: 10px;
-  text-align: center;
-  font-size: 13px;
-  color: #9EA7B8;
-
-  u {
-    color: #1C5DE7;
-  }
-}
-
-.pluginInputFileHover {
-  background-color: rgba(28,93,231,0.01) !important;
-  border: 2px dashed rgba(28,93,231,0.10) !important;
-}
-
-.underline {
-  color: #1C5DE7;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-@mixin smoothBlink($firstColor, $secondColor) {
-  @-webkit-keyframes blink {
-    0% {
-      fill: $firstColor;
-      background-color: $firstColor;
-    }
-    26% {
-      fill: $secondColor;
-      background-color: $secondColor;
-    }
-    76% {
-      fill: $firstColor;
-      background-color: $firstColor;
-    }
-  }
-
-  @keyframes blink {
-    0% {
-      fill: $firstColor;
-      background-color: $firstColor;
-    }
-    26% {
-      fill: $secondColor;
-      background-color: $secondColor;
-    }
-    76% {
-      fill: $firstColor;
-      background-color: $firstColor;
-    }
-  }
-
-  -webkit-animation: blink 2s linear infinite;
-  -moz-animation: blink 2s linear infinite;
-  -o-animation: blink 2s linear infinite;
-  animation: blink 2s linear infinite;
-}
-
-.quadrat {
-  .icon{
-    path {
-      fill: #729BEF;
-    }
-  }
-
-  @include smoothBlink(transparent, rgba(28, 93, 231, 0.05));
-}
diff --git a/packages/strapi-plugin-upload/admin/src/containers/ConfigPage/styles.scss b/packages/strapi-plugin-upload/admin/src/containers/ConfigPage/styles.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss b/packages/strapi-plugin-upload/admin/src/containers/HomePage/components.js
similarity index 51%
rename from packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss
rename to packages/strapi-plugin-upload/admin/src/containers/HomePage/components.js
index fc269b5952..ee10d5a176 100644
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/styles.scss
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/components.js
@@ -1,12 +1,16 @@
-.homePageUpload {
-  padding-right: 20px;
-  font-family: Lato !important;
-}
+import styled from 'styled-components';
 
-.entriesWrapper {
+const EntriesWrapper = styled.div`
   display: flex;
   height: 43px;
   width: 100%;
   padding-top: 16px;
   justify-content: space-between;
-}
+`;
+
+const Wrapper = styled.div`
+  padding-right: 20px;
+  font-family: Lato !important;
+`;
+
+export { EntriesWrapper, Wrapper };
diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js
index 6f87beac33..eb0cf70661 100644
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/index.js
@@ -7,7 +7,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-// import { createStructuredSelector } from 'reselect';
 import { injectIntl } from 'react-intl';
 import { bindActionCreators, compose } from 'redux';
 import { isEmpty } from 'lodash';
@@ -26,8 +25,8 @@ import pluginId from '../../pluginId';
 import EntriesNumber from '../../components/EntriesNumber';
 import List from '../../components/List';
 import PluginInputFile from '../../components/PluginInputFile';
+import { EntriesWrapper, Wrapper } from './components';
 
-// Actions
 import {
   changeParams,
   deleteData,
@@ -36,13 +35,7 @@ import {
   onSearch,
   setParams,
 } from './actions';
-
-// Selectors
 import selectHomePage from './selectors';
-
-// Styles
-import styles from './styles.scss';
-
 import reducer from './reducer';
 import saga from './saga';
 
@@ -120,7 +113,7 @@ export class HomePage extends React.Component {
   render() {
     return (
       <ContainerFluid>
-        <div className={styles.homePageUpload}>
+        <Wrapper>
           <PluginHeader
             title={{
               id: 'upload.HomePage.title',
@@ -130,13 +123,13 @@ export class HomePage extends React.Component {
             }}
             overrideRendering={this.renderInputSearch}
           />
-        </div>
+        </Wrapper>
         <PluginInputFile
           name="files"
           onDrop={this.props.onDrop}
           showLoader={this.props.uploadFilesLoading}
         />
-        <div className={styles.entriesWrapper}>
+        <EntriesWrapper>
           <div>
             {/* NOTE: Prepare for bulk actions}
               <InputSelect
@@ -148,7 +141,7 @@ export class HomePage extends React.Component {
             */}
           </div>
           <EntriesNumber number={this.props.entriesNumber} />
-        </div>
+        </EntriesWrapper>
         <List
           data={this.props.uploadedFiles}
           changeSort={this.changeSort}
diff --git a/packages/strapi-plugin-upload/admin/src/containers/HomePage/reducer.js b/packages/strapi-plugin-upload/admin/src/containers/HomePage/reducer.js
index abbbdd4b2b..a6e0518dc1 100644
--- a/packages/strapi-plugin-upload/admin/src/containers/HomePage/reducer.js
+++ b/packages/strapi-plugin-upload/admin/src/containers/HomePage/reducer.js
@@ -26,7 +26,7 @@ const initialState = fromJS({
   search: '',
   uploadedFiles: List([]),
   params: Map({
-    _sort: 'hash',
+    _sort: 'hash:ASC',
     _limit: 10,
     _page: 1,
   }),
@@ -37,10 +37,11 @@ function homePageReducer(state = initialState, action) {
     case CHANGE_PARAMS:
       return state.updateIn(action.keys, () => action.value);
     case DELETE_SUCCESS:
-      return state.update('deleteSuccess', (v) => v = !v);
+      return state.update('deleteSuccess', v => (v = !v));
     case DROP_SUCCESS:
-      return state
-        .update('uploadedFiles', (list) => List(action.newFiles).concat(list));
+      return state.update('uploadedFiles', list =>
+        List(action.newFiles).concat(list)
+      );
     case GET_DATA_SUCCESS:
       return state
         .update('uploadedFiles', () => List(action.data))