diff --git a/app/Resources/public/assets/flag-icon-css/flags/1x1/ae.svg b/app/Resources/public/assets/flag-icon-css/flags/1x1/ae.svg
index 9ac2866c5b..ae8f07031d 100644
--- a/app/Resources/public/assets/flag-icon-css/flags/1x1/ae.svg
+++ b/app/Resources/public/assets/flag-icon-css/flags/1x1/ae.svg
@@ -1,6 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="512" width="512" viewBox="0 0 512 512">
-  <path fill="#00732f" d="M0 0h512v170.667H0z"/>
-  <path fill="#fff" d="M0 170.667h512v170.667H0z"/>
-  <path d="M0 341.333h512V512H0z"/>
-  <path fill="red" d="M0 0h180v512H0z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="512"
+   width="512"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="ae.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="0.47084045"
+     inkscape:cx="513.69581"
+     inkscape:cy="133.16261"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <g
+     id="g847"
+     transform="translate(-675.73773,15.213599)">
+    <rect
+       id="rect875"
+       height="512"
+       width="512"
+       x="675.73773"
+       y="-15.213599"
+       style="fill:#007a3d;stroke-width:0.69674379" />
+    <g
+       id="g879"
+       transform="matrix(0.71111111,0,0,0.71111111,610.44191,25.60718)"
+       style="fill:#ffffff">
+      <path
+         id="path877"
+         d="m 655.28906,294.24617 c -5.27387,5.66414 -12.4516,11.27937 -21.5332,16.8457 -9.08245,5.56647 -20.36173,10.64459 -33.83789,15.23438 -13.47694,4.58989 -29.15075,8.44731 -47.02149,11.57226 -17.87141,3.12504 -38.23272,5.07817 -61.08398,5.85938 -2.14872,6.05472 -4.34598,12.54885 -6.5918,19.48242 -2.24636,6.93361 -4.44363,14.50196 -6.59179,22.70508 h -1.46485 c -0.97683,-0.97657 -1.8069,-2.19727 -2.49023,-3.66211 -0.68386,-1.46484 -1.31862,-3.56445 -1.9043,-6.29883 0.9763,-5.46874 2.05052,-10.83983 3.22266,-16.11328 1.17161,-5.27341 2.44114,-10.6445 3.80859,-16.11328 -9.96119,4e-5 -19.33619,-1.26949 -28.125,-3.80859 -0.58618,37.89062 -9.6682,72.65621 -27.24609,104.29687 -19.14082,34.57022 -59.08219,51.85535 -119.82422,51.85547 -24.41413,-1.2e-4 -44.33599,-7.12901 -59.76563,-21.38672 -15.62501,-14.4532 -23.43751,-32.51959 -23.4375,-54.19922 -1e-5,-22.85158 10.74217,-50.87889 32.22657,-84.08203 l 5.5664,2.05078 c -14.45316,26.75783 -21.67971,48.33984 -21.67969,64.7461 -2e-5,8.59372 2.09959,16.25972 6.29883,22.99804 4.19919,6.73823 10.15621,12.49995 17.8711,17.28516 7.71478,4.78509 17.18743,8.44719 28.41797,10.98633 11.23037,2.53898 23.87685,3.80851 37.93945,3.80859 21.48424,-8e-5 41.40609,-3.71101 59.76562,-11.13281 18.35918,-7.22662 30.85917,-16.50396 37.5,-27.83203 6.05447,-10.93753 9.08181,-27.0508 9.08203,-48.33985 -2.2e-4,-11.52341 -1.80686,-22.99801 -5.41992,-34.42383 -3.61349,-11.42572 -8.54513,-21.53313 -14.79492,-30.32226 l 16.11328,-34.57031 c 3.32009,4.6876 6.44509,9.81455 9.375,15.38086 2.92946,5.56649 5.17555,10.30281 6.73828,14.20898 5.66383,2.53914 11.32788,4.29695 16.99219,5.27344 5.66381,0.97663 11.62083,1.46492 17.87109,1.46484 2.14817,8e-5 4.39426,8e-5 6.73829,0 2.34347,8e-5 4.78487,-0.19524 7.32421,-0.58594 10.7419,-17.77334 22.31415,-33.98426 34.7168,-48.63281 12.40201,-14.6483 25.34145,-27.44125 38.81836,-38.3789 11.52307,-9.37483 22.65587,-16.69905 33.39844,-21.97266 10.74178,-5.27325 19.53084,-7.90997 26.36719,-7.91016 7.03082,1.9e-4 13.7691,1.31855 20.21484,3.95508 6.44487,2.6369 12.15775,5.85956 17.13867,9.66797 4.98001,3.80877 8.93508,7.81267 11.86524,12.01172 2.92921,4.19938 4.39406,7.95914 4.39453,11.2793 -4.7e-4,8.00795 -0.78172,15.33217 -2.34375,21.97265 -1.56297,6.64075 -3.61375,12.64661 -6.15235,18.01758 -2.53952,5.3712 -5.42038,10.25401 -8.64257,14.64844 -3.22311,4.39462 -6.49459,8.44735 -9.81446,12.1582 z m -37.20703,-64.74609 c -5.46915,1.5e-4 -12.35391,1.75796 -20.6543,5.27343 -8.30115,3.51577 -17.28552,8.54506 -26.95312,15.08789 -9.66832,6.5431 -19.58042,14.64856 -29.73633,24.31641 -10.15657,9.66807 -19.82453,20.65438 -29.00391,32.95899 3.32001,7e-5 6.49384,-0.0976 9.52149,-0.29297 3.02703,-0.19524 6.59148,-0.48821 10.69336,-0.87891 14.06216,-0.97649 27.88051,-3.07609 41.45508,-6.29883 13.57384,-3.22257 28.17343,-7.86124 43.79882,-13.91601 12.30427,-4.6874 22.2652,-9.61904 29.88282,-14.79493 7.61674,-5.17566 12.49955,-9.52136 14.64843,-13.0371 -2.34419,-3.32019 -5.17622,-6.68933 -8.49609,-10.10743 -3.32075,-3.41783 -6.93403,-6.494 -10.83984,-9.22851 -3.90668,-2.73423 -7.95941,-4.93149 -12.15821,-6.5918 -4.19963,-1.66 -8.25236,-2.49008 -12.1582,-2.49023 z m -52.44141,-97.5586 -20.80078,30.76172 -27.83203,-23.4375 20.50781,-30.17578 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
 </svg>
diff --git a/app/Resources/public/assets/flag-icon-css/flags/4x3/ae.svg b/app/Resources/public/assets/flag-icon-css/flags/4x3/ae.svg
index ef6473002d..8bedb6771d 100644
--- a/app/Resources/public/assets/flag-icon-css/flags/4x3/ae.svg
+++ b/app/Resources/public/assets/flag-icon-css/flags/4x3/ae.svg
@@ -1,6 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" viewBox="0 0 640 480">
-  <path fill="#00732f" d="M0 0h640v160H0z"/>
-  <path fill="#fff" d="M0 160h640v160H0z"/>
-  <path d="M0 320h640v160H0z"/>
-  <path fill="red" d="M0 0h220v480H0z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="480"
+   width="640"
+   viewBox="0 0 640 480"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="ae.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="0.25111491"
+     inkscape:cx="260.5915"
+     inkscape:cy="165.70116"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <g
+     id="g900"
+     transform="translate(2.5683,-564.53552)">
+    <rect
+       id="rect875"
+       height="480"
+       width="640"
+       x="-2.5683"
+       y="564.53552"
+       style="fill:#007a3d;stroke-width:0.75424725" />
+    <g
+       id="g879"
+       transform="matrix(0.71111111,0,0,0.71111111,-3.8641324,589.35632)"
+       style="fill:#ffffff">
+      <path
+         id="path877"
+         d="m 655.28906,294.24617 c -5.27387,5.66414 -12.4516,11.27937 -21.5332,16.8457 -9.08245,5.56647 -20.36173,10.64459 -33.83789,15.23438 -13.47694,4.58989 -29.15075,8.44731 -47.02149,11.57226 -17.87141,3.12504 -38.23272,5.07817 -61.08398,5.85938 -2.14872,6.05472 -4.34598,12.54885 -6.5918,19.48242 -2.24636,6.93361 -4.44363,14.50196 -6.59179,22.70508 h -1.46485 c -0.97683,-0.97657 -1.8069,-2.19727 -2.49023,-3.66211 -0.68386,-1.46484 -1.31862,-3.56445 -1.9043,-6.29883 0.9763,-5.46874 2.05052,-10.83983 3.22266,-16.11328 1.17161,-5.27341 2.44114,-10.6445 3.80859,-16.11328 -9.96119,4e-5 -19.33619,-1.26949 -28.125,-3.80859 -0.58618,37.89062 -9.6682,72.65621 -27.24609,104.29687 -19.14082,34.57022 -59.08219,51.85535 -119.82422,51.85547 -24.41413,-1.2e-4 -44.33599,-7.12901 -59.76563,-21.38672 -15.62501,-14.4532 -23.43751,-32.51959 -23.4375,-54.19922 -1e-5,-22.85158 10.74217,-50.87889 32.22657,-84.08203 l 5.5664,2.05078 c -14.45316,26.75783 -21.67971,48.33984 -21.67969,64.7461 -2e-5,8.59372 2.09959,16.25972 6.29883,22.99804 4.19919,6.73823 10.15621,12.49995 17.8711,17.28516 7.71478,4.78509 17.18743,8.44719 28.41797,10.98633 11.23037,2.53898 23.87685,3.80851 37.93945,3.80859 21.48424,-8e-5 41.40609,-3.71101 59.76562,-11.13281 18.35918,-7.22662 30.85917,-16.50396 37.5,-27.83203 6.05447,-10.93753 9.08181,-27.0508 9.08203,-48.33985 -2.2e-4,-11.52341 -1.80686,-22.99801 -5.41992,-34.42383 -3.61349,-11.42572 -8.54513,-21.53313 -14.79492,-30.32226 l 16.11328,-34.57031 c 3.32009,4.6876 6.44509,9.81455 9.375,15.38086 2.92946,5.56649 5.17555,10.30281 6.73828,14.20898 5.66383,2.53914 11.32788,4.29695 16.99219,5.27344 5.66381,0.97663 11.62083,1.46492 17.87109,1.46484 2.14817,8e-5 4.39426,8e-5 6.73829,0 2.34347,8e-5 4.78487,-0.19524 7.32421,-0.58594 10.7419,-17.77334 22.31415,-33.98426 34.7168,-48.63281 12.40201,-14.6483 25.34145,-27.44125 38.81836,-38.3789 11.52307,-9.37483 22.65587,-16.69905 33.39844,-21.97266 10.74178,-5.27325 19.53084,-7.90997 26.36719,-7.91016 7.03082,1.9e-4 13.7691,1.31855 20.21484,3.95508 6.44487,2.6369 12.15775,5.85956 17.13867,9.66797 4.98001,3.80877 8.93508,7.81267 11.86524,12.01172 2.92921,4.19938 4.39406,7.95914 4.39453,11.2793 -4.7e-4,8.00795 -0.78172,15.33217 -2.34375,21.97265 -1.56297,6.64075 -3.61375,12.64661 -6.15235,18.01758 -2.53952,5.3712 -5.42038,10.25401 -8.64257,14.64844 -3.22311,4.39462 -6.49459,8.44735 -9.81446,12.1582 z m -37.20703,-64.74609 c -5.46915,1.5e-4 -12.35391,1.75796 -20.6543,5.27343 -8.30115,3.51577 -17.28552,8.54506 -26.95312,15.08789 -9.66832,6.5431 -19.58042,14.64856 -29.73633,24.31641 -10.15657,9.66807 -19.82453,20.65438 -29.00391,32.95899 3.32001,7e-5 6.49384,-0.0976 9.52149,-0.29297 3.02703,-0.19524 6.59148,-0.48821 10.69336,-0.87891 14.06216,-0.97649 27.88051,-3.07609 41.45508,-6.29883 13.57384,-3.22257 28.17343,-7.86124 43.79882,-13.91601 12.30427,-4.6874 22.2652,-9.61904 29.88282,-14.79493 7.61674,-5.17566 12.49955,-9.52136 14.64843,-13.0371 -2.34419,-3.32019 -5.17622,-6.68933 -8.49609,-10.10743 -3.32075,-3.41783 -6.93403,-6.494 -10.83984,-9.22851 -3.90668,-2.73423 -7.95941,-4.93149 -12.15821,-6.5918 -4.19963,-1.66 -8.25236,-2.49008 -12.1582,-2.49023 z m -52.44141,-97.5586 -20.80078,30.76172 -27.83203,-23.4375 20.50781,-30.17578 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
 </svg>
diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 1f6e7c4277..183b3c17f3 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -5482,19 +5482,37 @@ div#chat-remote-video video {
     display: none;
 }
 
-.forum-post {
-    border-color: #dddddd !important;
-}
-
 .forum-post .thumbnail {
     margin-bottom: 5px;
+    text-align: center;
+    border: none;
+}
+.forum-post .thumbnail img{
+    border-radius: 50%;
+    border: 2px solid #dddddd;
+    width: 85px;
 }
 
 .forum-post .title-username {
     text-align: center;
-    font-size: 16px;
+    font-size: 14px;
     margin-bottom: 5px;
     margin-top: 0;
+    font-weight: bold;
+    padding-top: 5px;
+}
+.forum-post .user-type.text-center {
+    border-radius: 50%;
+    position: absolute;
+    top: 25%;
+    right: 17%;
+    border: 2px solid #dddddd;
+    padding: 5px;
+    background-color: #fff;
+}
+
+.forum-post {
+    border-color: #dddddd !important;
 }
 
 .forum-post .post-date {
@@ -8432,6 +8450,13 @@ ul#toolnavbox-two li a.btn {
     border-color: #dd853d;
     color: #ffffff;
 }
+.checkbox input[type=checkbox],
+.checkbox-inline input[type=checkbox],
+.radio input[type=radio],
+.radio-inline input[type=radio]{
+    position: relative;
+    margin-left: 10px;
+}
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
     .sidebar-scorm {
diff --git a/main/exercise/admin.php b/main/exercise/admin.php
index d7fa5f167c..6e1586c539 100755
--- a/main/exercise/admin.php
+++ b/main/exercise/admin.php
@@ -384,7 +384,7 @@ if ($inATest) {
     if ($objExercise->random > 0) {
         $alert .= '<br />'.sprintf(get_lang('OnlyXQuestionsPickedRandomly'), $objExercise->random);
     }
-    echo Display::return_message($alert);
+    echo Display::return_message($alert, 'normal', false);
 } elseif (isset($_GET['newQuestion'])) {
     // we are in create a new question from question pool not in a test
     echo '<div class="actions">';
diff --git a/main/forum/viewthread.php b/main/forum/viewthread.php
index 46ed169113..cfce35d3b0 100755
--- a/main/forum/viewthread.php
+++ b/main/forum/viewthread.php
@@ -347,7 +347,7 @@ foreach ($posts as $post) {
             }
         }
 
-        $post['user_data'] .= '<div class="text-center">'.$iconStatus.'</div>';
+        $post['user_data'] .= '<div class="user-type text-center">'.$iconStatus.'</div>';
     } else {
         if ($allowUserImageForum) {
             $post['user_data'] .= '<div class="thumbnail">'.