diff --git a/lemonldap-ng-portal/MANIFEST b/lemonldap-ng-portal/MANIFEST
index c04514df9..0f51c26a7 100644
--- a/lemonldap-ng-portal/MANIFEST
+++ b/lemonldap-ng-portal/MANIFEST
@@ -161,9 +161,7 @@ site/htdocs/static/bwr/jquery.cookie/jquery.cookie.min.js
 site/htdocs/static/bwr/jquery/dist/jquery.js
 site/htdocs/static/bwr/jquery/dist/jquery.min.js
 site/htdocs/static/bwr/jquery/dist/jquery.min.map
-site/htdocs/static/common/accept.png
 site/htdocs/static/common/Apache.png
-site/htdocs/static/common/application_cascade.png
 site/htdocs/static/common/apps/attach.png
 site/htdocs/static/common/apps/bell.png
 site/htdocs/static/common/apps/bookmark.png
@@ -191,17 +189,20 @@ site/htdocs/static/common/backgrounds/1280px-Cedar_Breaks_National_Monument_part
 site/htdocs/static/common/backgrounds/1280px-Parry_Peak_from_Winter_Park.jpg
 site/htdocs/static/common/backgrounds/Aletschgletscher_mit_Pinus_cembra1.jpg
 site/htdocs/static/common/BrowserID.png
-site/htdocs/static/common/calendar.png
-site/htdocs/static/common/cancel.png
 site/htdocs/static/common/CAS.png
-site/htdocs/static/common/door_out.png
-site/htdocs/static/common/email.png
 site/htdocs/static/common/en.png
-site/htdocs/static/common/error.png
 site/htdocs/static/common/Facebook.png
 site/htdocs/static/common/favicon.ico
 site/htdocs/static/common/fr.png
 site/htdocs/static/common/Google.png
+site/htdocs/static/common/icons/application_cascade.png
+site/htdocs/static/common/icons/bullet_go.png
+site/htdocs/static/common/icons/calendar.png
+site/htdocs/static/common/icons/door_out.png
+site/htdocs/static/common/icons/key.png
+site/htdocs/static/common/icons/ok.png
+site/htdocs/static/common/icons/vcard_edit.png
+site/htdocs/static/common/icons/warning.png
 site/htdocs/static/common/js/browserid.js
 site/htdocs/static/common/js/browserid.min.js
 site/htdocs/static/common/js/browseridlogin.js
@@ -224,22 +225,12 @@ site/htdocs/static/common/js/u2fcheck.js
 site/htdocs/static/common/js/u2fcheck.min.js
 site/htdocs/static/common/js/u2fregistration.js
 site/htdocs/static/common/js/u2fregistration.min.js
-site/htdocs/static/common/key.png
-site/htdocs/static/common/lemonldap-ng_square.png
-site/htdocs/static/common/ok.png
-site/htdocs/static/common/openid-16x16.gif
 site/htdocs/static/common/OpenIDConnect.png
 site/htdocs/static/common/SAML.png
 site/htdocs/static/common/SSL.png
-site/htdocs/static/common/stop.png
 site/htdocs/static/common/Twitter.png
-site/htdocs/static/common/user_suit.png
-site/htdocs/static/common/vcard_edit.png
-site/htdocs/static/common/vcss-blue.gif
-site/htdocs/static/common/warning.png
 site/htdocs/static/common/warning_triangle.png
 site/htdocs/static/common/WebID.png
-site/htdocs/static/common/yubico-icon-small.gif
 site/htdocs/static/languages/en.json
 site/htdocs/static/languages/fr.json
 site/templates/bootstrap/checklogins.tpl
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/OpenIDConnect.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/OpenIDConnect.pm
index 5cca9ea74..2a75d89f3 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/OpenIDConnect.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/OpenIDConnect.pm
@@ -324,7 +324,7 @@ sub alreadyLoggedOut {
     my ( $self, $req ) = @_;
     $self->userLogger->info(
         'Front-channel logout request for an already logged out user');
-    my $img = $self->conf->{staticPrefix} . '/common/ok.png';
+    my $img = $self->conf->{staticPrefix} . '/common/icons/ok.png';
 
     # No need to protect this frame
     $req->frame(1);
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/SAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/SAML.pm
index 35c6e69cf..88bacddb3 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/SAML.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Issuer/SAML.pm
@@ -1875,12 +1875,12 @@ sub attributeServer {
 
 sub imgok {
     my ( $self, $req, ) = @_;
-    return $self->sendImage( $req, 'ok.png' );
+    return $self->sendImage( $req, 'icons/ok.png' );
 }
 
 sub imgnok {
     my ( $self, $req, ) = @_;
-    return $self->sendImage( $req, 'warning.png' );
+    return $self->sendImage( $req, 'icons/warning.png' );
 }
 
 sub sendImage {
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/accept.png b/lemonldap-ng-portal/site/htdocs/static/common/accept.png
deleted file mode 100644
index 89c8129a4..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/accept.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/cancel.png b/lemonldap-ng-portal/site/htdocs/static/common/cancel.png
deleted file mode 100644
index c149c2bc0..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/cancel.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/email.png b/lemonldap-ng-portal/site/htdocs/static/common/email.png
deleted file mode 100644
index 7348aed77..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/email.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/error.png b/lemonldap-ng-portal/site/htdocs/static/common/error.png
deleted file mode 100644
index 70c73c31f..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/error.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/fr.png b/lemonldap-ng-portal/site/htdocs/static/common/fr.png
old mode 100755
new mode 100644
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/application_cascade.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/application_cascade.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/application_cascade.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/application_cascade.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/icons/bullet_go.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/bullet_go.png
new file mode 100644
index 000000000..bc4faa709
Binary files /dev/null and b/lemonldap-ng-portal/site/htdocs/static/common/icons/bullet_go.png differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/calendar.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/calendar.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/calendar.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/calendar.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/door_out.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/door_out.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/door_out.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/door_out.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/key.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/key.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/key.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/key.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/ok.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/ok.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/ok.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/ok.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/vcard_edit.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/vcard_edit.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/vcard_edit.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/vcard_edit.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/warning.png b/lemonldap-ng-portal/site/htdocs/static/common/icons/warning.png
similarity index 100%
rename from lemonldap-ng-portal/site/htdocs/static/common/warning.png
rename to lemonldap-ng-portal/site/htdocs/static/common/icons/warning.png
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/lemonldap-ng_square.png b/lemonldap-ng-portal/site/htdocs/static/common/lemonldap-ng_square.png
deleted file mode 100644
index 359f11696..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/lemonldap-ng_square.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/openid-16x16.gif b/lemonldap-ng-portal/site/htdocs/static/common/openid-16x16.gif
deleted file mode 100644
index e2d8377db..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/openid-16x16.gif and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/stop.png b/lemonldap-ng-portal/site/htdocs/static/common/stop.png
deleted file mode 100644
index 1f760b882..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/stop.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/user_suit.png b/lemonldap-ng-portal/site/htdocs/static/common/user_suit.png
deleted file mode 100644
index b3454e15f..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/user_suit.png and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/vcss-blue.gif b/lemonldap-ng-portal/site/htdocs/static/common/vcss-blue.gif
deleted file mode 100644
index a145d81a6..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/vcss-blue.gif and /dev/null differ
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/yubico-icon-small.gif b/lemonldap-ng-portal/site/htdocs/static/common/yubico-icon-small.gif
deleted file mode 100644
index 09302c79b..000000000
Binary files a/lemonldap-ng-portal/site/htdocs/static/common/yubico-icon-small.gif and /dev/null differ
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
index d48063691..cf491cdb1 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
@@ -35,25 +35,25 @@
 
           <TMPL_IF NAME="Appslist">
             <li><a href="#appslist"><span>
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/application_cascade.png" width="16" height="16" alt="appslist" />
+              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/application_cascade.png" width="16" height="16" alt="appslist" />
               <span trspan="yourApps">Your applications</span>
             </span></a></li>
           </TMPL_IF>
           <TMPL_IF NAME="ChangePassword">
             <li><a href="#password"><span>
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/vcard_edit.png" width="16" height="16" alt="password" />
+              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/vcard_edit.png" width="16" height="16" alt="password" />
               <span trspan="password">Password</span>
             </span></a></li>
           </TMPL_IF>
           <TMPL_IF NAME="LoginHistory">
             <li><a href="#loginHistory"><span>
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/calendar.png" width="16" height="16" alt="login history" />
+              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/calendar.png" width="16" height="16" alt="login history" />
               <span trspan="loginHistory">Login history</span>
             </span></a></li>
           </TMPL_IF>
           <TMPL_IF NAME="Logout">
             <li><a href="#logout"><span>
-              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/door_out.png" width="16" height="16" alt="logout" />
+              <img src="<TMPL_VAR NAME="STATIC_PREFIX">common/icons/door_out.png" width="16" height="16" alt="logout" />
               <span trspan="logout">Logout</span>
             </span></a></li>
           </TMPL_IF>
diff --git a/lemonldap-ng-portal/site/templates/common/mail_password.tpl b/lemonldap-ng-portal/site/templates/common/mail_password.tpl
index 2526c3522..6bdd6aac1 100644
--- a/lemonldap-ng-portal/site/templates/common/mail_password.tpl
+++ b/lemonldap-ng-portal/site/templates/common/mail_password.tpl
@@ -5,7 +5,7 @@
 <br />
 <TMPL_IF NAME="RESET">
 <span trspan="newPwdIs">Your new password is</span> 
-<span><img src="cid:key:skins/common/key.png" /></span>
+<span><img src="cid:key:../common/icons/key.png" /></span>
 <b>$password</b>
 <TMPL_ELSE>
 <span trspan="pwdChanged">Your password was changed.</span> 
diff --git a/lemonldap-ng-portal/site/templates/common/mail_register_done.tpl b/lemonldap-ng-portal/site/templates/common/mail_register_done.tpl
index d8c642c12..97b7b334a 100644
--- a/lemonldap-ng-portal/site/templates/common/mail_register_done.tpl
+++ b/lemonldap-ng-portal/site/templates/common/mail_register_done.tpl
@@ -7,11 +7,11 @@
 <br /> 
 <br /> 
 <span trspan="yourLoginIs">Your login is</span> 
-<span><img src="cid:key:../common/bullet_go.png" /></span>
+<span><img src="cid:key:../common/icons/bullet_go.png" /></span>
 <b>$login</b>
 <br /> 
 <span trspan="pwdIs">Your password is</span> 
-<span><img src="cid:key:../common/key.png" /></span>
+<span><img src="cid:key:../common/icons/key.png" /></span>
 <b>$password</b>
 </p>