diff --git a/.gitignore b/.gitignore
index c6efb61..6e92d06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,10 +24,12 @@
 !/bin/console
 !/bin/symfony_requirements
 
-# assets
+# assets, uploads
 /node_modules/
 /web/assets/*
 !/web/assets/.gitkeep
+/web/uploads/*
+!/web/uploads/.gitkeep
 
 # PHP-CS-Fixer
 /.php_cs.*
diff --git a/.travis.yml b/.travis.yml
index ee6f05e..850750f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ php:
 
 before_script:
     - nvm install "$(jq -r '.engines.node' package.json)"
-    - make install-bin-dev install-bin-prod install-composer install-npm db-build clean
+    - make install-bin-dev install-bin-prod install-composer install-npm db-build assets-build
 
 script:
     - npm run lint
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6e48e7..71a6d3c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,15 +24,13 @@ Note: If it unluckily fails at some point, don't hesitate to re-run this command
 ```shell
 # connect to the VM
 make ssh
-# install the project for development (you'll have to press "Enter" several times to keep default parameters)
+# install the project for development (you'll have to press "Enter" several times to configure the project with default parameters)
 make install
-# serve assets for development environment
-npm start
 ```
 
 #### 4. Enjoy
 
-You should see your application up and running at http://appbuild.dev/app_dev.php/
+You should see your application up and running at http://local.appbuild.com/app_dev.php/
 
 Try to login using one of the following credentials:
 ```
@@ -46,13 +44,13 @@ user@user.fr => user
 
 Front assets (css/js/images) are handled by [Webpack](https://webpack.js.org/).
 
-When you're in development environment (i.e. `http://appbuild.dev/app_dev.php/...`), the project is configured to use webpack dev server to serve assets, it means that the project will seems to be broken until you run the following command:
+When you're in production environment (i.e. `http://local.appbuild.com/...`), the project will use the assets found in `web/assets`, it means that you'll have to run `make assets-build` each time you edit an asset file to see the modification in your browser (after refreshing it manually). 
+
+When you're in development environment (i.e. `http://local.appbuild.com/app_dev.php/...`), you can also watch asset modifications to benefit from the hot reloading feature of webpack-dev-server, by typing the following command:
 ```shell
-npm start
+make assets-watch
 ```
 
-When you're in production environment (i.e. `http://appbuild.dev/...`), the project will use the assets found in `web/assets`, it means that you'll have to run `npm run build` each time you edit an asset file to see the modification in your browser (after refreshing it). 
-
 ### Common tasks
 ```shell
 # rebuild the whole database with clean fixtures
diff --git a/Makefile b/Makefile
index 14423eb..9c7e07a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: provision start stop ssh destroy rebuild clean install update
+.PHONY: provision start stop ssh destroy rebuild clean install update clean
 
 #
 # Main targets
@@ -56,7 +56,7 @@ install-jwt:
 	test -f var/jwt/private.pem || openssl genrsa -out var/jwt/private.pem -passout pass:Appbuild -aes256 4096
 	test -f var/jwt/public.pem || openssl rsa -in var/jwt/private.pem -passin pass:Appbuild -pubout -out var/jwt/public.pem
 
-install: install-bin-dev install-bin-prod install-composer install-jwt install-npm db-build assets-build clean
+install: install-bin-dev install-bin-prod install-composer install-jwt install-npm db-build assets-build
 
 # Update
 update: update-composer clean
@@ -84,12 +84,14 @@ db-update:
 	php bin/console doctrine:migrations:migrate -n
 
 # Assets
-assets-build:
-	npm run build
+assets-build: clean npm-build
 
-assets-watch:
+assets-watch: clean
 	npm start
 
+npm-build:
+	npm run build
+
 # Production
 prod-install: install-bin-prod
 	SYMFONY_ENV=prod php bin/composer install --no-dev --optimize-autoloader --no-interaction
diff --git a/README.md b/README.md
index b4ee9e9..bf021d9 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Appbuild is a "simple" [Symfony 3.3](http://symfony.com/doc/3.3/index.html) appl
 - [Linux](https://getgnulinux.org) (it may works on Windows/macOS but you can't blame us if it doesn't)
 - [`php 5.6.19+`](http://php.net) (`php 7+` is recommended)
 - [`MySQL`](https://www.mysql.com) (it should also work using [`MariaDB`](https://mariadb.org), if not => please let us know)
-- [`Node.js`](https://nodejs.org) along with `npm` (it works great with `npm 5.2.0` for instance)
+- [`Node.js`](https://nodejs.org) along with `npm` (it works great with `npm 5.7.1` for instance)
 - HTTP server supporting PHP (such as [`nginx`](http://nginx.org) + [`php-fpm`](http://php.net/manual/fr/install.fpm.php), etc.)
 
 ### Application setup
@@ -68,6 +68,13 @@ More documentation for specific HTTP servers:
 
 ## API documentation
 
+*WARNING*
+
+*This API is still in BETA, it may be strongly updated.*
+*Please be really careful before updating this project if you were already using the API.*
+
+*/WARNING*
+
 Before using the API, you must read [this documentation about how to be authenticated on the API side](doc/api/authentication.md).
 
 - [/api/application](doc/api/application.md)
diff --git a/ansible/vagrant-parameters.yml.dist b/ansible/vagrant-parameters.yml.dist
index ce60bc6..c59e970 100644
--- a/ansible/vagrant-parameters.yml.dist
+++ b/ansible/vagrant-parameters.yml.dist
@@ -12,7 +12,7 @@ vm_ip: '192.168.100.70'
 # List of aliases bound to the Virtual Machine's IP (see "vm_ip")
 # If the plugin "vagrant-hostmanager" is installed, these aliases will be added to your "/etc/hosts" file automatically.
 # Else, aliases will be displayed in the console during VM provisioning, then it will be up to you to copy/paste this output in your "/etc/hosts" file.
-vm_ip_aliases: ['appbuild.dev']
+vm_ip_aliases: ['local.appbuild.com']
 
 # VM hostname (this will be added to the "vm_ip_aliases" list, displayed in your SSH terminal, etc.)
 vm_hostname: 'appbuild'
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 15dc028..faaa7cd 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -3,7 +3,7 @@
 workspace: '/var/www/Appbuild'
 
 sites:
-  - { name: 'Appbuild', server_name: 'appbuild.dev', template: 'vhost.symfony.j2', client_max_body_size: '1024M' }
+  - { name: 'Appbuild', server_name: 'local.appbuild.com', template: 'vhost.symfony.j2', client_max_body_size: '1024M' }
 
 mysql:
   users:
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 23a1424..2b60832 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -65,9 +65,25 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         // Handle webpack-dev-server assets dynamically served
         if ($this->getEnvironment() === 'dev') {
             $loader->load(function (ContainerBuilder $container) {
+                // Check if webpack dev server is up before using it
+                @file_get_contents($container->getParameter('webpack_dev_server_base_url'));
+                if (!isset($http_response_header)) {
+                    return;
+                }
+
+                // Override "framework.assets.packages.static" configuration to use webpack dev server
                 $container->loadFromExtension('framework', [
                     'assets' => [
-                        'base_url' => 'http://'.$container->getParameter('webpack_dev_server_host').':8080',
+                        'packages' => [
+                            'static' => [
+                                'base_path' => null,
+                                'base_url' => sprintf(
+                                    '%s/%s',
+                                    rtrim($container->getParameter('webpack_dev_server_base_url'), '/'),
+                                    $container->getParameter('static_assets_base_path')
+                                ),
+                            ],
+                        ],
                     ],
                 ]);
             });
diff --git a/app/DoctrineMigrations/Version20171019161456.php b/app/DoctrineMigrations/Version20171019161456.php
new file mode 100644
index 0000000..2b6c593
--- /dev/null
+++ b/app/DoctrineMigrations/Version20171019161456.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171019161456 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE appbuild_application ADD display_image_file_path VARCHAR(510) DEFAULT NULL, ADD full_size_image_file_path VARCHAR(510) DEFAULT NULL');
+        $this->addSql('ALTER TABLE appbuild_build CHANGE file_path file_path VARCHAR(510) DEFAULT NULL');
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE appbuild_application DROP display_image_file_path, DROP full_size_image_file_path');
+        $this->addSql('ALTER TABLE appbuild_build CHANGE file_path file_path VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci');
+    }
+}
diff --git a/app/config/config.yml b/app/config/config.yml
index 2a74ac9..7c48961 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -2,15 +2,21 @@ imports:
     - { resource: 'parameters.yml' }
     - { resource: 'security.yml' }
 
-# Put parameters here that don't need to change on each machine where the app is deployed
-# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
 
     # Locales
     routing_locales: '(fr|en)'
     enabled_locales: ['fr', 'en']
 
-    # Miscellaneous
+    # Assets
+    static_assets_base_path: 'assets' # corresponding to __STATIC_ASSETS_BASE_PATH__ value in webpack.config.js
+    uploads_assets_base_path: 'uploads'
+
+    # Application images
+    application_images_webroot_relative_dir: '%uploads_assets_base_path%/application_images'
+    application_images_dir: '%kernel.project_dir%/web/%application_images_webroot_relative_dir%'
+
+    # API
     build_token_ttl: 600 # seconds
 
 framework:
@@ -19,7 +25,7 @@ framework:
     default_locale: '%default_locale%'
     secret: '%secret%'
     router:
-        resource: '%kernel.root_dir%/config/routing.yml'
+        resource: '%kernel.project_dir%/app/config/routing.yml'
         strict_requirements: ~
     form:            ~
     csrf_protection: ~
@@ -28,12 +34,14 @@ framework:
         engines: ['twig']
     trusted_hosts:   ~
     session:
-        # http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         handler_id: 'session.handler.native_file'
         save_path: '%session_save_path%'
     fragments: ~
     http_method_override: true
-    assets: ~
+    assets:
+        packages:
+            static:
+                base_path: '%static_assets_base_path%'
     php_errors:
         log: true
 
@@ -44,6 +52,7 @@ twig:
         - 'bootstrap_3_layout.html.twig'
     globals:
         timezone: '%timezone%'
+        application_images_webroot_relative_dir: '%application_images_webroot_relative_dir%'
 
 doctrine:
     dbal:
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 034680d..2ea0305 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -3,7 +3,7 @@ imports:
 
 framework:
     router:
-        resource: '%kernel.root_dir%/config/routing_dev.yml'
+        resource: '%kernel.project_dir%/app/config/routing_dev.yml'
         strict_requirements: true
     profiler: { only_exceptions: false }
 
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 6e2ec11..ca0e8f7 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -1,6 +1,5 @@
 # This file is a "template" of what your parameters.yml file should look like
-# Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
-# http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+# Set parameters here which may be different on each deployment target of this app, e.g. development, staging, production.
 parameters:
     # Database configurations
     database_host: '127.0.0.1'
@@ -16,14 +15,14 @@ parameters:
     mailer_user:       ~
     mailer_password:   ~
 
-    # A secret key that's used to generate certain security-related tokens
+    # A secret key that's used to generate some security-related tokens
     secret: 'ThisTokenIsNotSoSecretChangeIt'
 
     # webpack-dev-server (to watch assets modification in development environment)
-    webpack_dev_server_host: 'appbuild.dev' # could be 'localhost' if you're not using the provided Vagrant environment
+    webpack_dev_server_base_url: 'http://local.appbuild.com:8080' # could be 'http://localhost:8080' if you're not using the provided Vagrant environment
 
     # Symfony session path (set this to '/tmp/sessions' for example if you encounter some issues in dev environment)
-    session_save_path: '%kernel.root_dir%/../var/sessions/%kernel.environment%'
+    session_save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
 
     # Default locale
     default_locale: 'en' # supported values are 'en' and 'fr'
@@ -32,10 +31,10 @@ parameters:
     timezone: 'UTC' # any PHP timezone (such as 'Europe/Paris') is supported. See http://php.net/manual/fr/timezones.php for complete list.
 
     # Path to the directory where builds file will be stored
-    builds_application_dir: '%kernel.root_dir%/../var/build_files'
+    builds_application_dir: '%kernel.project_dir%/var/build_files'
 
     # JWT parameters for API authentication
-    jwt_private_key_path: '%kernel.root_dir%/../var/jwt/private.pem' # ssh private key path
-    jwt_public_key_path:  '%kernel.root_dir%/../var/jwt/public.pem'  # ssh public key path
+    jwt_private_key_path: '%kernel.project_dir%/var/jwt/private.pem' # ssh private key path
+    jwt_public_key_path:  '%kernel.project_dir%/var/jwt/public.pem'  # ssh public key path
     jwt_key_pass_phrase:  'Appbuild'                                 # ssh key pass phrase
     jwt_token_ttl:        31536000                                   # Approximately one year
diff --git a/app/config/security.yml b/app/config/security.yml
index 95cb6f2..8786450 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -12,7 +12,7 @@ security:
     firewalls:
         # disables authentication for assets and the profiler
         dev:
-            pattern: '^/(_(profiler|wdt)|assets)/'
+            pattern: '^/(_(profiler|wdt)|assets|uploads)/'
             security: false
 
         # API security
diff --git a/doc/api/build.md b/doc/api/build.md
index 9946f29..d00a07b 100644
--- a/doc/api/build.md
+++ b/doc/api/build.md
@@ -17,7 +17,7 @@ GET /api/build/{id}
   "version": "1.5.2",
   "comment": "This is a comment for this build.\nWith a line break.\nAnd another one.\n",
   "is_latest": true,
-  "download_link": "http://app-build.dev/app_dev.php/fr/application/1/build/1/download",
+  "download_link": "http://my-appbuild.domain/fr/application/1/build/1/download",
   "application": {
     "id": 1
   }
@@ -42,7 +42,7 @@ GET /api/application/{application_id}/build
     "version": "1.5.2",
     "comment": "This is a comment for this build.\nWith a line break.\nAnd another one.\n",
     "is_latest": true,
-    "download_link": "http://app-build.dev/app_dev.php/fr/application/1/build/1/download",
+    "download_link": "http://my-appbuild.domain/fr/application/1/build/1/download",
     "application": {
       "id": 1
     }
@@ -67,7 +67,7 @@ GET /api/application/{application_id}/build/latest
   "id": 1,
   "version": "1.5.2",
   "comment": "This is a comment for this build.\nWith a line break.\nAnd another one.\n",
-  "download_link": "http://app-build.dev/app_dev.php/fr/application/1/build/1/download"
+  "download_link": "http://my-appbuild.domain/fr/application/1/build/1/download"
 }
 ```
 
@@ -94,19 +94,18 @@ PUT /api/application/{application_id}/build
 ```json
 {
   "build_id": 4,
-  "upload_location": "http://app-build.domain/api/build/4/file"
+  "upload_location": "http://my-appbuild.domain/api/build/4/file"
 }
 ```
 
 ## Upload a file for a build
 
 Note: This route is given by `Create a new build` through `upload_location` response field.
-`filename` query param should match the build type (`ipa` or `apk`).
 
 ### Request
 
 ```
-PUT /api/build/{build_id}/file?filename={filename}
+PUT /api/build/{build_id}/file
 ```
 
 ```
diff --git a/misc/upload_build.sh b/misc/upload_build.sh
index 0969bd5..19f4ac3 100755
--- a/misc/upload_build.sh
+++ b/misc/upload_build.sh
@@ -6,13 +6,13 @@ SCRIPT_NAME=$0
 if ! type "jq" > /dev/null 2>&1; then
   echo "Error: jq command is missing" # only work on recent Bash versions and Zsh
   echo "Please install <jq> command to parse the json response of the api responses."
-  echo "On Mac : brew install jq"
-  echo "On Debian : apt-get install jq"
+  echo "On Mac: brew install jq"
+  echo "On Debian: apt-get install jq"
   exit 500
 fi
 
 # Constants
-API_URL='http://appbuild.dev/app_dev.php/api'
+API_URL='http://local.appbuild.com/app_dev.php/api'
 EP_APP_LIST='application/'
 EP_CREATE_BUILD='application/:application_id/build/'
 
@@ -24,16 +24,16 @@ EP_CREATE_BUILD='application/:application_id/build/'
 # USAGE
 function usage() {
   echo "Usage: $SCRIPT_NAME [-achpruv] file"
-  echo " - a <application id> : Specify an application id"
-  echo " - c <build comment> : Specify an build comment"
-  echo " - h : Help, print this usage"
-  echo " - p <password> : Specify a password"
-  echo " - r <build release> : Specify a build version number"
-  echo " - u <username> : Specify a username"
-  echo " - v : verbose mode"
+  echo " - a <application id>: Specify an application id"
+  echo " - c <build comment>: Specify an build comment"
+  echo " - h: Help, print this usage"
+  echo " - p <password>: Specify a password"
+  echo " - r <build release>: Specify a build version number"
+  echo " - u <username>: Specify a username"
+  echo " - v: verbose mode"
   echo ""
   echo "Note: All those options are customisable under the DEFAULT PARAMETERS section in the script"
-  echo "Example :"
+  echo "Example:"
   echo " $SCRIPT_NAME -v -u superadmin@foo.fr -p superadmin -a 78 -r 1.2 -c \"A Comment on the build\" ./build/ios_v2.ipa"
 }
 
@@ -67,18 +67,18 @@ shift $(( OPTIND - 1 ))
 p_file="${1:-${BUILD_PATH}}"
 
 if [ ! -f "$p_file" ]; then
-  echo "File not found : ${p_file}"
+  echo "File not found: ${p_file}"
   exit 404;
 fi
 
 filename=$(basename $p_file)
 
 if test $p_verbose; then
-  echo "File to upload : $p_file"
-  echo "with the user : $p_username"
-  echo "on the application : $p_app_id"
-  echo "with the version : $p_version"
-  echo "and the comment : $p_comment"
+  echo "File to upload: $p_file"
+  echo "with the user: $p_username"
+  echo "on the application: $p_app_id"
+  echo "with the version: $p_version"
+  echo "and the comment: $p_comment"
 fi
 
 #############################################################################
@@ -117,7 +117,7 @@ function apiCreateBuild() {
 
   #{
   #  "build_id": 10,
-  #  "upload_location": "http://appbuild.dev/app_dev.php/api/build/10/file"
+  #  "upload_location": "http://local.appbuild.com/app_dev.php/api/build/10/file"
   #}
   curl -s -X PUT \
     $(getAPIUrl ${build_creation_url}) \
@@ -141,8 +141,7 @@ function apiUploadBuild() {
     ${upload_location} \
     -H 'Cache-control: no-cache' \
     -H "Authorization: Bearer ${jwt}" \
-    --data-binary "@${file_path}" \
-    -G --data-urlencode "filename=${filename}"
+    --data-binary "@${file_path}"
 }
 
 #############################################################################
@@ -151,7 +150,7 @@ function apiUploadBuild() {
 
 # Get the jwt to upload the build
 echo ""
-echo -n "Asking for authentication token : "
+echo -n "Asking for authentication token: "
 jwt=`apiLogin ${p_username} ${p_password} | jq -r ".token"`
 
 if [ $? -eq 0 ]; then
@@ -165,9 +164,9 @@ fi
 # Create the build with
 #   - jwt: the authentication token
 #   - app_id: the application id (ex: 7)
-#   - build_version : the version of the build (ex: 1.2)
-#   - build_comment : a comment on the new build (ex: "A fix on the offline mode")
-echo -n "Creation of the build : "
+#   - build_version: the version of the build (ex: 1.2)
+#   - build_comment: a comment on the new build (ex: "A fix on the offline mode")
+echo -n "Creation of the build: "
 api_create_build_ret=`apiCreateBuild ${jwt} ${p_app_id} ${p_version} ${p_comment}`
 upload_location=`echo ${api_create_build_ret} | jq -r ".upload_location"`
 
@@ -183,9 +182,9 @@ fi
 
 # Upload the build with
 #   - jwt: the authentication token
-#   - upload_location : the upload url got from apiCreateBuild
-#   - file_path : the file's path
-echo -n "Upload '${filename}' at ${upload_location} : "
+#   - upload_location: the upload url got from apiCreateBuild
+#   - file_path: the file's path
+echo -n "Upload '${filename}' at ${upload_location}: "
 httpcode=`apiUploadBuild ${jwt} ${upload_location} ${p_file}`
 httpcode=${httpcode//{*}/}
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 177096f..5668201 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1532,6 +1532,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -2908,9 +2909,9 @@
       }
     },
     "fine-uploader": {
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/fine-uploader/-/fine-uploader-5.15.0.tgz",
-      "integrity": "sha1-R2w8SO8CNJ64E9MqTl/3+wpobfQ="
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/fine-uploader/-/fine-uploader-5.16.0.tgz",
+      "integrity": "sha1-hVRJCZYxjGrkCDSYrJxX6S+QtH4="
     },
     "flat-cache": {
       "version": "1.2.2",
@@ -3017,6 +3018,910 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
     "fstream": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -6989,15 +7894,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -7009,6 +7905,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index bbd96da..e3ae42c 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "node": "7.7.3"
   },
   "scripts": {
-    "start": "webpack-dev-server --public appbuild.dev:8080 --watch-poll",
+    "start": "webpack-dev-server --public local.appbuild.com:8080 --watch-poll",
     "build": "NODE_ENV=production webpack",
     "lint": "npm run lint-js && npm run lint-scss",
     "lint-js": "eslint src/",
@@ -27,30 +27,30 @@
     "fix-js": "eslint --fix src/"
   },
   "dependencies": {
-    "fine-uploader": "^5.14.1",
-    "foundation-sites": "^6.3.0",
-    "jquery": "^3.1.1"
+    "fine-uploader": "5.16.0",
+    "foundation-sites": "6.4.3",
+    "jquery": "3.2.1"
   },
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-minify-webpack-plugin": "^0.2.0",
-    "babel-preset-env": "^1.6.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.27.3",
-    "eslint": "^3.19.0",
-    "eslint-loader": "^1.7.1",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.10.1",
-    "isdev": "^1.0.1",
-    "node-sass": "^4.5.0",
-    "postcss-loader": "^1.3.3",
-    "sass-lint": "^1.10.2",
-    "sass-loader": "^6.0.3",
-    "source-map-loader": "^0.2.1",
-    "style-loader": "^0.14.0",
-    "url-loader": "^0.5.8",
-    "webpack": "^3.5.6",
-    "webpack-dev-server": "^2.8.2"
+    "babel-core": "6.26.0",
+    "babel-loader": "7.1.2",
+    "babel-minify-webpack-plugin": "0.2.0",
+    "babel-preset-env": "1.6.0",
+    "copy-webpack-plugin": "4.0.1",
+    "css-loader": "0.27.3",
+    "eslint": "3.19.0",
+    "eslint-loader": "1.9.0",
+    "extract-text-webpack-plugin": "3.0.0",
+    "file-loader": "0.10.1",
+    "isdev": "1.0.1",
+    "node-sass": "4.5.3",
+    "postcss-loader": "1.3.3",
+    "sass-lint": "1.11.1",
+    "sass-loader": "6.0.6",
+    "source-map-loader": "0.2.1",
+    "style-loader": "0.14.1",
+    "url-loader": "0.5.9",
+    "webpack": "3.5.6",
+    "webpack-dev-server": "2.8.2"
   }
 }
diff --git a/src/AppBundle/Resources/public/favicons/browserconfig.xml b/src/AppBundle/Resources/public/favicons/browserconfig.xml
index e2f6c52..0f64f71 100644
--- a/src/AppBundle/Resources/public/favicons/browserconfig.xml
+++ b/src/AppBundle/Resources/public/favicons/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/assets/favicons/mstile-150x150.png"/>
+            <square150x150logo src="/__STATIC_ASSETS_BASE_PATH__/favicons/mstile-150x150.png"/>
             <TileColor>#09345e</TileColor>
         </tile>
     </msapplication>
diff --git a/src/AppBundle/Resources/public/favicons/manifest.json b/src/AppBundle/Resources/public/favicons/manifest.json
index ca61c96..cb67cae 100644
--- a/src/AppBundle/Resources/public/favicons/manifest.json
+++ b/src/AppBundle/Resources/public/favicons/manifest.json
@@ -2,12 +2,12 @@
     "name": "Appbuild",
     "icons": [
         {
-            "src": "/assets/favicons/android-chrome-192x192.png",
+            "src": "/__STATIC_ASSETS_BASE_PATH__/favicons/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/assets/favicons/android-chrome-256x256.png",
+            "src": "/__STATIC_ASSETS_BASE_PATH__/favicons/android-chrome-256x256.png",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/src/AppBundle/Resources/public/js/application-form.js b/src/AppBundle/Resources/public/js/application-form.js
index 15017d7..5c2b849 100644
--- a/src/AppBundle/Resources/public/js/application-form.js
+++ b/src/AppBundle/Resources/public/js/application-form.js
@@ -1,7 +1,126 @@
-// TODO application.image (should look like build-form.js)
+import $ from 'jquery';
+import Routing from 'fos-js-routing';
+import Translator from 'bazinga-translator';
+import 'fine-uploader/jquery.fine-uploader/jquery.fine-uploader.min.js';
 
-//$('#uploader-img').fineUploader({
-//  validation: {
-//    allowedExtensions: ['jpeg', 'jpg', 'gif', 'png'],
-//  },
-//});
+const locale = $('html').attr('lang');
+const $form = $('form[name="appbuild_application"]');
+
+const commonFineUploaderConfig = {
+  template: 'upload-container-template',
+  multiple: false,
+  validation: {
+    allowedExtensions: ['jpeg', 'jpg', 'png'],
+    itemLimit: 1,
+  },
+  text: {
+    defaultResponseError: Translator.trans('admin.upload.message.default'),
+    failUpload: Translator.trans('admin.upload.message.upload_failure'),
+    formatProgress: Translator.trans('admin.upload.message.progress_bar'),
+    waitingForResponse: Translator.trans('admin.upload.message.waiting_for_response'),
+  },
+  messages: {
+    typeError: Translator.trans('admin.upload.message.invalid_extension'),
+    onLeave: Translator.trans('admin.upload.message.on_leave'),
+    tooManyItemsError: Translator.trans('admin.upload.message.too_many_items'),
+  },
+  deleteFile: {
+    enabled: true,
+    endpoint: Routing.generate('appbuild_admin_application_delete_image', {
+      _locale: locale,
+    }),
+    method: 'POST',
+    deletingFailedText: Translator.trans('admin.upload.message.delete_failed'),
+    deletingStatusText: Translator.trans('admin.upload.message.deleting'),
+  },
+};
+
+$('#appbuild_application_displayImageFile').fineUploader(Object.assign(
+  {},
+  commonFineUploaderConfig,
+  {
+    request: {
+      endpoint: Routing.generate('appbuild_admin_application_display_image_upload', {
+        _locale: locale,
+      }),
+      inputName: 'displayImageFile',
+    },
+  },
+  !$form.data('id') ? {} : {
+    session: {
+      endpoint: Routing.generate('appbuild_admin_application_get_display_image', {
+        _locale: locale,
+        id: $form.data('id'),
+      }),
+    },
+  }
+)).on('submitted', () => {
+  // Remove the ability to send files
+  $form.find('.qq-upload-button-selector, qq-upload-drop-area-selector').hide();
+}).on('cancel', () => {
+  // Reset the ability to send files
+  $form.find('.qq-upload-button-selector, qq-upload-drop-area-selector').show();
+}).on('complete', (event, id, name, responseJSON) => {
+  if (responseJSON.success) {
+    // Set filename field
+    $('#appbuild_application_displayImageFilename').val(responseJSON.filename);
+  }
+}).on('sessionRequestComplete', (event, files) => {
+  if (files[0]) {
+    // Set filename field
+    $('#appbuild_application_displayImageFilename').val(files[0].name);
+  }
+}).on('deleteComplete', () => {
+  // Clear filename field
+  $('#appbuild_application_displayImageFilename').val('');
+}).on('error', (event, id, name, errorReason) => {
+  // Clear filename field
+  $('#appbuild_application_displayImageFilename').val('');
+  // Show error message
+  alert(errorReason);
+});
+
+$('#appbuild_application_fullSizeImageFile').fineUploader(Object.assign(
+  {},
+  commonFineUploaderConfig,
+  {
+    request: {
+      endpoint: Routing.generate('appbuild_admin_application_full_size_image_upload', {
+        _locale: locale,
+      }),
+      inputName: 'fullSizeImageFile',
+    },
+  },
+  !$form.data('id') ? {} : {
+    session: {
+      endpoint: Routing.generate('appbuild_admin_application_get_full_size_image', {
+        _locale: locale,
+        id: $form.data('id'),
+      }),
+    },
+  }
+)).on('submitted', () => {
+  // Remove the ability to send files
+  $form.find('.qq-upload-button-selector, qq-upload-drop-area-selector').hide();
+}).on('cancel', () => {
+  // Reset the ability to send files
+  $form.find('.qq-upload-button-selector, qq-upload-drop-area-selector').show();
+}).on('complete', (event, id, name, responseJSON) => {
+  if (responseJSON.success) {
+    // Set filename field
+    $('#appbuild_application_fullSizeImageFilename').val(responseJSON.filename);
+  }
+}).on('sessionRequestComplete', (event, files) => {
+  if (files[0]) {
+    // Set filename field
+    $('#appbuild_application_fullSizeImageFilename').val(files[0].name);
+  }
+}).on('deleteComplete', () => {
+  // Clear filename field
+  $('#appbuild_application_fullSizeImageFilename').val('');
+}).on('error', (event, id, name, errorReason) => {
+  // Clear filename field
+  $('#appbuild_application_fullSizeImageFilename').val('');
+  // Show error message
+  alert(errorReason);
+});
diff --git a/src/AppBundle/Resources/public/js/components/required-when-checked.js b/src/AppBundle/Resources/public/js/components/required-when-checked.js
index 4c9aba0..e07ef21 100644
--- a/src/AppBundle/Resources/public/js/components/required-when-checked.js
+++ b/src/AppBundle/Resources/public/js/components/required-when-checked.js
@@ -1,15 +1,11 @@
 import $ from 'jquery';
 
+const dataAttrName = 'data-required-when-checked';
 const requireWhenChecked = ($el) => {
-  if ($el.prop('checked')) {
-    $(`#${$el.attr('data-required-when-checked')}`).attr('required', 'required');
-  } else {
-    $(`#${$el.attr('data-required-when-checked')}`).removeAttr('required');
-  }
+  ($el.prop('checked')) ? $($el.attr(dataAttrName)).attr('required', 'required') : $($el.attr(dataAttrName)).removeAttr('required');
 };
-const $inputs = $('input[data-required-when-checked]');
 
-$inputs.each((idx, elem) => {
+$(`input[${dataAttrName}]`).each((idx, elem) => {
   const $input = $(elem);
   const $inputsWithSameName = $(`input[name="${$input.attr('name')}"]`);
 
diff --git a/src/AppBundle/Resources/public/js/components/show-when-checked.js b/src/AppBundle/Resources/public/js/components/show-when-checked.js
index 6e4e2c3..28d886a 100644
--- a/src/AppBundle/Resources/public/js/components/show-when-checked.js
+++ b/src/AppBundle/Resources/public/js/components/show-when-checked.js
@@ -1,15 +1,11 @@
 import $ from 'jquery';
 
+const dataAttrName = 'data-show-when-checked';
 const showWhenChecked = ($el) => {
-  if ($el.prop('checked')) {
-    $(`#${$el.attr('data-show-when-checked')}`).show();
-  } else {
-    $(`#${$el.attr('data-show-when-checked')}`).hide();
-  }
+  ($el.prop('checked')) ? $($el.attr(dataAttrName)).show() : $($el.attr(dataAttrName)).hide();
 };
-const $inputs = $('input[data-show-when-checked]');
 
-$inputs.each((idx, elem) => {
+$(`input[${dataAttrName}]`).each((idx, elem) => {
   const $input = $(elem);
   const $inputsWithSameName = $(`input[name="${$input.attr('name')}"]`);
 
diff --git a/src/AppBundle/Resources/public/scss/components/forms/_file.scss b/src/AppBundle/Resources/public/scss/components/forms/_file.scss
index faf59f0..cd94aed 100644
--- a/src/AppBundle/Resources/public/scss/components/forms/_file.scss
+++ b/src/AppBundle/Resources/public/scss/components/forms/_file.scss
@@ -1,9 +1,23 @@
 $uploader-large-height: rem-calc(200px);
-$uploader-small-height: rem-calc(30px);
+$uploader-small-height: rem-calc(60px);
 
 $uploader-large-fz: rem-calc(30px);
 $uploader-small-fz: rem-calc(16px);
 
+.file-wrapper {
+  position: relative;
+
+  .qq-upload-delete {
+    position: absolute;
+    top: 0;
+    right: 0;
+    cursor: pointer;
+
+    .icon {
+      font-size: $uploader-large-fz;
+    }
+  }
+}
 
 .input-wrap__file {
   position: relative;
@@ -34,7 +48,6 @@ $uploader-small-fz: rem-calc(16px);
 }
 
 .input-wrap__file-label {
-  position: absolute;
   z-index: 7;
 }
 
@@ -43,7 +56,7 @@ $uploader-small-fz: rem-calc(16px);
   overflow-y: hidden;
 
   &:before {
-    content: attr(qq-area-drop-text) " ";
+    content: attr(qq-area-drop-text) ' ';
     position: absolute;
     z-index: 3;
     font-size: rem-calc(30px);
@@ -99,7 +112,7 @@ $uploader-small-fz: rem-calc(16px);
   transition-timing-function: $form-transition-timing;
 
   &:before {
-    content: attr(qq-area-drop-text) " ";
+    content: attr(qq-area-drop-text) ' ';
     position: absolute;
     z-index: 3;
     left: 50%;
diff --git a/src/AppBundle/Resources/public/scss/components/table/_table-content.scss b/src/AppBundle/Resources/public/scss/components/table/_table-content.scss
index 8d677e0..5d1b976 100644
--- a/src/AppBundle/Resources/public/scss/components/table/_table-content.scss
+++ b/src/AppBundle/Resources/public/scss/components/table/_table-content.scss
@@ -3,13 +3,6 @@
   text-overflow: ellipsis;
   overflow: hidden;
 
-  @include breakpoint(small only) {
-    height: $table-line-height;
-  }
-
-  @include breakpoint(medium down) {
-    width: 100%;
-  }
 }
 
 .app-name-wrap {
@@ -113,6 +106,7 @@
 
 .label-version {
   width: map-get($label-width, latest-build);
+  margin-left: 5px;
 }
 
 .label-role {
@@ -241,9 +235,19 @@
   display: flex;
   align-items: center;
   justify-content: center;
+
+  @include breakpoint(small only) {
+    width: map-get($button-icon-download-mobile-size, width);
+    height: map-get($button-icon-download-mobile-size, height);
+    line-height: map-get($button-icon-download-mobile-size, height);
+
+    &:hover,
+    &:focus {
+      box-shadow: inset  (- map-get($button-icon-download-mobile-size, width)) 0 0 darken($primary-color, 5%);
+    }
+  }
 }
 
 .icon-action_download__label {
-  padding-left: rem-calc(2);
   font-size: rem-calc(12);
 }
diff --git a/src/AppBundle/Resources/public/scss/components/table/_table-structure.scss b/src/AppBundle/Resources/public/scss/components/table/_table-structure.scss
index 2f471f5..fd022f2 100644
--- a/src/AppBundle/Resources/public/scss/components/table/_table-structure.scss
+++ b/src/AppBundle/Resources/public/scss/components/table/_table-structure.scss
@@ -45,6 +45,7 @@
     }
   }
 
+  // vertical separator between cells
   &:not(:first-child) {
 
     .table__cell__content,
@@ -62,7 +63,7 @@
       }
     }
 
-    &.table__cell-head.table__cell-head-action {
+    &.table__cell-head.table__cell-head-actions {
 
       .table__cell-head__content {
 
@@ -74,23 +75,9 @@
 
     @include breakpoint(small only) {
 
-      &.table__cell_mobile-right,
       &.table__cell-head-app,
-      &.table__cell-app {
-        .table__cell-head__content,
-        .table__cell__content {
-
-          &:after {
-            background-color: transparent;
-          }
-        }
-      }
-
-    }
-
-    @include breakpoint(medium down) {
-      &.table__cell-head-app,
-      &.table__cell-app {
+      &.table__cell-app,
+      &.table__cell-actions {
         .table__cell-head__content,
         .table__cell__content {
 
@@ -163,6 +150,7 @@
     transition-duration: $table-link-transition-duration;
     transition-property: $table-link-transition-prop;
     transition-timing-function: $table-link-transition-timing;
+    outline: none;
 
     &:not(.icon-action):hover,
     &:not(.icon-action):focus {
@@ -222,21 +210,6 @@
 
 @include breakpoint(small only) {
 
-  .table__cell_mobile-right {
-
-    position: absolute;
-    right: 0;
-    height: 100%;
-
-    .table__cell__content {
-      padding-left: 0;
-    }
-  }
-
-  .table__cell-last {
-    padding-right: map-get($button-icon-size, width) + ($table-padding-side-mobile);
-  }
-
   .table__cell-firstname,
   .table__cell-head-firstname {
     flex: 0 0 150px;
@@ -254,11 +227,4 @@
     flex: 0 0 calc(100% - 200px);
     max-width: calc(100% - 200px);
   }
-
-  .table__cell-app,
-  .table__cell-head-app,
-  .table__cell-last {
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
 }
diff --git a/src/AppBundle/Resources/public/scss/components/table/_var.scss b/src/AppBundle/Resources/public/scss/components/table/_var.scss
index 0783b1d..fc35ec6 100644
--- a/src/AppBundle/Resources/public/scss/components/table/_var.scss
+++ b/src/AppBundle/Resources/public/scss/components/table/_var.scss
@@ -40,9 +40,9 @@ $button-icon-size: (
   height: rem-calc(35)
 );
 
-$label-height: (
-  small: rem-calc(20px),
-  medium: rem-calc(30px)
+$button-icon-download-mobile-size: (
+  width: rem-calc(150),
+  height: rem-calc(35)
 );
 
 $label-width: (
diff --git a/src/AppBundle/Resources/public/scss/partials/_header.scss b/src/AppBundle/Resources/public/scss/partials/_header.scss
index f36fc45..195e4d5 100644
--- a/src/AppBundle/Resources/public/scss/partials/_header.scss
+++ b/src/AppBundle/Resources/public/scss/partials/_header.scss
@@ -107,90 +107,6 @@ $header-space: (
 }
 
 
-.form-search {
-  z-index: 1;
-
-  @include breakpoint(medium) {
-    display: flex;
-    flex-wrap: nowrap;
-  }
-}
-
-.form-search__input {
-  display: inline-block;
-  height: map-get($button-height, small);
-  margin-bottom: map-get($header-space, small);
-  padding: rem-calc(10);
-  transition: all .4s cubic-bezier(0, .795, 0, 1);
-  background: $secondary-color;
-  color: $white;
-
-  @include breakpoint(small only) {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: map-get($button-height, small);
-    margin-bottom: map-get($header-space, small);
-    cursor: pointer;
-    opacity: 0;
-    z-index: 3;
-
-    &:focus {
-      width: 100%;
-      cursor: text;
-      opacity: 1;
-      z-index: 1;
-    }
-  }
-
-  @include breakpoint(medium) {
-    flex: 1 1 0;
-    order: 2;
-    height: map-get($button-height, medium);
-    margin-bottom: map-get($header-space, medium);
-    padding: rem-calc(10 20);
-  }
-
-  &,
-  &:focus {
-    transition: all .4s cubic-bezier(0, .795, 0, 1);
-    border: 2px solid $light-secondary;
-    outline: none;
-  }
-
-  &:focus {
-    background: lighten($secondary-color, 2%);
-  }
-}
-
-.form-search__button {
-  width: map-get($button-height, small);
-  height: map-get($button-height, small);
-  margin-bottom: map-get($header-space, small);
-  padding: 0;
-  font-size: map-get($header-icon-fz, small);
-
-
-  @include breakpoint(small only) {
-    position: absolute;
-    top: 0;
-    right: 0;
-    z-index: 2;
-  }
-
-  @include breakpoint(medium) {
-    flex: 0 1 auto;
-    order: 1;
-    width: map-get($button-height, medium);
-    height: map-get($button-height, medium);
-    margin-right: map-get($header-space, medium);
-    margin-bottom: map-get($header-space, medium);
-    font-size: map-get($header-icon-fz, medium);
-  }
-}
-
-
-
 .button_account,
 .button_language {
   min-width: map-get($button-height, small);
diff --git a/src/AppBundle/Resources/translations/messages.en.yml b/src/AppBundle/Resources/translations/messages.en.yml
index ad8e5b5..d6d6fdc 100644
--- a/src/AppBundle/Resources/translations/messages.en.yml
+++ b/src/AppBundle/Resources/translations/messages.en.yml
@@ -44,6 +44,8 @@ admin:
             too_many_items: 'Too many files to upload. The max files limit is {itemLimit}'
             progress_bar: '{percent}% of {total_size}'
             waiting_for_response: Processing...
+            delete_failed: Delete failed
+            deleting: Deleting...
 
 datetime:
     datetime: 'Y-m-d H:i:s'
diff --git a/src/AppBundle/Resources/translations/messages.fr.yml b/src/AppBundle/Resources/translations/messages.fr.yml
index 4ae9f44..ec7b2fa 100644
--- a/src/AppBundle/Resources/translations/messages.fr.yml
+++ b/src/AppBundle/Resources/translations/messages.fr.yml
@@ -6,7 +6,7 @@ admin:
         baseline: by LinkValue
     header:
         search:
-            submit: Search
+            submit: Rechercher
         language:
             fr: fr
             en: en
@@ -44,6 +44,8 @@ admin:
             too_many_items: 'Trop de fichiers à envoyer. Le nombre maximum de fichiers pouvant être envoyés est [{itemLimit}]'
             progress_bar: '{percent}% de {total_size}'
             waiting_for_response: En cours de traitement...
+            delete_failed: Suppression échouée
+            deleting: Suppression...
 
 datetime:
     datetime: 'd/m/Y H:i:s'
diff --git a/src/AppBundle/Resources/views/upload-container-template.html.twig b/src/AppBundle/Resources/views/Includes/upload-container-template.html.twig
similarity index 94%
rename from src/AppBundle/Resources/views/upload-container-template.html.twig
rename to src/AppBundle/Resources/views/Includes/upload-container-template.html.twig
index 0732793..b1e8bf8 100644
--- a/src/AppBundle/Resources/views/upload-container-template.html.twig
+++ b/src/AppBundle/Resources/views/Includes/upload-container-template.html.twig
@@ -19,7 +19,7 @@
         </span>
 
         <ul class="qq-upload-list-selector qq-upload-list" role="region" aria-live="polite" aria-relevant="additions removals">
-            <li>
+            <li class="file-wrapper">
                 <span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
                 <div class="qq-progress-bar-container-selector qq-progress-bar-container">
                     <div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-progress-bar-selector qq-progress-bar"></div>
@@ -41,8 +41,8 @@
                     </div>
                     <input class="qq-edit-filename-selector qq-edit-filename" tabindex="0" type="text">
                     <span class="qq-upload-size-selector qq-upload-size"></span>
-                    <button type="button" class="qq-btn qq-upload-delete-selector qq-upload-delete">
-                        <span class="qq-btn qq-delete-icon" aria-label="{{ 'admin.upload.remove'|trans }}"></span>
+                    <button type="button" class="qq-btn qq-upload-delete-selector qq-upload-delete" title="{{ 'admin.upload.remove'|trans }}">
+                        <i class="qq-btn qq-delete-icon icon icon-trash" aria-label="{{ 'admin.upload.remove'|trans }}"></i>
                     </button>
                     <button type="button" class="qq-btn qq-upload-pause-selector qq-upload-pause">
                         <span class="qq-btn qq-pause-icon" aria-label="{{ 'admin.upload.stop'|trans }}"></span>
diff --git a/src/AppBundle/Resources/views/Layout/layout_anonymous.html.twig b/src/AppBundle/Resources/views/Layout/layout_anonymous.html.twig
index 4c1f43d..845bf50 100644
--- a/src/AppBundle/Resources/views/Layout/layout_anonymous.html.twig
+++ b/src/AppBundle/Resources/views/Layout/layout_anonymous.html.twig
@@ -7,7 +7,7 @@
 
                 {% block header %}
                 <header class="form-login__header">
-                    <h1 class="logo"><img src="{{ asset('assets/img/logo.svg') }}" alt="{{ 'admin.logo.alt'|trans }}"></h1>
+                    <h1 class="logo"><img src="{{ asset('img/logo.svg', 'static') }}" alt="{{ 'admin.logo.alt'|trans }}"></h1>
                     <h2 class="logo-baseline">{{ 'admin.logo.baseline'|trans }}</h2>
                 </header>
                 {% endblock %}
diff --git a/src/AppBundle/Resources/views/Layout/layout_authenticated.html.twig b/src/AppBundle/Resources/views/Layout/layout_authenticated.html.twig
index 3a3a302..a9af6ae 100644
--- a/src/AppBundle/Resources/views/Layout/layout_authenticated.html.twig
+++ b/src/AppBundle/Resources/views/Layout/layout_authenticated.html.twig
@@ -9,16 +9,9 @@
                 <header class="header">
                     <div class="row">
                         <div class="columns small-12 medium-3">
-                            <h1 class="logo header__logo"><a href="{{ url('appbuild_admin_application_list') }}"><img src="{{ asset('assets/img/logo.svg') }}" alt="{{ 'admin.logo.alt'|trans }}"></a></h1>
+                            <h1 class="logo header__logo"><a href="{{ url('appbuild_admin_application_list') }}"><img src="{{ asset('img/logo.svg', 'static') }}" alt="{{ 'admin.logo.alt'|trans }}"></a></h1>
                         </div>
                         <div class="header__column-actions columns small-12 medium-9 row">
-                            {# TODO: search feature #}
-                            {#<div class="search columns small-12 medium-expand">#}
-                                {#<form class="form-search" action="" autocomplete="on">#}
-                                    {#<input id="search" name="search" type="text" class="form-search__input">#}
-                                    {#<button id="search_submit" value="{{ 'admin.header.search.submit'|trans }}" type="submit" class="form-search__button button button_confirm"><i class="icon icon-search"> </i></button>#}
-                                {#</form>#}
-                            {#</div>#}
                             {% if is_granted('ROLE_USER') %}
                             <div class="nav-secondary columns">
                                 <a href="{{ url('appbuild_admin_user_my_account') }}" class="button button_account" title="{{ 'user.my_account.title'|trans }}"><i class="icon icon-user"></i></a>
diff --git a/src/AppBundle/Resources/views/base.html.twig b/src/AppBundle/Resources/views/base.html.twig
index 5cf8b4a..1edbb59 100644
--- a/src/AppBundle/Resources/views/base.html.twig
+++ b/src/AppBundle/Resources/views/base.html.twig
@@ -10,19 +10,19 @@
         <title>{% block title '' %} - {{ 'admin.title'|trans }}</title>
 
         {# Favicons #}
-        <link rel="shortcut icon" type="image/x-icon" href="{{ asset('assets/favicons/favicon.ico') }}">
-        <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('assets/favicons/favicon-32x32.png') }}">
-        <link rel="icon" type="image/png" sizes="48x48" href="{{ asset('assets/favicons/favicon-48x48.png') }}">
-        <link rel="icon" type="image/png" sizes="96x96" href="{{ asset('assets/favicons/favicon-96x96.png') }}">
-        <link rel="icon" type="image/png" sizes="144x144" href="{{ asset('assets/favicons/favicon-144x144.png') }}">
-        <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('assets/favicons/apple-touch-icon.png') }}">
-        <link rel="manifest" href="{{ asset('assets/favicons/manifest.json') }}">
-        <link rel="mask-icon" href="{{ asset('assets/favicons/safari-pinned-tab.svg') }}" color="#09345e">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicons/favicon.ico', 'static') }}">
+        <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('favicons/favicon-32x32.png', 'static') }}">
+        <link rel="icon" type="image/png" sizes="48x48" href="{{ asset('favicons/favicon-48x48.png', 'static') }}">
+        <link rel="icon" type="image/png" sizes="96x96" href="{{ asset('favicons/favicon-96x96.png', 'static') }}">
+        <link rel="icon" type="image/png" sizes="144x144" href="{{ asset('favicons/favicon-144x144.png', 'static') }}">
+        <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('favicons/apple-touch-icon.png', 'static') }}">
+        <link rel="manifest" href="{{ asset('favicons/manifest.json', 'static') }}">
+        <link rel="mask-icon" href="{{ asset('favicons/safari-pinned-tab.svg', 'static') }}" color="#09345e">
         <meta name="theme-color" content="#09345e">
 
         {# Stylesheets #}
         {% block stylesheets %}
-        <link rel="stylesheet" href="{{ asset('assets/main.css') }}" />
+        <link rel="stylesheet" href="{{ asset('main.css', 'static') }}" />
         {% endblock %}
     </head>
     <body>
@@ -30,14 +30,14 @@
         {% block body '' %}
 
         {% block javascripts %}
-        <script src="{{ asset('assets/jquery.js') }}"></script>
-        <script src="{{ asset('assets/bazinga-translator.js') }}"></script>
+        <script src="{{ asset('jquery.js', 'static') }}"></script>
+        <script src="{{ asset('bazinga-translator.js', 'static') }}"></script>
         <script src="{{ url('bazinga_jstranslation_js') }}?locales={{ app.request.locale }}"></script>
-        <script src="{{ asset('assets/fos-js-routing.js') }}"></script>
+        <script src="{{ asset('fos-js-routing.js', 'static') }}"></script>
         <script src="{{ path('fos_js_routing_js', {'callback': 'fos.Router.setData'}) }}"></script>
-        <script src="{{ asset('assets/common.js') }}"></script>
-        <script src="{{ asset('assets/vendor.js') }}"></script>
-        <script src="{{ asset('assets/main.js') }}"></script>
+        <script src="{{ asset('common.js', 'static') }}"></script>
+        <script src="{{ asset('vendor.js', 'static') }}"></script>
+        <script src="{{ asset('main.js', 'static') }}"></script>
         {% endblock %}
     </body>
 </html>
diff --git a/src/AppBundle/Resources/views/search-results.html.twig b/src/AppBundle/Resources/views/search-results.html.twig
deleted file mode 100644
index 28fbe5a..0000000
--- a/src/AppBundle/Resources/views/search-results.html.twig
+++ /dev/null
@@ -1,371 +0,0 @@
-
-{# TODO search #}
-
-<h1 class="title">Résultats pour "toto"</h1>
-<section class="section-results">
-  <header class="row align-middle header-section" data-anim-appear>
-    <div class="columns">
-      <h2 class="title title_header-section">Mes applications</h2>
-    </div>
-    <div class="columns shrink show-for-medium show-for-up-mobile">
-      <a href="update-app.html" class="button button_navigation"><span>Créer une nouvelle application</span></a>
-    </div>
-  </header>
-  <article class="table">
-    <div class="table__row table__row-head" data-anim-appear>
-      <div class="table__cell table__cell-head show-for-large">
-        <div class="table__cell-head__content">OS</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-app">
-        <div class="table__cell-head__content">Application</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-last-build show-for-medium show-for-up-mobile">
-        <div class="table__cell-head__content">Dernier build</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-last-comment table__cell-last">
-        <div class="table__cell-head__content">Commentaire</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-action table__cell_shrink show-for-medium">
-        <div class="table__cell-head__content"></div>
-      </div>
-    </div>
-
-    <div class="table__row table__row-body is-new" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell_shrink table__cell-os show-for-large">
-        <div class="table__cell__content">
-          <i class="icon icon-os icon-android"></i>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-app">
-        <div class="table__cell__content">
-          <a class="table-link app-name-wrap align-middle" href="builds.html">
-            <div class="columns shrink">
-              <span class="app-picture" style="background-image:url('');">
-                <i class="icon icon-os icon-android hide-for-large"></i>
-              </span>
-            </div>
-            <div class="columns app-name">
-              <strong class="line">RemindTheLink</strong>
-              <span class="app-date hide-for-large line">13 janv. 2017</span>
-            </div>
-          </a>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-last-build show-for-medium show-for-up-mobile">
-        <div class="table__cell__content">
-
-          <a class="columns-first table-link row align-middle" href="">
-            <div class="columns shrink">
-              <i class="icon icon-download show-for-large"></i>
-            </div>
-            <div class="columns build-name">
-              <strong class="line">RemindTheLink</strong>
-              <span class="line app-date">13 janv. 2017</span>
-            </div>
-          </a>
-          <div class="columns-last">
-            <span class="label-version">0.1</span>
-          </div>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-last-comment table__cell-last">
-        <div class="table__cell__content">
-          <div class="comment columns-first">
-            <span class="line comment__text">Truc de fifou...</span>
-            <a class="comment__more line" data-open="modal-comment-1">Lire la suite</a>
-          </div>
-          <div class="columns-last">
-            <span class="label-new show-for-medium show-for-up-mobile">nouveau</span>
-          </div>
-          <div class="reveal" id="modal-comment-1" data-reveal>
-            <h3 class="title">Commentaire</h3>
-            <p class="reveal__content">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. In culpa qui officia deserunt mollit anim id est laborum.</p>
-            <button class="button button_action button_confirm" data-close aria-label="Close modal" type="button">
-              <span aria-hidden="true">fermer</span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell_shrink table__cell_mobile-right">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="update-app.html" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-            <a href="" class="icon-action icon-action_download hide-for-medium">
-              <i class="icon icon-download"></i><span class="icon-action_download__label ">0.1</span>
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </article>
-</section>
-<section class="section-results">
-
-  <header class="row align-middle header-section" data-anim-appear>
-    <div class="columns">
-      <h1 class="title title_header-section">builds</h1>
-    </div>
-    <div class="columns shrink row-buttons show-for-medium show-for-up-mobile">
-      <a href="create-build.html" class="button button_navigation"><span>nouveau build</span></a>
-    </div>
-  </header>
-  <article class="table">
-    <div class="table__row table__row-head" data-anim-appear>
-      <div class="table__cell table__cell-head table__cell-head-label-build">
-        <div class="table__cell-head__content">Libellé</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-comment">
-        <div class="table__cell-head__content">Commentaire</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-actions table__cell_shrink">
-        <div class="table__cell-head__content show-for-medium show-for-up-mobile">Actions</div>
-      </div>
-    </div>
-
-    <div class="table__row table__row-body" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell-label-build">
-        <div class="table__cell__content">
-          <a class="table-link row align-middle" href="">
-            <div class="columns shrink show-for-medium show-for-up-mobile">
-              <span class="label-order">1</span>
-            </div>
-            <div class="columns build-name">
-              <strong class="line">Keepe - android</strong>
-              <span class="line app-date">13 janv. 2017</span>
-            </div>
-          </a>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-comment table__cell-last">
-        <div class="table__cell__content">
-          <p class="comment line">aucun commentaire</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-actions table__cell_mobile-right table__cell_shrink">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="" class="icon-action icon-action_download">
-              <i class="icon icon-download"></i><span class="icon-action_download__label hide-for-medium">0.1</span>
-            </a>
-            <a href="create-build.html" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-            <a href="" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
-            <a data-open="modal-trash-1" class="icon icon-action icon-trash show-for-medium show-for-up-mobile"></a>
-          </div>
-          <div class="reveal" id="modal-trash-1" data-reveal>
-            <h3 class="title">Êtes-vous sûre de vouloir supprimer ce build ?</h3>
-            <div class="row-buttons">
-              <button class="button button_action button_confirm" type="button" data-load>
-                <span>supprimer</span>
-              </button>
-              <button class="button button_action" data-close aria-label="Close modal" type="button">
-                annuler
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="table__row table__row-body" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell-label-build">
-        <div class="table__cell__content">
-          <a class="table-link row align-middle" href="">
-            <div class="columns shrink show-for-medium show-for-up-mobile">
-              <span class="label-order">2</span>
-            </div>
-            <div class="columns build-name">
-              <strong>Keepe - android</strong>
-              <span class="app-date">13 janv. 2017</span>
-            </div>
-          </a>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-comment table__cell-last">
-        <div class="table__cell__content">
-          <p class="comment">
-            <span class="comment__text line">Truc de fifou ce build...</span>
-            <a class="comment__more line " data-open="modal-comment-1">Lire la suite</a>
-          </p>
-          <div class="reveal large" id="modal-comment-1" data-reveal>
-            <h3 class="title">détail build</h3>
-            <div class="reveal__content">
-              <div class="row">
-
-                <div class="columns reveal__columns">
-                  <div class="reveal__block">
-                    <span class="label">Nom</span>
-                    <span><strong>Keeppe</strong></span>
-                  </div>
-                </div>
-                <div class="columns shrink show-for-medium">
-                  <div class="reveal__block">
-                    <div class="icons-action">
-                      <a href="" class="icon-action icon-action_download">
-                        <i class="icon icon-download"></i><span class="icon-action_download__label hide-for-medium">0.1</span>
-                      </a>
-                      <a href="create-build.html" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-                      <a href="" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
-                      <a data-open="modal-trash-2" class="icon icon-action icon-trash show-for-medium show-for-up-mobile"></a>
-                    </div>
-                  </div>
-                </div>
-                <div class="columns small-12">
-                  <div class="reveal__block">
-                    <span class="label">Commentaire</span>
-                    <span>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <button class="button button_action button_confirm" data-close aria-label="Close modal" type="button">
-              <span aria-hidden="true">fermer</span>
-            </button>
-          </div>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-actions table__cell_mobile-right table__cell_shrink">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="" class="icon-action icon-action_download">
-              <i class="icon icon-download"></i><span class="icon-action_download__label hide-for-medium">0.1</span>
-            </a>
-            <a href="create-build.html" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-            <a href="" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
-            <a data-open="modal-trash-2" class="icon icon-action icon-trash show-for-medium show-for-up-mobile"></a>
-          </div>
-          <div class="reveal" id="modal-trash-2" data-reveal>
-            <h3 class="title">Êtes-vous sûre de vouloir supprimer ce build ?</h3>
-            <div class="row-buttons">
-              <button class="button button_action button_confirm" type="button" data-load>
-                <span>supprimer</span>
-              </button>
-              <button class="button button_action" data-close aria-label="Close modal" type="button">
-                annuler
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </article>
-</section>
-<section class="section-results">
-  <header class="row align-middle header-section" data-anim-appear>
-    <div class="columns">
-      <h1 class="title title_header-section">utilisateurs</h1>
-    </div>
-    <div class="columns shrink show-for-medium show-for-up-mobile">
-      <a href="create-user.html" class="button button_navigation"><span>créer un nouvel utilisateur</span></a>
-    </div>
-  </header>
-  <article class="table">
-    <div class="table__row table__row-head" data-anim-appear>
-      <div class="table__cell table__cell-head table__cell-head-role table__cell_shrink">
-        <div class="table__cell-head__content">Rôle</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-mail">
-        <div class="table__cell-head__content">Email</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-firstname show-for-medium">
-        <div class="table__cell-head__content">Prénom</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-lastname">
-        <div class="table__cell-head__content">Nom</div>
-      </div>
-      <div class="table__cell table__cell-head table__cell-head-action table__cell_shrink show-for-medium show-for-up-mobile">
-        <div class="table__cell-head__content"></div>
-      </div>
-    </div>
-
-    <div class="table__row table__row-body" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell-role table__cell_shrink">
-        <div class="table__cell__content">
-          <span class="label-role label-role_superadmin">S</span>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-mail">
-        <div class="table__cell__content">
-          <p class="comment line">johndoe@gmail.com</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-firstname">
-        <div class="table__cell__content">
-          <p class="show-for-medium">John</p>
-          <p class="hide-for-medium">JL</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-lastname show-for-medium">
-        <div class="table__cell__content">
-          <p class="comment">Doe</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-action table__cell_shrink show-for-medium show-for-up-mobile">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="create-user.html" class="icon icon-action icon-update"></a>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="table__row table__row-body" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell-role table__cell_shrink">
-        <div class="table__cell__content">
-          <span class="label-role label-role_downloader">T</span>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-mail">
-        <div class="table__cell__content">
-          <p class="comment line">johndoe@gmail.com</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-firstname">
-        <div class="table__cell__content">
-          <p class="show-for-medium">John</p>
-          <p class="hide-for-medium">JL</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-lastname show-for-medium">
-        <div class="table__cell__content">
-          <p class="comment">Doe</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-action table__cell_shrink show-for-medium show-for-up-mobile">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="create-user.html" class="icon icon-action icon-update"></a>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="table__row table__row-body" data-anim-appear>
-      <div class="table__cell table__cell-body table__cell-role table__cell_shrink">
-        <div class="table__cell__content">
-          <span class="label-role label-role_admin">A</span>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-mail">
-        <div class="table__cell__content">
-          <p class="comment">johndoe@gmail.com</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-firstname">
-        <div class="table__cell__content">
-          <p class="show-for-medium">John</p>
-          <p class="hide-for-medium">JL</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-lastname show-for-medium">
-        <div class="table__cell__content">
-          <p class="comment">Doe</p>
-        </div>
-      </div>
-      <div class="table__cell table__cell-body table__cell-action table__cell_shrink show-for-medium show-for-up-mobile">
-        <div class="table__cell__content">
-          <div class="icons-action">
-            <a href="create-user.html" class="icon icon-action icon-update"></a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </article>
-</section>
diff --git a/src/ApplicationBundle/Command/PurgeFilesCommand.php b/src/ApplicationBundle/Command/PurgeFilesCommand.php
index c9cda44..5ca0cff 100644
--- a/src/ApplicationBundle/Command/PurgeFilesCommand.php
+++ b/src/ApplicationBundle/Command/PurgeFilesCommand.php
@@ -2,6 +2,7 @@
 
 namespace LinkValue\Appbuild\ApplicationBundle\Command;
 
+use LinkValue\Appbuild\ApplicationBundle\Service\FilesPurgerInterface;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -38,37 +39,45 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $buildFilesPurger = $this->getContainer()->get('appbuild.application.build_files_purger');
+        foreach ([
+                     'appbuild.application.application_image_files_purger' => 'application images',
+                     'appbuild.application.build_files_purger' => 'build files',
+                 ] as $filesPurgerServiceId => $filesPurgerLabel) {
+            $output->writeln(sprintf('Start purging %s.', $filesPurgerLabel));
 
-        // Apply configuration
-        if ($unusedDateFilter = $input->getOption('unused-date-filter')) {
-            $buildFilesPurger->setUnusedFilesFinderDateFilter($unusedDateFilter);
-        }
+            /** @var FilesPurgerInterface $filesPurger */
+            $filesPurger = $this->getContainer()->get($filesPurgerServiceId);
 
-        // Check if there is something to purge
-        $filesToPurge = $buildFilesPurger->getUnusedFiles();
-        if ($filesToPurge->count() === 0) {
-            $output->writeln('Nothing to purge.');
+            // Apply configuration
+            if ($unusedDateFilter = $input->getOption('unused-date-filter')) {
+                $filesPurger->setUnusedFilesFinderDateFilter($unusedDateFilter);
+            }
 
-            return;
-        }
+            // Check if there is something to purge
+            $filesToPurge = $filesPurger->getUnusedFiles();
+            if ($filesToPurge->count() === 0) {
+                $output->writeln(sprintf('Nothing to purge.'));
 
-        if (!$input->getOption('force')) {
-            // Show all files to purge
-            $output->writeln('List of unused files:');
-            foreach ($filesToPurge as $file) {
-                $output->writeln($file->getRealPath());
+                continue;
             }
 
-            // Ask confirmation
-            $questionHelper = $this->getHelper('question');
-            $question = new ConfirmationQuestion('Are you sure to delete these files (y/n)? ', false);
-            if (!$questionHelper->ask($input, $output, $question)) {
-                return;
+            if (!$input->getOption('force')) {
+                // Show all files to purge
+                $output->writeln('List of unused files:');
+                foreach ($filesToPurge as $file) {
+                    $output->writeln($file->getRealPath());
+                }
+
+                // Ask confirmation
+                $questionHelper = $this->getHelper('question');
+                $question = new ConfirmationQuestion('Are you sure to delete these files (y/n)? ', false);
+                if (!$questionHelper->ask($input, $output, $question)) {
+                    continue;
+                }
             }
-        }
 
-        // Purge
-        $buildFilesPurger->purge();
+            // Purge
+            $filesPurger->purge();
+        }
     }
 }
diff --git a/src/ApplicationBundle/Controller/Admin/ApplicationController.php b/src/ApplicationBundle/Controller/Admin/ApplicationController.php
index 4df61d4..c082d10 100644
--- a/src/ApplicationBundle/Controller/Admin/ApplicationController.php
+++ b/src/ApplicationBundle/Controller/Admin/ApplicationController.php
@@ -8,6 +8,8 @@
 use LinkValue\Appbuild\ApplicationBundle\Form\Type\ApplicationType;
 use LinkValue\Appbuild\Pagination\Page;
 use LinkValue\Appbuild\UserBundle\Entity\User;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -63,6 +65,7 @@ public function createAction(Request $request)
         );
 
         if ($request->isMethod(Request::METHOD_POST)) {
+            $this->handleApplicationImagesFile($request, $application);
             $form->handleRequest($request);
             if ($form->isSubmitted() && $form->isValid()) {
                 // Force current user to be linked to the application (except if its a super admin because it's useless)
@@ -117,6 +120,7 @@ public function updateAction(Application $application, Request $request)
         );
 
         if ($request->isMethod(Request::METHOD_POST)) {
+            $this->handleApplicationImagesFile($request, $application);
             $form->handleRequest($request);
             if ($form->isSubmitted() && $form->isValid()) {
                 // Force current user to be linked to the application (except if its a super admin because it's useless)
@@ -171,6 +175,63 @@ public function deleteAction(Application $application)
         return new RedirectResponse($this->container->get('router')->generate('appbuild_admin_application_list'));
     }
 
+    /**
+     * Upload display image file using AJAX.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function uploadDisplayImageAjaxAction(Request $request)
+    {
+        return $this->uploadApplicationImageAjax($request, 'displayImageFile');
+    }
+
+    /**
+     * Upload full size image file using AJAX.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function uploadFullSizeImageAjaxAction(Request $request)
+    {
+        return $this->uploadApplicationImageAjax($request, 'fullSizeImageFile');
+    }
+
+    /**
+     * Get existing display image using AJAX (useful for edition form).
+     *
+     * @param Application $application
+     *
+     * @return JsonResponse
+     */
+    public function getExistingDisplayImageAjaxAction(Application $application)
+    {
+        return $this->getExistingApplicationImageAjax($application, 'displayImageFile');
+    }
+
+    /**
+     * Get existing full size image using AJAX (useful for edition form).
+     *
+     * @param Application $application
+     *
+     * @return JsonResponse
+     */
+    public function getExistingFullSizeImageAjaxAction(Application $application)
+    {
+        return $this->getExistingApplicationImageAjax($application, 'fullSizeImageFile');
+    }
+
+    /**
+     * @return JsonResponse
+     */
+    public function deleteImageAjaxAction()
+    {
+        // do nothing because deleting will happen on save
+        return new JsonResponse([]);
+    }
+
     /**
      * Toggles the enabled property of the application.
      *
@@ -202,4 +263,116 @@ public function toggleEnableAction(Application $application, Request $request)
             )
         );
     }
+
+    /**
+     * Upload application image file using AJAX.
+     *
+     * @param Request $request
+     * @param string  $applicationImageType
+     *
+     * @return JsonResponse
+     */
+    private function uploadApplicationImageAjax(Request $request, $applicationImageType)
+    {
+        $translator = $this->container->get('translator');
+
+        if (!$this->isGranted('ROLE_ADMIN')) {
+            return new JsonResponse([
+                'success' => false,
+                'error' => $translator->trans('admin.upload.message.not_allowed'),
+            ]);
+        }
+
+        if (!$request->isXmlHttpRequest() || !$request->isMethod(Request::METHOD_POST)) {
+            return new JsonResponse([
+                'success' => false,
+                'error' => $translator->trans('admin.upload.message.unexpected_method'),
+            ]);
+        }
+
+        $uploadedFile = $request->files->get($applicationImageType);
+        if (!$uploadedFile instanceof UploadedFile) {
+            return new JsonResponse([
+                'success' => false,
+                'error' => $translator->trans('admin.upload.message.upload_failure'),
+            ]);
+        }
+
+        $uploadHelper = $this->container->get('appbuild.application.application_image_upload_helper');
+        $filename = $uploadHelper->generateFilename($uploadedFile);
+        try {
+            $uploadHelper->moveUploadedFile($uploadedFile, $filename);
+        } catch (\Exception $e) {
+            return new JsonResponse([
+                'success' => false,
+                'error' => $translator->trans('admin.upload.message.move_failure'),
+            ]);
+        }
+
+        return new JsonResponse([
+            'success' => true,
+            'filename' => $filename,
+        ]);
+    }
+
+    /**
+     * Get existing application image using AJAX.
+     *
+     * @param Application $application
+     * @param string      $applicationImageType
+     *
+     * @return JsonResponse
+     */
+    private function getExistingApplicationImageAjax(Application $application, $applicationImageType)
+    {
+        if (!$this->isGranted('ROLE_ADMIN') || !$this->getUserApplications()->contains($application)) {
+            return new JsonResponse([]);
+        }
+
+        $applicationFilenameGetter = sprintf('get%sName', ucfirst($applicationImageType));
+        $applicationFilepathGetter = sprintf('get%sPath', ucfirst($applicationImageType));
+        if (
+            !method_exists($application, $applicationFilenameGetter)
+            || !method_exists($application, $applicationFilepathGetter)
+            || !($filename = call_user_func([$application, $applicationFilenameGetter]))
+            || !($filesize = @filesize(call_user_func([$application, $applicationFilepathGetter])))
+        ) {
+            return new JsonResponse([]);
+        }
+
+        return new JsonResponse([
+            [
+                'name' => $filename,
+                'uuid' => $applicationImageType.$application->getId(),
+                'size' => $filesize,
+                'thumbnailUrl' => $this->container->get('assets.packages')->getUrl(sprintf(
+                    '%s/%s',
+                    $this->container->getParameter('application_images_webroot_relative_dir'),
+                    $filename
+                )),
+            ],
+        ]);
+    }
+
+    /**
+     * @param Request     $request
+     * @param Application $application
+     */
+    private function handleApplicationImagesFile(Request $request, Application $application)
+    {
+        $uploadHelper = $this->container->get('appbuild.application.application_image_upload_helper');
+        $formData = $request->request->get('appbuild_application');
+
+        $application->setDisplayImageFilePath(
+            !empty($formData['displayImageFilename'])
+                ? $uploadHelper->getFilePath($formData['displayImageFilename'])
+                : ''
+        );
+
+        $application->setFullSizeImageFilePath(
+            !empty($formData['fullSizeImageFilename'])
+                ? $uploadHelper->getFilePath($formData['fullSizeImageFilename'])
+                : ''
+        );
+    }
 }
diff --git a/src/ApplicationBundle/Controller/Admin/BuildController.php b/src/ApplicationBundle/Controller/Admin/BuildController.php
index e0cb4c6..2308539 100644
--- a/src/ApplicationBundle/Controller/Admin/BuildController.php
+++ b/src/ApplicationBundle/Controller/Admin/BuildController.php
@@ -94,14 +94,7 @@ public function createAction(Application $application, Request $request)
         );
 
         if ($request->isMethod(Request::METHOD_POST)) {
-            // Set build filePath using request build filename
-            $uploadHelper = $this->container->get('appbuild.application.build_upload_helper');
-            $buildFormData = $request->request->get('appbuild_build');
-            if (!empty($buildFormData['filename'])) {
-                $build->setFilePath(
-                    $uploadHelper->getFilePath($application, $buildFormData['filename'])
-                );
-            }
+            $this->handleBuildFile($request, $application, $build);
             $form->handleRequest($request);
             if ($form->isSubmitted() && $form->isValid()) {
                 $em = $this->container->get('doctrine.orm.entity_manager');
@@ -157,14 +150,7 @@ public function updateAction(Application $application, Build $build, Request $re
         );
 
         if ($request->isMethod(Request::METHOD_POST)) {
-            // Set build filePath using request build filename
-            $uploadHelper = $this->container->get('appbuild.application.build_upload_helper');
-            $buildFormData = $request->request->get('appbuild_build');
-            if (!empty($buildFormData['filename'])) {
-                $build->setFilePath(
-                    $uploadHelper->getFilePath($application, $buildFormData['filename'])
-                );
-            }
+            $this->handleBuildFile($request, $application, $build);
             $form->handleRequest($request);
             if ($form->isSubmitted() && $form->isValid()) {
                 $em = $this->container->get('doctrine.orm.entity_manager');
@@ -481,4 +467,20 @@ public function toggleEnableAction(Application $application, Build $build, Reque
             )
         );
     }
+
+    /**
+     * @param Request     $request
+     * @param Application $application
+     * @param Build       $build
+     */
+    private function handleBuildFile(Request $request, Application $application, Build $build)
+    {
+        $uploadHelper = $this->container->get('appbuild.application.build_upload_helper');
+        $buildFormData = $request->request->get('appbuild_build');
+        if (!empty($buildFormData['filename'])) {
+            $build->setFilePath(
+                $uploadHelper->getFilePath($application, $buildFormData['filename'])
+            );
+        }
+    }
 }
diff --git a/src/ApplicationBundle/Controller/Api/BuildController.php b/src/ApplicationBundle/Controller/Api/BuildController.php
index 023e476..4659ea3 100644
--- a/src/ApplicationBundle/Controller/Api/BuildController.php
+++ b/src/ApplicationBundle/Controller/Api/BuildController.php
@@ -130,17 +130,21 @@ public function uploadFileAction(Build $build, Request $request)
     {
         $application = $build->getApplication();
         $uploadHelper = $this->container->get('appbuild.application.build_upload_helper');
-        $translator = $this->container->get('translator');
 
-        if (!$filename = $request->query->get('filename')) {
-            $filename = $build->getSlug();
-        }
+        $filename = sprintf(
+            '%s.%s',
+            $build->getSlug(),
+            ($build->getApplication()->getSupport() === Application::SUPPORT_IOS) ? 'ipa' : 'apk'
+        );
 
         try {
             $tmpFile = $uploadHelper->createTempFile($request->getContent(), $filename);
             $uploadHelper->moveUploadedFile($tmpFile, $application, $filename);
         } catch (\Exception $e) {
-            return new JsonResponse(['errors' => [$translator->trans('admin.upload.message.upload_failure')]], 500);
+            return new JsonResponse(
+                ['errors' => [$this->container->get('translator')->trans('admin.upload.message.upload_failure')]],
+                500
+            );
         }
 
         $build
diff --git a/src/ApplicationBundle/DataFixtures/ORM/ApplicationFixturesLoader.php b/src/ApplicationBundle/DataFixtures/ORM/ApplicationFixturesLoader.php
index 675520f..b517286 100644
--- a/src/ApplicationBundle/DataFixtures/ORM/ApplicationFixturesLoader.php
+++ b/src/ApplicationBundle/DataFixtures/ORM/ApplicationFixturesLoader.php
@@ -4,6 +4,7 @@
 
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Hautelook\AliceBundle\Doctrine\DataFixtures\AbstractLoader;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Fixtures loader for ApplicationBundle.
@@ -17,6 +18,17 @@ class ApplicationFixturesLoader extends AbstractLoader implements OrderedFixture
      */
     public function getFixtures()
     {
+        // copy fixture files in expected locations
+        $applicationImagesDir = $this->container->getParameter('application_images_dir');
+        $fs = new Filesystem();
+        $fs->mkdir($applicationImagesDir);
+        $fs->mirror(
+            __DIR__.'/../../Resources/fixtures/files/application_images',
+            $this->container->getParameter('application_images_dir'),
+            null,
+            ['override' => true]
+        );
+
         return [
             __DIR__.'/../../Resources/fixtures/applications.yml',
             __DIR__.'/../../Resources/fixtures/builds.yml',
diff --git a/src/ApplicationBundle/Entity/Application.php b/src/ApplicationBundle/Entity/Application.php
index bf51724..1f0f5f8 100644
--- a/src/ApplicationBundle/Entity/Application.php
+++ b/src/ApplicationBundle/Entity/Application.php
@@ -47,6 +47,16 @@ class Application
      */
     private $packageName;
 
+    /**
+     * @var string
+     */
+    private $displayImageFilePath;
+
+    /**
+     * @var string
+     */
+    private $fullSizeImageFilePath;
+
     /**
      * @var ArrayCollection|Build[]
      */
@@ -68,6 +78,8 @@ class Application
     public function __construct()
     {
         $this->enabled = true;
+        $this->displayImageFilePath = '';
+        $this->fullSizeImageFilePath = '';
         $this->builds = new ArrayCollection();
         $this->users = new ArrayCollection();
     }
@@ -184,6 +196,62 @@ public function setPackageName($packageName)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getDisplayImageFilePath()
+    {
+        return $this->displayImageFilePath;
+    }
+
+    /**
+     * @param string $displayImageFilePath
+     *
+     * @return $this
+     */
+    public function setDisplayImageFilePath($displayImageFilePath)
+    {
+        $this->displayImageFilePath = $displayImageFilePath;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayImageFileName()
+    {
+        return basename($this->displayImageFilePath);
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullSizeImageFilePath()
+    {
+        return $this->fullSizeImageFilePath;
+    }
+
+    /**
+     * @param string $fullSizeImageFilePath
+     *
+     * @return $this
+     */
+    public function setFullSizeImageFilePath($fullSizeImageFilePath)
+    {
+        $this->fullSizeImageFilePath = $fullSizeImageFilePath;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullSizeImageFileName()
+    {
+        return basename($this->fullSizeImageFilePath);
+    }
+
     /**
      * @return bool
      */
@@ -313,25 +381,52 @@ public function getDisabledBuilds()
     }
 
     /**
-     * Assert this Application is valid (depending on its support).
-     *
-     * This method is intended to be used in validation constraints.
-     *
      * @param ExecutionContextInterface $context
      */
-    public function validate(ExecutionContextInterface $context)
+    public function validatePackageName(ExecutionContextInterface $context)
     {
         if (empty($this->packageName)) {
             switch ($this->getSupport()) {
                 case self::SUPPORT_IOS:
                     $context->buildViolation('application.form.must_set_package_name')
                         ->atPath('packageName')
-                        ->addViolation()
-                    ;
+                        ->addViolation();
                     break;
                 default:
                     break;
             }
         }
     }
+
+    /**
+     * @param ExecutionContextInterface $context
+     */
+    public function validateDisplayImage(ExecutionContextInterface $context)
+    {
+        if (!$this->displayImageFilePath) {
+            return;
+        }
+
+        if (!file_exists($this->displayImageFilePath)) {
+            $context->buildViolation('application.form.display_image_file_does_not_exist')
+                ->atPath('displayImageFilename')
+                ->addViolation();
+        }
+    }
+
+    /**
+     * @param ExecutionContextInterface $context
+     */
+    public function validateFullSizeImage(ExecutionContextInterface $context)
+    {
+        if (!$this->fullSizeImageFilePath) {
+            return;
+        }
+
+        if (!file_exists($this->fullSizeImageFilePath)) {
+            $context->buildViolation('application.form.full_size_image_file_does_not_exist')
+                ->atPath('fullSizeImageFilename')
+                ->addViolation();
+        }
+    }
 }
diff --git a/src/ApplicationBundle/Entity/Build.php b/src/ApplicationBundle/Entity/Build.php
index e48d635..8e078e7 100644
--- a/src/ApplicationBundle/Entity/Build.php
+++ b/src/ApplicationBundle/Entity/Build.php
@@ -233,21 +233,42 @@ public function setComment($comment)
     }
 
     /**
-     * Validation method for build filePath property.
-     *
      * @param ExecutionContextInterface $context
      */
-    public function validateFilePath(ExecutionContextInterface $context)
+    public function validateFile(ExecutionContextInterface $context)
     {
         // If the file is disabled, it can have an empty filePath
         if (!$this->enabled && !$this->filePath) {
             return;
         }
 
+        // File must exists
         if (!file_exists($this->filePath)) {
             $context->buildViolation('build.form.must_upload_file')
                 ->atPath('filename')
                 ->addViolation();
         }
+
+        // File must be of a specific type, depending on application support
+        $fileExtension = pathinfo($this->filePath, PATHINFO_EXTENSION);
+        switch ($this->getApplication()->getSupport()) {
+            case Application::SUPPORT_IOS:
+                if ($fileExtension !== 'ipa') {
+                    $context->buildViolation('build.form.file_must_be_ipa')
+                        ->atPath('filename')
+                        ->addViolation();
+                }
+                break;
+            case Application::SUPPORT_ANDROID:
+                if ($fileExtension !== 'apk') {
+                    $context->buildViolation('build.form.file_must_be_apk')
+                        ->atPath('filename')
+                        ->addViolation();
+                }
+                break;
+            default:
+                throw new \RuntimeException('Unsupported application type');
+                break;
+        }
     }
 }
diff --git a/src/ApplicationBundle/Form/Type/ApplicationType.php b/src/ApplicationBundle/Form/Type/ApplicationType.php
index 0c9b14e..98a7550 100644
--- a/src/ApplicationBundle/Form/Type/ApplicationType.php
+++ b/src/ApplicationBundle/Form/Type/ApplicationType.php
@@ -70,6 +70,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'error_bubbling' => true,
             'choices' => Application::getAvailableSupports(),
         ]);
+        $builder->add('displayImageFilename', TextType::class, [
+            'error_bubbling' => true,
+            'mapped' => false,
+        ]);
+        $builder->add('fullSizeImageFilename', TextType::class, [
+            'error_bubbling' => true,
+            'mapped' => false,
+        ]);
 
         $builder->add('users', EntityType::class, [
             'error_bubbling' => true,
@@ -80,7 +88,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $qb = $repository->createQueryBuilder('u');
 
                 return $qb
-                    // Not current user (it should ask a super admin if he wants to lose control over an application)
+                    // Not current user (he should ask a ROLE_SUPER_ADMIN if he wants to lose control over an application)
                     ->andWhere($qb->expr()->neq('u', ':currentUser'))->setParameter(':currentUser', $this->tokenStorage->getToken()->getUser())
                     // Not ROLE_SUPER_ADMIN (they always have access to applications)
                     ->andWhere($qb->expr()->notIn('u.roles', ':superAdmin'))->setParameter(':superAdmin', 'ROLE_SUPER_ADMIN')
diff --git a/src/ApplicationBundle/Form/Type/BuildType.php b/src/ApplicationBundle/Form/Type/BuildType.php
index 71fa226..0da3562 100644
--- a/src/ApplicationBundle/Form/Type/BuildType.php
+++ b/src/ApplicationBundle/Form/Type/BuildType.php
@@ -2,7 +2,6 @@
 
 namespace LinkValue\Appbuild\ApplicationBundle\Form\Type;
 
-use LinkValue\Appbuild\ApplicationBundle\Entity\Build;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/src/ApplicationBundle/Resources/config/doctrine/Application.orm.yml b/src/ApplicationBundle/Resources/config/doctrine/Application.orm.yml
index b03bd66..e80b37e 100644
--- a/src/ApplicationBundle/Resources/config/doctrine/Application.orm.yml
+++ b/src/ApplicationBundle/Resources/config/doctrine/Application.orm.yml
@@ -23,6 +23,16 @@ LinkValue\Appbuild\ApplicationBundle\Entity\Application:
             type: string
             column: package_name
             nullable: true
+        displayImageFilePath:
+            type: string
+            length: 510
+            column: display_image_file_path
+            nullable: true
+        fullSizeImageFilePath:
+            type: string
+            length: 510
+            column: full_size_image_file_path
+            nullable: true
         enabled:
             type: boolean
         createdAt:
diff --git a/src/ApplicationBundle/Resources/config/doctrine/Build.orm.yml b/src/ApplicationBundle/Resources/config/doctrine/Build.orm.yml
index b63f090..851c4d2 100644
--- a/src/ApplicationBundle/Resources/config/doctrine/Build.orm.yml
+++ b/src/ApplicationBundle/Resources/config/doctrine/Build.orm.yml
@@ -14,6 +14,7 @@ LinkValue\Appbuild\ApplicationBundle\Entity\Build:
             nullable: true
         filePath:
             type: string
+            length: 510
             column: file_path
             nullable: true
         enabled:
diff --git a/src/ApplicationBundle/Resources/config/routing/admin/application.yml b/src/ApplicationBundle/Resources/config/routing/admin/application.yml
index 5f584d3..1af9b9a 100644
--- a/src/ApplicationBundle/Resources/config/routing/admin/application.yml
+++ b/src/ApplicationBundle/Resources/config/routing/admin/application.yml
@@ -16,6 +16,26 @@ appbuild_admin_application_delete:
     path:     '/{id}/delete'
     defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:delete' }
 
+appbuild_admin_application_display_image_upload:
+    path:     '/upload_display_image'
+    defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:uploadDisplayImageAjax' }
+
+appbuild_admin_application_full_size_image_upload:
+    path:     '/upload_full_size_image'
+    defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:uploadFullSizeImageAjax' }
+
+appbuild_admin_application_delete_image:
+    path:     '/delete_image'
+    defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:deleteImageAjax' }
+
+appbuild_admin_application_get_display_image:
+    path:     '/{id}/get_display_image'
+    defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:getExistingDisplayImageAjax' }
+
+appbuild_admin_application_get_full_size_image:
+    path:     '/{id}/get_full_size_image'
+    defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:getExistingFullSizeImageAjax' }
+
 appbuild_admin_application_toggle_enable:
     path:     '/{id}/enable'
     defaults: { _controller: 'AppbuildApplicationBundle:Admin/Application:toggleEnable' }
diff --git a/src/ApplicationBundle/Resources/config/services.xml b/src/ApplicationBundle/Resources/config/services.xml
index d9ec1cc..d62cdfc 100644
--- a/src/ApplicationBundle/Resources/config/services.xml
+++ b/src/ApplicationBundle/Resources/config/services.xml
@@ -30,6 +30,24 @@
             <argument>%builds_application_dir%</argument>
         </service>
 
+        <!-- Application Image Upload Helper -->
+        <service id="appbuild.application.application_image_upload_helper"
+            class="LinkValue\Appbuild\ApplicationBundle\Service\ApplicationImageUploadHelper"
+            public="true"
+        >
+            <argument>%application_images_dir%</argument>
+        </service>
+
+        <!-- Application Image Files Purger -->
+        <service id="appbuild.application.application_image_files_purger"
+             class="LinkValue\Appbuild\ApplicationBundle\Service\ApplicationImageFilesPurger"
+             public="true"
+        >
+            <argument type="service" id="filesystem" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument>%application_images_dir%</argument>
+        </service>
+
         <!-- Build Files Purger -->
         <service id="appbuild.application.build_files_purger"
             class="LinkValue\Appbuild\ApplicationBundle\Service\BuildFilesPurger"
diff --git a/src/ApplicationBundle/Resources/config/validation/application.yml b/src/ApplicationBundle/Resources/config/validation/application.yml
index 5045862..c5298bf 100644
--- a/src/ApplicationBundle/Resources/config/validation/application.yml
+++ b/src/ApplicationBundle/Resources/config/validation/application.yml
@@ -1,6 +1,8 @@
 LinkValue\Appbuild\ApplicationBundle\Entity\Application:
     constraints:
-        - Callback: validate
+        - Callback: validatePackageName
+        - Callback: validateDisplayImage
+        - Callback: validateFullSizeImage
     properties:
         support:
             - Choice:
diff --git a/src/ApplicationBundle/Resources/config/validation/build.yml b/src/ApplicationBundle/Resources/config/validation/build.yml
index df2e94f..b8a0e4d 100644
--- a/src/ApplicationBundle/Resources/config/validation/build.yml
+++ b/src/ApplicationBundle/Resources/config/validation/build.yml
@@ -1,6 +1,6 @@
 LinkValue\Appbuild\ApplicationBundle\Entity\Build:
     constraints:
-        - Callback: validateFilePath
+        - Callback: validateFile
     properties:
         version:
             - NotBlank: ~
diff --git a/src/ApplicationBundle/Resources/fixtures/applications.yml b/src/ApplicationBundle/Resources/fixtures/applications.yml
index a6fe017..496c453 100644
--- a/src/ApplicationBundle/Resources/fixtures/applications.yml
+++ b/src/ApplicationBundle/Resources/fixtures/applications.yml
@@ -1,15 +1,23 @@
 LinkValue\Appbuild\ApplicationBundle\Entity\Application:
     test_ios:
         support: ios
-        label: Test application
+        label: Test application iOS
         packageName: com.link-value.test
+        displayImageFilePath: '<{application_images_dir}>/display_image_72x72.jpeg'
+        fullSizeImageFilePath: '<{application_images_dir}>/full_size_image_512x512.jpg'
         enabled: true
     test_android:
         support: android
         label: Test application Android
+        displayImageFilePath: '<{application_images_dir}>/display_image_72x72.jpeg'
+        fullSizeImageFilePath: '<{application_images_dir}>/full_size_image_512x512.jpg'
         enabled: true
-    test_ios_without_build:
+    test_ios_without_build_nor_images:
         support: ios
-        label: Test application without build
+        label: Test application iOS without build
         packageName: test.without.build
         enabled: true
+    test_android_without_build_nor_images:
+        support: android
+        label: Test application Android without images
+        enabled: true
diff --git a/src/ApplicationBundle/Resources/fixtures/files/application_images/display_image_72x72.jpeg b/src/ApplicationBundle/Resources/fixtures/files/application_images/display_image_72x72.jpeg
new file mode 100644
index 0000000..36d1ee7
Binary files /dev/null and b/src/ApplicationBundle/Resources/fixtures/files/application_images/display_image_72x72.jpeg differ
diff --git a/src/ApplicationBundle/Resources/fixtures/files/application_images/full_size_image_512x512.jpg b/src/ApplicationBundle/Resources/fixtures/files/application_images/full_size_image_512x512.jpg
new file mode 100644
index 0000000..d9b3300
Binary files /dev/null and b/src/ApplicationBundle/Resources/fixtures/files/application_images/full_size_image_512x512.jpg differ
diff --git a/src/ApplicationBundle/Resources/translations/messages.en.yml b/src/ApplicationBundle/Resources/translations/messages.en.yml
index 0152b86..49baf89 100644
--- a/src/ApplicationBundle/Resources/translations/messages.en.yml
+++ b/src/ApplicationBundle/Resources/translations/messages.en.yml
@@ -15,6 +15,12 @@ application:
             description: (aka. Bundle identifier)
             placeholder: e.g. com.example.app
             error: This field is mandatory
+        display_image:
+            label: Icon displayed on device until installation is done (.jpeg, .jpg or .png)
+            description: (recommended size is 72 x 72)
+        full_size_image:
+            label: Icon displayed in applications list (.jpeg, .jpg or .png)
+            description: (recommended size is 512 x 512)
         users:
             label: Users
             placeholder: type the user name
@@ -51,6 +57,7 @@ application:
         latest_comment:
             read_more: Read more
             no_comment: no comment
+            read_comment: Read latest build comment
         latest_comment_modal:
             title: Comment
             close: close
@@ -88,9 +95,12 @@ build:
             disabled_builds: disabled builds
             enabled_builds: enabled builds
         thead:
-            label: Label
+            label: Download link
             actions: Actions
             comment: Comment
+        comment:
+            read_more: Read more
+            no_comment: no comment
         comment_modal:
             title: build detail
             close: close
diff --git a/src/ApplicationBundle/Resources/translations/messages.fr.yml b/src/ApplicationBundle/Resources/translations/messages.fr.yml
index 0a558b9..a3873d3 100644
--- a/src/ApplicationBundle/Resources/translations/messages.fr.yml
+++ b/src/ApplicationBundle/Resources/translations/messages.fr.yml
@@ -15,6 +15,12 @@ application:
             description: (aka. Bundle identifier)
             placeholder: 'ex : com.example.app'
             error: Le champ est obligatoire
+        display_image:
+            label: Icône affichée sur l'appareil durant l'installation (.jpeg, .jpg ou .png)
+            description: (la taille recommandée est 72 x 72)
+        full_size_image:
+            label: Icône affichée dans la liste des applications (.jpeg, .jpg or .png)
+            description: (la taille recommandée est 512 x 512)
         users:
             label: Utilisateurs
             placeholder: tapez le nom de l'utilisateur
@@ -51,6 +57,7 @@ application:
         latest_comment:
             read_more: Lire la suite
             no_comment: aucun commentaire
+            read_comment: Lire le commentaire du dernier build
         latest_comment_modal:
             title: Commentaire
             close: fermer
@@ -88,9 +95,12 @@ build:
             disabled_builds: builds désactivés
             enabled_builds: builds activés
         thead:
-            label: Libellé
+            label: Lien de téléchargement
             actions: Actions
             comment: Commentaire
+        comment:
+            read_more: Lire la suite
+            no_comment: aucun commentaire
         comment_modal:
             title: détail build
             close: fermer
diff --git a/src/ApplicationBundle/Resources/translations/validators.en.yml b/src/ApplicationBundle/Resources/translations/validators.en.yml
index 425e31e..64ae5e9 100644
--- a/src/ApplicationBundle/Resources/translations/validators.en.yml
+++ b/src/ApplicationBundle/Resources/translations/validators.en.yml
@@ -2,6 +2,10 @@
 application:
     form:
         must_set_package_name: This application OS requires to set a Package name.
+        display_image_file_does_not_exist: The display image file does not exist. Please, try to re-upload it.
+        full_size_image_file_does_not_exist: The full size image file does not exist. Please, try to re-upload it.
 build:
     form:
         must_upload_file: You have to upload the build file.
+        file_must_be_ipa: The build file you uploaded is not a valid "ipa" file.
+        file_must_be_apk: The build file you uploaded is not a valid "apk" file.
diff --git a/src/ApplicationBundle/Resources/translations/validators.fr.yml b/src/ApplicationBundle/Resources/translations/validators.fr.yml
index 71851f4..2a9c67f 100644
--- a/src/ApplicationBundle/Resources/translations/validators.fr.yml
+++ b/src/ApplicationBundle/Resources/translations/validators.fr.yml
@@ -2,6 +2,10 @@
 application:
     form:
         must_set_package_name: Cet OS nécessite la saisie d'un nom de package.
+        display_image_file_does_not_exist: Le fichier de la petite icône n'a pas été trouvé. Merci de le renvoyer.
+        full_size_image_file_does_not_exist: Le fichier de la grande icône n'a pas été trouvé. Merci de le renvoyer.
 build:
     form:
         must_upload_file: Vous devez envoyer le fichier du build.
+        file_must_be_ipa: Le fichier que vous avez envoyé n'est pas un fichier "ipa" valide.
+        file_must_be_apk: Le fichier que vous avez envoyé n'est pas un fichier "apk" valide.
diff --git a/src/ApplicationBundle/Resources/views/Application/form.html.twig b/src/ApplicationBundle/Resources/views/Application/form.html.twig
index f29c3b8..13b02b8 100644
--- a/src/ApplicationBundle/Resources/views/Application/form.html.twig
+++ b/src/ApplicationBundle/Resources/views/Application/form.html.twig
@@ -1,84 +1,6 @@
 {% extends 'AppbuildAppBundle:Layout:layout_authenticated.html.twig' %}
 
 {% block content %}
-    {# TODO application.image #}
-    {#<script type="text/template" id="qq-template">#}
-        {#<div class="qq-uploader-selector qq-uploader qq-gallery" qq-drop-text="Déplace un fichier ici ou choisis-en un">#}
-            {#<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">#}
-                {#<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>#}
-            {#</div>#}
-            {#<div class="qq-upload-drop-area-selector qq-upload-drop-area" qq-hide-dropzone qq-drop-text="Déplace un fichier ici ou choisis-en un">#}
-                {#<span class="qq-upload-drop-area-text-selector"></span>#}
-            {#</div>#}
-            {#<div class="qq-upload-button-selector qq-upload-button">#}
-                {#<div>Upload a file</div>#}
-            {#</div>#}
-          {#<span class="qq-drop-processing-selector qq-drop-processing">#}
-              {#<span>Processing dropped files...</span>#}
-              {#<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>#}
-          {#</span>#}
-            {#<ul class="qq-upload-list-selector qq-upload-list" role="region" aria-live="polite" aria-relevant="additions removals">#}
-                {#<li>#}
-                    {#<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>#}
-                    {#<div class="qq-progress-bar-container-selector qq-progress-bar-container">#}
-                        {#<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-progress-bar-selector qq-progress-bar"></div>#}
-                    {#</div>#}
-                    {#<span class="qq-upload-spinner-selector qq-upload-spinner"></span>#}
-                    {#<div class="qq-thumbnail-wrapper">#}
-                        {#<img class="qq-thumbnail-selector" qq-max-size="120" qq-server-scale>#}
-                    {#</div>#}
-                    {#<button type="button" class="qq-upload-cancel-selector qq-upload-cancel">X</button>#}
-                    {#<button type="button" class="qq-upload-retry-selector qq-upload-retry">#}
-                        {#<span class="qq-btn qq-retry-icon" aria-label="Retry"></span>#}
-                        {#Retry#}
-                    {#</button>#}
-
-                    {#<div class="qq-file-info">#}
-                        {#<div class="qq-file-name">#}
-                            {#<span class="qq-upload-file-selector qq-upload-file"></span>#}
-                            {#<span class="qq-edit-filename-icon-selector qq-btn qq-edit-filename-icon" aria-label="Edit filename"></span>#}
-                        {#</div>#}
-                        {#<input class="qq-edit-filename-selector qq-edit-filename" tabindex="0" type="text">#}
-                        {#<span class="qq-upload-size-selector qq-upload-size"></span>#}
-                        {#<button type="button" class="qq-btn qq-upload-delete-selector qq-upload-delete">#}
-                            {#<span class="qq-btn qq-delete-icon" aria-label="Delete"></span>#}
-                        {#</button>#}
-                        {#<button type="button" class="qq-btn qq-upload-pause-selector qq-upload-pause">#}
-                            {#<span class="qq-btn qq-pause-icon" aria-label="Pause"></span>#}
-                        {#</button>#}
-                        {#<button type="button" class="qq-btn qq-upload-continue-selector qq-upload-continue">#}
-                            {#<span class="qq-btn qq-continue-icon" aria-label="Continue"></span>#}
-                        {#</button>#}
-                    {#</div>#}
-                {#</li>#}
-            {#</ul>#}
-
-            {#<dialog class="hide qq-alert-dialog-selector">#}
-                {#<div class="qq-dialog-message-selector"></div>#}
-                {#<div class="qq-dialog-buttons">#}
-                    {#<button type="button" class="qq-cancel-button-selector">Close</button>#}
-                {#</div>#}
-            {#</dialog>#}
-
-            {#<dialog class="hide qq-confirm-dialog-selector">#}
-                {#<div class="qq-dialog-message-selector"></div>#}
-                {#<div class="qq-dialog-buttons">#}
-                    {#<button type="button" class="qq-cancel-button-selector">No</button>#}
-                    {#<button type="button" class="qq-ok-button-selector">Yes</button>#}
-                {#</div>#}
-            {#</dialog>#}
-
-            {#<dialog class="hide qq-prompt-dialog-selector">#}
-                {#<div class="qq-dialog-message-selector"></div>#}
-                {#<input type="text">#}
-                {#<div class="qq-dialog-buttons">#}
-                    {#<button type="button" class="qq-cancel-button-selector">Cancel</button>#}
-                    {#<button type="button" class="qq-ok-button-selector">Ok</button>#}
-                {#</div>#}
-            {#</dialog>#}
-        {#</div>#}
-    {#</script>#}
-
     <header class="row align-middle header-section header-section-title" data-anim-appear>
         <div class="columns">
             <h1 class="title title_header-section">{% block title '' %}</h1>
@@ -87,7 +9,7 @@
 
     {% include 'AppbuildAppBundle:Includes:form_errors.html.twig' %}
 
-    <form name="appbuild_application" method="post" data-anim-appear data-abide novalidate>
+    <form name="appbuild_application" method="post" data-anim-appear data-abide novalidate data-id="{{ form.vars.value.id }}">
         <div class="input-wrap input-wrap_inline">
             <div class="row">
                 <div class="columns columns_label columns_label-boxed">
@@ -109,13 +31,6 @@
                 </div>
             </div>
         </div>
-        {# TODO application.image #}
-        {#<div class="input-wrap input-wrap_inline">#}
-            {#<div class="input-wrap__file input-wrap__file_inline">#}
-                {#<label class="label input-wrap__file-label" for="icon-app">Icône de l'application</label>#}
-                {#<div class="upload__file small" id="uploader-img"></div>#}
-            {#</div>#}
-        {#</div>#}
         <div class="input-wrap input-wrap_inline input-wrap_links">
             <div class="row">
                 <div class="columns columns_label columns_label-boxed">
@@ -124,14 +39,14 @@
                 <div class="columns columns_input">
                     {% for choice in form.support.vars.choices %}
                     <div class="input-wrap__input-radio">
-                        <input type="radio" id="appbuild_application_support-{{ choice.value }}" name="appbuild_application[support]" value="{{ choice.value }}" {{ form.vars.value.support == choice.value ? 'checked' : (loop.first ? 'checked') }} {{ (choice.value == 'ios') ? 'data-show-when-checked="appbuild_application_packageName_wrapper" data-required-when-checked="appbuild_application_packageName"' }}>
+                        <input type="radio" id="appbuild_application_support-{{ choice.value }}" name="appbuild_application[support]" value="{{ choice.value }}" {{ form.vars.value.support == choice.value ? 'checked' : (loop.first ? 'checked') }} {{ (choice.value == 'ios') ? 'data-show-when-checked=".show-for-support-ios" data-required-when-checked=".required-for-support-ios"' }}>
                         <label class="input-wrap__radio" for="appbuild_application_support-{{ choice.value }}"><i class="icon icon-{{ (choice.value == 'ios') ? 'apple' : 'android' }}"></i></label>
                     </div>
                     {% endfor %}
                 </div>
             </div>
         </div>
-        <div class="input-wrap input-wrap_inline" id="appbuild_application_packageName_wrapper">
+        <div class="input-wrap input-wrap_inline show-for-support-ios">
             <div class="row">
                 <div class="columns columns_label columns_label-boxed">
                     <label class="input-wrap__label" for="appbuild_application_packageName">
@@ -140,11 +55,31 @@
                     </label>
                 </div>
                 <div class="columns columns_input">
-                    <input class="input-wrap__input" type="text" id="appbuild_application_packageName" name="appbuild_application[packageName]" value="{{ form.vars.value.packageName }}" placeholder="{{ 'application.form.package_name.placeholder'|trans }}" />
+                    <input class="input-wrap__input required-for-support-ios" type="text" id="appbuild_application_packageName" name="appbuild_application[packageName]" value="{{ form.vars.value.packageName }}" placeholder="{{ 'application.form.package_name.placeholder'|trans }}" />
                     <span class="form-error">{{ 'application.form.package_name.error'|trans }}</span>
                 </div>
             </div>
         </div>
+        <div class="input-wrap input-wrap_inline show-for-support-ios">
+            <div class="input-wrap__file">
+                <label class="input-wrap__file-label label" for="appbuild_application_displayImageFile">
+                    <span>{{ 'application.form.display_image.label'|trans }}</span>
+                    <span>{{ 'application.form.display_image.description'|trans }}</span>
+                </label>
+                <div class="upload__file small" id="appbuild_application_displayImageFile"></div>
+            </div>
+            <input type="hidden" id="appbuild_application_displayImageFilename" name="appbuild_application[displayImageFilename]">
+        </div>
+        <div class="input-wrap input-wrap_inline">
+            <div class="input-wrap__file">
+                <label class="input-wrap__file-label label" for="appbuild_application_fullSizeImageFile">
+                    <span>{{ 'application.form.full_size_image.label'|trans }}</span>
+                    <span>{{ 'application.form.full_size_image.description'|trans }}</span>
+                </label>
+                <div class="upload__file small" id="appbuild_application_fullSizeImageFile"></div>
+            </div>
+            <input type="hidden" id="appbuild_application_fullSizeImageFilename" name="appbuild_application[fullSizeImageFilename]">
+        </div>
         <div class="row input-wrap input-wrap_block" data-select-filter>
             <div class="columns columns_label columns_label-boxed">
                 <label class="input-wrap__label" for="appbuild_application_users">{{ 'application.form.users.label'|trans }}</label>
@@ -192,5 +127,6 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script src="{{ asset('assets/application-form.js') }}"></script>
+    {{ include('AppbuildAppBundle:Includes:upload-container-template.html.twig') }}
+    <script src="{{ asset('application-form.js', 'static') }}"></script>
 {% endblock %}
diff --git a/src/ApplicationBundle/Resources/views/Application/list.html.twig b/src/ApplicationBundle/Resources/views/Application/list.html.twig
index ae0e3ca..593fca9 100644
--- a/src/ApplicationBundle/Resources/views/Application/list.html.twig
+++ b/src/ApplicationBundle/Resources/views/Application/list.html.twig
@@ -9,7 +9,7 @@
             <h1 class="title title_header-section">{{ 'application.list.title'|trans }}</h1>
         </div>
         {% if is_granted('ROLE_ADMIN') %}
-        <div class="columns shrink row-buttons show-for-medium show-for-up-mobile">
+        <div class="columns shrink row-buttons show-for-up-mobile">
             <a href="{{ url('appbuild_admin_application_create') }}" class="button button_navigation">
                 <span>{{ 'application.create.title'|trans }}</span>
             </a>
@@ -28,56 +28,60 @@
 
     <article class="table">
         <div class="table__row table__row-head" data-anim-appear>
-            <div class="table__cell table__cell-head show-for-large">
+            <div class="table__cell table__cell-head table__cell_shrink show-for-up-mobile">
                 <div class="table__cell-head__content">{{ 'application.list.thead.support'|trans }}</div>
             </div>
             <div class="table__cell table__cell-head table__cell-head-app">
                 <div class="table__cell-head__content">{{ 'application.list.thead.label'|trans }}</div>
             </div>
-            <div class="table__cell table__cell-head table__cell-head-last-build show-for-medium show-for-up-mobile">
+            <div class="table__cell table__cell-head table__cell-head-last-build show-for-up-mobile">
                 <div class="table__cell-head__content">{{ 'application.list.thead.latest_build'|trans }}</div>
             </div>
-            <div class="table__cell table__cell-head table__cell-head-last-comment table__cell-last">
+            <div class="table__cell table__cell-head table__cell-head-last-comment show-for-up-mobile">
                 <div class="table__cell-head__content">{{ 'application.list.thead.latest_comment'|trans }}</div>
             </div>
-            <div class="table__cell table__cell-head table__cell-head-action table__cell_shrink show-for-medium">
+            <div class="table__cell table__cell-head table__cell-head-actions table__cell_shrink">
                 <div class="table__cell-head__content"></div>
             </div>
         </div>
 
         {% for application in page.elements %}
         <div class="table__row table__row-body is-new" data-anim-appear data-id="{{ application.id }}">
-            <div class="table__cell table__cell-body table__cell_shrink table__cell-os show-for-large">
+            <div class="table__cell table__cell-body table__cell_shrink table__cell-os">
                 <div class="table__cell__content">
                     <i class="icon icon-os icon-{{ (application.support == 'android') ? 'android' : 'apple' }}"></i>
                 </div>
             </div>
             <div class="table__cell table__cell-body table__cell-app">
                 <div class="table__cell__content">
-                    <a class="table-link app-name-wrap align-middle" href="{{ url('appbuild_admin_build_list', { application_id: application.id }) }}">
+                    <div class="app-name-wrap align-middle">
                         <div class="columns shrink">
-                            <span class="app-picture" style="background-image:url('{# TODO application.image #}');">
-                                <i class="icon icon-os icon-{{ (application.support == 'android') ? 'android' : 'apple' }} hide-for-large"></i>
-                            </span>
+                            <a class="table-link" href="{{ url('appbuild_admin_build_list', { application_id: application.id }) }}">
+                                <span class="app-picture" {% if application.fullSizeImageFileName %}style="background-image:url('{{ asset(application_images_webroot_relative_dir ~ '/' ~ application.fullSizeImageFileName) }}');"{% endif %}></span>
+                            </a>
                         </div>
                         <div class="columns app-name">
-                            <strong class="line">{{ application.label }}</strong>
-                            {% if application.latestEnabledBuild %}
-                            <span class="app-date hide-for-large line">{{ application.latestEnabledBuild.createdAt|date('datetime.datetime'|trans, timezone) }}</span>
+                            <a class="table-link" href="{{ url('appbuild_admin_build_list', { application_id: application.id }) }}">
+                                <strong class="line">{{ application.label }}</strong>
+                                {% if application.latestEnabledBuild %}
+                                <br><span class="app-date line hide-for-up-mobile">{{ application.latestEnabledBuild.createdAt|date('datetime.datetime'|trans, timezone) }}</span>
+                                {% endif %}
+                            </a>
+                            {% if application.latestEnabledBuild and application.latestEnabledBuild.comment %}
+                            <a class="comment__more line hide-for-up-mobile" data-open="modal-comment-{{ application.id }}">{{ 'application.list.latest_comment.read_comment'|trans }}</a>
                             {% endif %}
                         </div>
-                    </a>
+                    </div>
                 </div>
             </div>
-            <div class="table__cell table__cell-body table__cell-last-build show-for-medium show-for-up-mobile">
+            <div class="table__cell table__cell-body table__cell-last-build show-for-up-mobile">
                 <div class="table__cell__content">
                     {% if application.latestEnabledBuild %}
                     <a class="columns-first table-link row align-middle" href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: application.latestEnabledBuild.id }) }}">
-                        <div class="columns shrink">
-                            <i class="icon icon-download show-for-large"></i>
+                        <div class="columns shrink show-for-large">
+                            <i class="icon icon-download"></i>
                         </div>
                         <div class="columns build-name">
-                            <strong class="line">{{ application.label }}</strong>
                             <span class="line app-date">{{ application.latestEnabledBuild.createdAt|date('datetime.datetime'|trans, timezone) }}</span>
                         </div>
                     </a>
@@ -93,47 +97,55 @@
                     {% endif %}
                 </div>
             </div>
-            <div class="table__cell table__cell-body table__cell-last-comment table__cell-last">
+            <div class="table__cell table__cell-body table__cell-last-comment show-for-up-mobile">
                 <div class="table__cell__content">
-                    {% if application.latestEnabledBuild and application.latestEnabledBuild.comment %}
                     <div class="comment columns-first">
+                        {% if application.latestEnabledBuild and application.latestEnabledBuild.comment %}
                         <span class="line comment__text">{{ application.latestEnabledBuild.comment }}</span>
                         <a class="comment__more line" data-open="modal-comment-{{ application.id }}">{{ 'application.list.latest_comment.read_more'|trans }}</a>
+                        {% else %}
+                        <span class="line comment__text">{{ 'application.list.latest_comment.no_comment'|trans }}</span>
+                        {% endif %}
                     </div>
-                    {# TODO register when users download a build, then show a "new" button when there's a build they haven't downloaded yet #}
+                    {# TODO save when users download a build, then show a "new" button when there's a build they haven't downloaded yet #}
                     {#<div class="columns-last">#}
-                        {#<span class="label-new show-for-medium show-for-up-mobile">nouveau</span>#}
+                        {#<span class="label-new show-for-up-mobile">nouveau</span>#}
                     {#</div>#}
-                    <div class="reveal" id="modal-comment-{{ application.id }}" data-reveal>
-                        <h3 class="title">{{ 'application.list.latest_comment_modal.title'|trans }}</h3>
-                        <p class="reveal__content">{{ application.latestEnabledBuild.comment|nl2br }}</p>
-                        <button class="button button_action button_confirm" data-close aria-label="{{ 'application.list.latest_comment_modal.close'|trans }}" type="button">
-                            <span aria-hidden="true">{{ 'application.list.latest_comment_modal.close'|trans }}</span>
-                        </button>
-                    </div>
-                    {% else %}
-                    <div class="comment columns-first">
-                        <span class="line comment__text">{{ 'application.list.latest_comment.no_comment'|trans }}</span>
-                    </div>
-                    {% endif %}
                 </div>
             </div>
-            <div class="table__cell table__cell-body table__cell_shrink table__cell_mobile-right">
+            <div class="table__cell table__cell-body table__cell-actions table__cell_shrink">
+                {% if is_granted('ROLE_ADMIN') %}
                 <div class="table__cell__content">
                     <div class="icons-action">
-                        {% if is_granted('ROLE_ADMIN') %}
-                        <a href="{{ url('appbuild_admin_application_update', { id: application.id }) }}" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-                        <a href="{{ url('appbuild_admin_application_toggle_enable', { id: application.id }) }}" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
-                        {% endif %}
+                        <a href="{{ url('appbuild_admin_application_update', { id: application.id }) }}" class="icon icon-action icon-update show-for-up-mobile"></a>
+                        <a href="{{ url('appbuild_admin_application_toggle_enable', { id: application.id }) }}" class="icon icon-action icon-archive show-for-up-mobile"></a>
                         {% if application.latestEnabledBuild %}
-                        <a href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: application.latestEnabledBuild.id }) }}" class="icon-action icon-action_download hide-for-medium">
-                            <i class="icon icon-download"></i><span class="icon-action_download__label ">{{ application.latestEnabledBuild.version }}</span>
+                        <a href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: application.latestEnabledBuild.id }) }}" class="icon-action icon-action_download hide-for-up-mobile">
+                            <i class="icon icon-download"></i><span class="icon-action_download__label">{{ application.latestEnabledBuild.version }}</span>
                         </a>
                         {% endif %}
                     </div>
                 </div>
+                {% elseif application.latestEnabledBuild %}
+                <div class="table__cell__content hide-for-up-mobile">
+                    <div class="icons-action">
+                        <a href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: application.latestEnabledBuild.id }) }}" class="icon-action icon-action_download">
+                            <i class="icon icon-download"></i><span class="icon-action_download__label">{{ application.latestEnabledBuild.version }}</span>
+                        </a>
+                    </div>
+                </div>
+                {% endif %}
             </div>
         </div>
+        {% if application.latestEnabledBuild and application.latestEnabledBuild.comment %}
+        <div class="reveal" id="modal-comment-{{ application.id }}" data-reveal>
+            <h3 class="title">{{ 'application.list.latest_comment_modal.title'|trans }}</h3>
+            <p class="reveal__content">{{ application.latestEnabledBuild.comment|nl2br }}</p>
+            <button class="button button_action button_confirm" data-close aria-label="{{ 'application.list.latest_comment_modal.close'|trans }}" type="button">
+                <span aria-hidden="true">{{ 'application.list.latest_comment_modal.close'|trans }}</span>
+            </button>
+        </div>
+        {% endif %}
         {% endfor %}
 
     </article>
diff --git a/src/ApplicationBundle/Resources/views/Build/form.html.twig b/src/ApplicationBundle/Resources/views/Build/form.html.twig
index ad8d815..3d6c449 100644
--- a/src/ApplicationBundle/Resources/views/Build/form.html.twig
+++ b/src/ApplicationBundle/Resources/views/Build/form.html.twig
@@ -57,6 +57,6 @@
 
 {% block javascripts %}
     {{ parent() }}
-    {{ include('AppbuildAppBundle::upload-container-template.html.twig') }}
-    <script src="{{ asset('assets/build-form.js') }}"></script>
+    {{ include('AppbuildAppBundle:Includes:upload-container-template.html.twig') }}
+    <script src="{{ asset('build-form.js', 'static') }}"></script>
 {% endblock %}
diff --git a/src/ApplicationBundle/Resources/views/Build/list.html.twig b/src/ApplicationBundle/Resources/views/Build/list.html.twig
index 6f8357d..a6b239d 100644
--- a/src/ApplicationBundle/Resources/views/Build/list.html.twig
+++ b/src/ApplicationBundle/Resources/views/Build/list.html.twig
@@ -39,7 +39,7 @@
                 <div class="table__cell-head__content">{{ 'build.list.thead.comment'|trans }}</div>
             </div>
             <div class="table__cell table__cell-head table__cell-head-actions table__cell_shrink">
-                <div class="table__cell-head__content show-for-medium show-for-up-mobile">{{ 'build.list.thead.actions'|trans }}</div>
+                <div class="table__cell-head__content"></div>
             </div>
         </div>
 
@@ -48,7 +48,7 @@
             <div class="table__cell table__cell-body table__cell-label-build">
                 <div class="table__cell__content">
                     <a class="table-link row align-middle" href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: build.id }) }}">
-                        <div class="columns shrink show-for-medium show-for-up-mobile">
+                        <div class="columns shrink show-for-up-mobile">
                             <span class="label-version">{{ build.version }}</span>
                         </div>
                         <div class="columns build-name">
@@ -60,9 +60,10 @@
             </div>
             <div class="table__cell table__cell-body table__cell-comment table__cell-last">
                 <div class="table__cell__content">
+                    {% if build.comment %}
                     <p class="comment">
                         <span class="comment__text line">{{ build.comment }}</span>
-                        <a class="comment__more line " data-open="modal-comment-{{ build.id }}">{{ 'application.list.latest_comment.read_more'|trans }}</a>
+                        <a class="comment__more line" data-open="modal-comment-{{ build.id }}">{{ 'build.list.comment.read_more'|trans }}</a>
                     </p>
                     <div class="reveal large" id="modal-comment-{{ build.id }}" data-reveal>
                         <h3 class="title">{{ 'build.list.comment_modal.title'|trans }}</h3>
@@ -74,18 +75,18 @@
                                         <span><strong>{{ application.label }}</strong></span>
                                     </div>
                                 </div>
-                                <div class="columns shrink show-for-medium">
+                                <div class="columns shrink show-for-up-mobile">
                                     <div class="reveal__block">
                                         <div class="icons-action">
                                             <a href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: build.id }) }}" class="icon-action icon-action_download">
-                                                <i class="icon icon-download"></i><span class="icon-action_download__label hide-for-medium">{{ build.version }}</span>
+                                                <i class="icon icon-download"></i>
                                             </a>
                                             {% if is_granted('ROLE_ADMIN') %}
-                                            <a href="{{ url('appbuild_admin_build_update', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-                                            <a href="{{ url('appbuild_admin_build_toggle_enable', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
+                                            <a href="{{ url('appbuild_admin_build_update', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-update"></a>
+                                            <a href="{{ url('appbuild_admin_build_toggle_enable', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-archive"></a>
                                             {% endif %}
                                             {# TODO delete builds #}
-                                            {#<a data-open="modal-trash-{{ build.id }}" class="icon icon-action icon-trash show-for-medium show-for-up-mobile"></a>#}
+                                            {#<a data-open="modal-trash-{{ build.id }}" class="icon icon-action icon-trash"></a>#}
                                         </div>
                                     </div>
                                 </div>
@@ -101,20 +102,21 @@
                             <span aria-hidden="true">{{ 'build.list.comment_modal.close'|trans }}</span>
                         </button>
                     </div>
+                    {% else %}
+                    <div class="comment columns-first">
+                        <span class="line comment__text">{{ 'build.list.comment.no_comment'|trans }}</span>
+                    </div>
+                    {% endif %}
                 </div>
             </div>
-            <div class="table__cell table__cell-body table__cell-actions table__cell_mobile-right table__cell_shrink">
-                <div class="table__cell__content">
+            <div class="table__cell table__cell-body table__cell-actions table__cell_shrink">
+                {% if is_granted('ROLE_ADMIN') %}
+                <div class="table__cell__content show-for-up-mobile">
                     <div class="icons-action">
-                        <a href="{{ url('appbuild_admin_build_download', { application_id: application.id, id: build.id }) }}" class="icon-action icon-action_download">
-                            <i class="icon icon-download"></i><span class="icon-action_download__label hide-for-medium">{{ build.version }}</span>
-                        </a>
-                        {% if is_granted('ROLE_ADMIN') %}
-                        <a href="{{ url('appbuild_admin_build_update', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-update show-for-medium show-for-up-mobile"></a>
-                        <a href="{{ url('appbuild_admin_build_toggle_enable', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
-                        {% endif %}
+                        <a href="{{ url('appbuild_admin_build_update', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-update"></a>
+                        <a href="{{ url('appbuild_admin_build_toggle_enable', { application_id: application.id, id: build.id }) }}" class="icon icon-action icon-archive"></a>
                         {# TODO delete builds #}
-                        {#<a data-open="modal-trash-{{ build.id }}" class="icon icon-action icon-trash show-for-medium show-for-up-mobile"></a>#}
+                        {#<a data-open="modal-trash-{{ build.id }}" class="icon icon-action icon-trash show-for-up-mobile"></a>#}
                     </div>
                     {# TODO delete builds #}
                     {#<div class="reveal" id="modal-trash-{{ build.id }}" data-reveal>#}
@@ -129,6 +131,7 @@
                         {#</div>#}
                     {#</div>#}
                 </div>
+                {% endif %}
             </div>
         </div>
         {% endfor %}
diff --git a/src/ApplicationBundle/Resources/views/Manifest/ios/manifest.plist.twig b/src/ApplicationBundle/Resources/views/Manifest/ios/manifest.plist.twig
index 46b095c..58f602e 100644
--- a/src/ApplicationBundle/Resources/views/Manifest/ios/manifest.plist.twig
+++ b/src/ApplicationBundle/Resources/views/Manifest/ios/manifest.plist.twig
@@ -13,6 +13,22 @@
                         <key>url</key>
                         <string>{{ absolute_url(url('appbuild_admin_build_get_file', { 'application_id': application.id, 'id': build.id, 'token': token })) }}</string>
                     </dict>
+                    {% if application.displayImageFileName -%}
+                    <dict>
+                        <key>kind</key>
+                        <string>display-image</string>
+                        <key>url</key>
+                        <string>{{ absolute_url(asset(application_images_webroot_relative_dir ~ '/' ~ application.displayImageFileName)) }}</string>
+                    </dict>
+                    {%- endif %}
+                    {% if application.fullSizeImageFileName -%}
+                    <dict>
+                        <key>kind</key>
+                        <string>full-size-image</string>
+                        <key>url</key>
+                        <string>{{ absolute_url(asset(application_images_webroot_relative_dir ~ '/' ~ application.fullSizeImageFileName)) }}</string>
+                    </dict>
+                    {%- endif %}
                 </array>
                 <key>metadata</key>
                 <dict>
diff --git a/src/ApplicationBundle/Service/AbstractUploadHelper.php b/src/ApplicationBundle/Service/AbstractUploadHelper.php
new file mode 100644
index 0000000..36cb399
--- /dev/null
+++ b/src/ApplicationBundle/Service/AbstractUploadHelper.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace LinkValue\Appbuild\ApplicationBundle\Service;
+
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+abstract class AbstractUploadHelper
+{
+    /**
+     * Generate and return a unique filename for an uploaded file.
+     *
+     * @param UploadedFile $uploadedFile
+     *
+     * @return string
+     */
+    public function generateFilename(UploadedFile $uploadedFile)
+    {
+        return preg_replace(
+            '/[^a-z0-9\-\.]/i',
+            '_',
+            sprintf(
+                '%s.%s',
+                sha1(uniqid(mt_rand(), true)),
+                $uploadedFile->getClientOriginalExtension()
+            )
+        );
+    }
+
+    /**
+     * Put binary content into a tmp file and return it into a Symfony\Component\HttpFoundation\File\File
+     * This binary file has to be moved or deleted manually.
+     *
+     * @param $fileContent mixed The file binary content (Can be either a string, an array or a stream resource.)
+     * @param $filename string The file name
+     *
+     * @return File The created file in temp folder
+     *
+     * @throws FileException if the file could not be created
+     */
+    public function createTempFile($fileContent, $filename)
+    {
+        $filePath = sprintf(
+            '%s%s%s',
+            rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR),
+            DIRECTORY_SEPARATOR,
+            ltrim($filename, DIRECTORY_SEPARATOR)
+        );
+
+        if (file_put_contents($filePath, $fileContent) === false) {
+            throw new FileException(sprintf('Could not create temp file "%s"', $filePath));
+        }
+
+        return new File($filePath);
+    }
+}
diff --git a/src/ApplicationBundle/Service/ApplicationImageFilesPurger.php b/src/ApplicationBundle/Service/ApplicationImageFilesPurger.php
new file mode 100644
index 0000000..8561883
--- /dev/null
+++ b/src/ApplicationBundle/Service/ApplicationImageFilesPurger.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace LinkValue\Appbuild\ApplicationBundle\Service;
+
+use Doctrine\ORM\EntityManager;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
+
+/**
+ * Handle purge application image files tasks.
+ */
+class ApplicationImageFilesPurger implements FilesPurgerInterface
+{
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var string
+     */
+    private $applicationImagesDir;
+
+    /**
+     * @var string
+     */
+    private $unusedFilesFinderDateFilter;
+
+    /**
+     * @param Filesystem    $filesystem
+     * @param EntityManager $entityManager
+     * @param string        $applicationImagesDir
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        EntityManager $entityManager,
+        $applicationImagesDir
+    ) {
+        $this->filesystem = $filesystem;
+        $this->entityManager = $entityManager;
+        $this->applicationImagesDir = $applicationImagesDir;
+
+        // Unused files finder date filter has a default value (!= null)
+        // because we must let the time for user to submit the form after uploading the build file
+        $this->unusedFilesFinderDateFilter = '< now - 12hours';
+    }
+
+    /**
+     * @param $finderDateFilter
+     *
+     * @return $this
+     */
+    public function setUnusedFilesFinderDateFilter($finderDateFilter)
+    {
+        $this->unusedFilesFinderDateFilter = $finderDateFilter;
+
+        return $this;
+    }
+
+    /**
+     * Remove unused build files.
+     */
+    public function purge()
+    {
+        foreach ($this->getUnusedFiles() as $file) {
+            $this->filesystem->remove($file);
+        }
+    }
+
+    /**
+     * Get unused files.
+     *
+     * @return Finder|\SplFileInfo[]
+     */
+    public function getUnusedFiles()
+    {
+        $usedFilesPath = $this->getUsedFilesPath();
+
+        return (new Finder())
+            ->files()
+            ->in($this->applicationImagesDir)
+            ->filter(function (\SplFileInfo $file) use ($usedFilesPath) {
+                return !in_array($file->getRealPath(), $usedFilesPath);
+            })
+           ->date($this->unusedFilesFinderDateFilter)
+        ;
+    }
+
+    /**
+     * Get used files.
+     *
+     * @return string[]
+     */
+    private function getUsedFilesPath()
+    {
+        $usedFiles = [];
+
+        $applications = $this->entityManager->getRepository('AppbuildApplicationBundle:Application')->findAll();
+        foreach ($applications as $application) {
+            $usedFiles[] = $application->getDisplayImageFilePath();
+            $usedFiles[] = $application->getFullSizeImageFilePath();
+        }
+
+        return $usedFiles;
+    }
+}
diff --git a/src/ApplicationBundle/Service/ApplicationImageUploadHelper.php b/src/ApplicationBundle/Service/ApplicationImageUploadHelper.php
new file mode 100644
index 0000000..6bb1c74
--- /dev/null
+++ b/src/ApplicationBundle/Service/ApplicationImageUploadHelper.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace LinkValue\Appbuild\ApplicationBundle\Service;
+
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+/**
+ * Handle application images upload tasks.
+ */
+class ApplicationImageUploadHelper extends AbstractUploadHelper
+{
+    /**
+     * @var string
+     */
+    private $applicationImagesDir;
+
+    /**
+     * @param string $applicationImagesDir
+     */
+    public function __construct($applicationImagesDir)
+    {
+        $this->applicationImagesDir = $applicationImagesDir;
+    }
+
+    /**
+     * Get full file path for filename.
+     *
+     * @param string $filename
+     *
+     * @return string
+     */
+    public function getFilePath($filename)
+    {
+        return realpath(
+            sprintf(
+                '%s%s%s',
+                $this->getBasePath(),
+                DIRECTORY_SEPARATOR,
+                $filename
+            )
+        );
+    }
+
+    /**
+     * Move uploaded file to its final destination.
+     *
+     * @param File|UploadedFile $uploadedFile
+     * @param string            $filename
+     */
+    public function moveUploadedFile(File $uploadedFile, $filename)
+    {
+        if (file_exists($this->getFilePath($filename))) {
+            unlink($this->getFilePath($filename));
+        }
+
+        $uploadedFile->move($this->getBasePath(), $filename);
+    }
+
+    /**
+     * Get upload base path.
+     *
+     * @return string
+     */
+    private function getBasePath()
+    {
+        return rtrim($this->applicationImagesDir, DIRECTORY_SEPARATOR);
+    }
+}
diff --git a/src/ApplicationBundle/Service/BuildFilesPurger.php b/src/ApplicationBundle/Service/BuildFilesPurger.php
index e3ea2b6..012e121 100644
--- a/src/ApplicationBundle/Service/BuildFilesPurger.php
+++ b/src/ApplicationBundle/Service/BuildFilesPurger.php
@@ -9,7 +9,7 @@
 /**
  * Handle purge build files tasks.
  */
-class BuildFilesPurger
+class BuildFilesPurger implements FilesPurgerInterface
 {
     /**
      * @var Filesystem
@@ -32,8 +32,6 @@ class BuildFilesPurger
     private $unusedFilesFinderDateFilter;
 
     /**
-     * construct.
-     *
      * @param Filesystem    $filesystem
      * @param EntityManager $entityManager
      * @param string        $buildsApplicationDir
diff --git a/src/ApplicationBundle/Service/BuildLinkBuilder.php b/src/ApplicationBundle/Service/BuildLinkBuilder.php
index a482d67..57ffe4d 100644
--- a/src/ApplicationBundle/Service/BuildLinkBuilder.php
+++ b/src/ApplicationBundle/Service/BuildLinkBuilder.php
@@ -17,8 +17,6 @@ class BuildLinkBuilder
     private $router;
 
     /**
-     * construct.
-     *
      * @param Router $router
      */
     public function __construct(Router $router)
diff --git a/src/ApplicationBundle/Service/BuildTokenManager.php b/src/ApplicationBundle/Service/BuildTokenManager.php
index e855c6d..d7591d3 100644
--- a/src/ApplicationBundle/Service/BuildTokenManager.php
+++ b/src/ApplicationBundle/Service/BuildTokenManager.php
@@ -23,8 +23,6 @@ class BuildTokenManager
     private $tokenTtl;
 
     /**
-     * construct.
-     *
      * @param EntityManager $entityManager
      * @param int           $tokenTtl
      */
diff --git a/src/ApplicationBundle/Service/BuildUploadHelper.php b/src/ApplicationBundle/Service/BuildUploadHelper.php
index 00f48f2..bf1f36d 100644
--- a/src/ApplicationBundle/Service/BuildUploadHelper.php
+++ b/src/ApplicationBundle/Service/BuildUploadHelper.php
@@ -3,14 +3,13 @@
 namespace LinkValue\Appbuild\ApplicationBundle\Service;
 
 use LinkValue\Appbuild\ApplicationBundle\Entity\Application;
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Handle build upload tasks.
  */
-class BuildUploadHelper
+class BuildUploadHelper extends AbstractUploadHelper
 {
     /**
      * @var string
@@ -18,8 +17,6 @@ class BuildUploadHelper
     private $buildsApplicationDir;
 
     /**
-     * construct.
-     *
      * @param string $buildsApplicationDir
      */
     public function __construct($buildsApplicationDir)
@@ -27,26 +24,6 @@ public function __construct($buildsApplicationDir)
         $this->buildsApplicationDir = $buildsApplicationDir;
     }
 
-    /**
-     * Generate and return a filename for an uploaded file.
-     *
-     * @param UploadedFile $uploadedFile
-     *
-     * @return string
-     */
-    public function generateFilename(UploadedFile $uploadedFile)
-    {
-        return preg_replace(
-            '/[^a-z0-9\-\.]/i',
-            '_',
-            sprintf(
-                '%s_%s',
-                sha1(uniqid(mt_rand(), true)),
-                $uploadedFile->getClientOriginalName()
-            )
-        );
-    }
-
     /**
      * Get full file path for application and filename.
      *
@@ -59,8 +36,9 @@ public function getFilePath(Application $application, $filename)
     {
         return realpath(
             sprintf(
-                '%s/%s',
+                '%s%s%s',
                 $this->getBasePath($application),
+                DIRECTORY_SEPARATOR,
                 $filename
             )
         );
@@ -75,34 +53,11 @@ public function getFilePath(Application $application, $filename)
      */
     public function moveUploadedFile(File $uploadedFile, Application $application, $filename)
     {
-        $uploadedFile->move($this->getBasePath($application), $filename);
-    }
-
-    /**
-     * Put binary content into a tmp file and return it into a Symfony\Component\HttpFoundation\File\File
-     * This binary file has to be moved or deleted manually.
-     *
-     * @param $fileContent mixed The file binary content (Can be either a string, an array or a stream resource.)
-     * @param $filename string The file name
-     *
-     * @return File The created file in temp folder
-     *
-     * @throws FileException if the file could not be created
-     */
-    public function createTempFile($fileContent, $filename)
-    {
-        $filePath = sprintf(
-            '%s%s%s',
-            rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR),
-            DIRECTORY_SEPARATOR,
-            ltrim($filename, DIRECTORY_SEPARATOR)
-        );
-
-        if (file_put_contents($filePath, $fileContent) === false) {
-            throw new FileException(sprintf('Could not create temp file "%s"', $filePath));
+        if (file_exists($this->getFilePath($application, $filename))) {
+            unlink($this->getFilePath($application, $filename));
         }
 
-        return new File($filePath);
+        $uploadedFile->move($this->getBasePath($application), $filename);
     }
 
     /**
@@ -115,8 +70,9 @@ public function createTempFile($fileContent, $filename)
     private function getBasePath(Application $application)
     {
         return sprintf(
-            '%s/%s',
-            $this->buildsApplicationDir,
+            '%s%s%s',
+            rtrim($this->buildsApplicationDir, DIRECTORY_SEPARATOR),
+            DIRECTORY_SEPARATOR,
             $application->getSlug()
         );
     }
diff --git a/src/ApplicationBundle/Service/FilesPurgerInterface.php b/src/ApplicationBundle/Service/FilesPurgerInterface.php
new file mode 100644
index 0000000..406efa4
--- /dev/null
+++ b/src/ApplicationBundle/Service/FilesPurgerInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace LinkValue\Appbuild\ApplicationBundle\Service;
+
+use Symfony\Component\Finder\Finder;
+
+interface FilesPurgerInterface
+{
+    /**
+     * Remove unused build files.
+     */
+    public function purge();
+
+    /**
+     * Get unused files.
+     *
+     * @return Finder|\SplFileInfo[]
+     */
+    public function getUnusedFiles();
+
+    /**
+     * @param string $finderDateFilter
+     *
+     * @return $this
+     */
+    public function setUnusedFilesFinderDateFilter($finderDateFilter);
+}
diff --git a/src/ApplicationBundle/Service/Serializer.php b/src/ApplicationBundle/Service/Serializer.php
index 342c1cc..33124f8 100644
--- a/src/ApplicationBundle/Service/Serializer.php
+++ b/src/ApplicationBundle/Service/Serializer.php
@@ -16,8 +16,6 @@ class Serializer
     private $buildLinkBuilder;
 
     /**
-     * construct.
-     *
      * @param BuildLinkBuilder $buildLinkBuilder
      */
     public function __construct(BuildLinkBuilder $buildLinkBuilder)
diff --git a/src/UserBundle/Resources/views/Security/list.html.twig b/src/UserBundle/Resources/views/Security/list.html.twig
index b1ab08c..25309a2 100644
--- a/src/UserBundle/Resources/views/Security/list.html.twig
+++ b/src/UserBundle/Resources/views/Security/list.html.twig
@@ -38,7 +38,7 @@
             <div class="table__cell table__cell-head table__cell-head-lastname show-for-medium">
                 <div class="table__cell-head__content">{{ 'user.list.thead.lastname'|trans }}</div>
             </div>
-            <div class="table__cell table__cell-head table__cell-head-action table__cell_shrink show-for-medium show-for-up-mobile">
+            <div class="table__cell table__cell-head table__cell-head-actions table__cell_shrink show-for-medium show-for-up-mobile">
                 <div class="table__cell-head__content"></div>
             </div>
         </div>
@@ -65,11 +65,11 @@
                     <p>{{ user.lastname }}</p>
                 </div>
             </div>
-            <div class="table__cell table__cell-body table__cell-action table__cell_shrink show-for-medium show-for-up-mobile">
+            <div class="table__cell table__cell-body table__cell-actions table__cell_shrink show-for-up-mobile">
                 <div class="table__cell__content">
                     <div class="icons-action">
                         <a href="{{ url('appbuild_admin_user_update', { id: user.id }) }}" class="icon icon-action icon-update"></a>
-                        <a href="{{ url('appbuild_admin_user_toggle_enable', { id: user.id }) }}" class="icon icon-action icon-archive show-for-medium show-for-up-mobile"></a>
+                        <a href="{{ url('appbuild_admin_user_toggle_enable', { id: user.id }) }}" class="icon icon-action icon-archive show-for-up-mobile"></a>
                     </div>
                 </div>
             </div>
diff --git a/web/app.php b/web/app.php
index 01f6f04..3f8ee3f 100644
--- a/web/app.php
+++ b/web/app.php
@@ -7,10 +7,7 @@
 include_once __DIR__.'/../var/bootstrap.php.cache';
 
 $kernel = new AppKernel('prod', false);
-//$kernel = new AppCache($kernel);
 
-// When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
-//Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();
diff --git a/web/uploads/.gitkeep b/web/uploads/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/webpack.config.js b/webpack.config.js
index 412ac78..b72fe76 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,3 +1,5 @@
+const __STATIC_ASSETS_BASE_PATH__ = 'assets';
+
 const path = require('path');
 const isDev = require('isdev');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -22,8 +24,8 @@ const config = {
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(__dirname, 'web/assets'),
-    publicPath: '/assets/',
+    path: path.resolve(__dirname, 'web/'+__STATIC_ASSETS_BASE_PATH__),
+    publicPath: '/'+__STATIC_ASSETS_BASE_PATH__+'/',
   },
   module: {
     rules: [
@@ -79,6 +81,9 @@ const config = {
       },
       {
         from: './src/AppBundle/Resources/public/favicons',
+        transform: function (content) {
+          return content.toString().replace(/__STATIC_ASSETS_BASE_PATH__/g, __STATIC_ASSETS_BASE_PATH__);
+        },
         to: 'favicons',
       },
       {