diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
index 4bc21faa..9280d73f 100644
--- a/_includes/themes/twitter/default.html
+++ b/_includes/themes/twitter/default.html
@@ -19,12 +19,11 @@
     <link href="{{ ASSET_PATH }}/css/style.css?body=1" rel="stylesheet" type="text/css" media="all">
 
     <!-- Le fav and touch icons -->
-  <!-- Update these with your own images
-    <link rel="shortcut icon" href="images/favicon.ico">
+  <!-- Update these with your own images -->
+    <link rel="shortcut icon" href="assets/images/favicon.ico">
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
     <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-  -->
 
     <!-- atom & rss feed -->
     <link href="{{ BASE_PATH }}{{ site.JB.atom_path }}" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
diff --git a/assets/images/apple-touch-icon-114x114.png b/assets/images/apple-touch-icon-114x114.png
new file mode 100644
index 00000000..49576bdb
Binary files /dev/null and b/assets/images/apple-touch-icon-114x114.png differ
diff --git a/assets/images/apple-touch-icon-72x72.png b/assets/images/apple-touch-icon-72x72.png
new file mode 100644
index 00000000..606a41d3
Binary files /dev/null and b/assets/images/apple-touch-icon-72x72.png differ
diff --git a/assets/images/apple-touch-icon.png b/assets/images/apple-touch-icon.png
new file mode 100644
index 00000000..2faf6b3e
Binary files /dev/null and b/assets/images/apple-touch-icon.png differ
diff --git a/assets/images/favicon.ico b/assets/images/favicon.ico
new file mode 100644
index 00000000..021b9e6f
Binary files /dev/null and b/assets/images/favicon.ico differ
diff --git a/index.md b/index.md
index f34dc66a..9161ca3d 100644
--- a/index.md
+++ b/index.md
@@ -7,12 +7,15 @@ tagline: An open-source JPEG 2000 codec written in C
 
 ## What is OpenJPEG ?
 
-OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of [JPEG 2000](http://www.jpeg.org/jpeg2000), a still-image compression standard from the Joint Photographic Experts Group ([JPEG](http://www.jpeg.org)).  In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ...
+OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of [JPEG 2000](http://www.jpeg.org/jpeg2000), a still-image compression standard from the Joint Photographic Experts Group ([JPEG](http://www.jpeg.org)).  Since october 2014, it is officially recognized by ISO/IEC and ITU-T as a [JPEG 2000 Reference Software](http://www.itu.int/rec/T-REC-T.804-201504-I!Amd2).
 
 ## Who can use the code ?
 
-Anyone. As the OpenJPEG code is released under the 2-clauses BSD license, anyone can use or modify the code, even for commercial applications. The only restriction is to retain the copyright in the sources or in the binaries documentation. Of course, if you modified the code in a way that might be of interest for other users, you are encouraged to share it (through a github pull request or by filling an issue) but this is not a requirement.
+Anyone. As the OpenJPEG code is released under the [2-clauses BSD license](https://github.com/uclouvain/openjpeg/blob/master/LICENSE), anyone can use or modify the code, even for commercial applications. The only restriction is to retain the copyright in the sources or in the binaries documentation. Of course, if you modified the code in a way that might be of interest for other users, you are encouraged to share it (through a [github pull request](https://github.com/uclouvain/openjpeg/pulls) or by filling an [issue](https://github.com/uclouvain/openjpeg/issues)) but this is not a requirement.
+
+## How to install and use OpenJPEG ?
+API Documentation needs a major refactoring. Meanwhile, you can check [installation](https://github.com/uclouvain/openjpeg/wiki/Installation) instructions and [codec documentation](https://github.com/uclouvain/openjpeg/wiki/DocJ2KCodec).
     
 ## Who are the developers ?
 
-The library is developed and maintained by the Communications and Remote Sensing Lab (TELE), in the Université catholique de Louvain (UCL), with the support of the CNES, the CS company and the intoPIX company. The JPWL module is developed and maintained by the Digital Signal Processing Lab (DSPLab) of the University of Perugia, Italy (UNIPG).
+The library is developed and maintained by the Image and Signal Processing Group ([ISPGroup](http://sites.uclouvain.be/ispgroup/)), in the Université catholique de Louvain ([UCL](http://www.uclouvain.be/en-index.html), with the support of the [CNES](https://cnes.fr/), the [CS](http://www.c-s.fr/) company and the [intoPIX](http://www.intopix.com) company. The JPWL module has been developed by the Digital Signal Processing Lab ([DSPLab](http://dsplab.diei.unipg.it/)) of the University of Perugia, Italy ([UNIPG](http://www.unipg.it/)).
\ No newline at end of file