diff --git a/frontend/static/views/theme.html b/frontend/static/views/theme.html
index b907dc6a..ace895b2 100644
--- a/frontend/static/views/theme.html
+++ b/frontend/static/views/theme.html
@@ -1,5 +1,5 @@
 	  <ul class="nav nav-tabs nav-justified">
-	    <li ng-repeat="(k,exercice) in themes[current_theme].exercices" ng-class="{active: k == current_exercice, disabled: !my.exercices[k]}"><a ng-show="(!my.exercices[k])">{{ exercice.title }}</a><a href="/{{ current_theme }}/{{ k }}" ng-show="(my.exercices[k])">{{ exercice.title }} <span ng-show="(my.team_id && my.exercices[k].solved)" class="badge">{{ exercice.gain }}</span></a></li>
+	    <li ng-repeat="(k,exercice) in themes[current_theme].exercices" ng-class="{active: k == current_exercice, disabled: !my.exercices[k]}"><a ng-show="(!my.exercices[k])">{{ exercice.title }}</a><a href="/{{ current_theme }}/{{ k }}" ng-show="(my.exercices[k])">{{ exercice.title }} <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-show="(my.team_id && my.exercices[k].solved)"></span></a></li>
 	  </ul>
 
 	  <div class="alert alert-warning" style="margin-top:15px;" ng-show="!(my.exercices[current_exercice])">
@@ -15,9 +15,9 @@
 	    </ul>
 	  </div>
 
-	  <div class="panel panel-info" ng-show="(my.exercices[current_exercice] && my.exercices[current_exercice].files.length)">
+	  <div class="panel panel-default" ng-show="(my.exercices[current_exercice] && my.exercices[current_exercice].files.length)">
 	    <div class="panel-heading">
-	      <div class="panel-title">Téléchargements</div>
+	      <div class="panel-title"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Téléchargements</div>
 	    </div>
 	    <table class="table table-striped table-hover">
 	      <thead>
@@ -41,7 +41,7 @@
 
 	  <div class="panel panel-danger" ng-show="my.team_id && my.exercices[current_exercice] && !(my.exercices[current_exercice].solved)">
 	    <div class="panel-heading">
-	      <div class="panel-title">Soumettre une solution</div>
+	      <div class="panel-title"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> Soumettre une solution</div>
 	    </div>
 	    <ul class="list-group" ng-show="(my.exercices[current_exercice].solved_number || my.exercices[current_exercice].submitted || sberr)">
 	      <li class="list-group-item text-warning" ng-show="my.exercices[current_exercice].solved_number">{{ my.exercices[current_exercice].solved_number }} tentative(s) effectuée(s). Dernière solution envoyée à {{ my.exercices[current_exercice].solved_time | date:"fullDate" }}.</li>
@@ -54,7 +54,7 @@
 		  <input type="text" class="form-control" id="sol_{{ key.id }}" name="sol_{{ index }}" ng-model="key.value">
 		</div>
 		<div class="form-group text-right">
-		  <button type="submit" class="btn btn-warning" id="sbmt">Soumettre</button>
+		  <button type="submit" class="btn btn-danger" id="sbmt">Soumettre</button>
 		</div>
 	      </form>
 	    </div>
@@ -62,7 +62,7 @@
 
 	  <div class="panel panel-success" ng-show="(my.team_id && my.exercices[current_exercice].solved)">
 	    <div class="panel-heading">
-	      <div class="panel-title">Challenge réussi !</div>
+	      <div class="panel-title"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> Challenge réussi !</div>
 	    </div>
 	    <div class="panel-body">
 	      Vous êtes la {{ my.exercices[current_exercice].solved_number }}<sup>e</sup> équipe à avoir résolu ce challenge à {{ my.exercices[current_exercice].solved_time | date:"fullDate" }}. Vous avez marqué {{ themes[current_theme].exercices[current_exercice].gain }} points !
@@ -71,15 +71,15 @@
 
 	  <div class="panel panel-success" ng-show="(!my.team_id && my.exercices[current_exercice].keys)">
 	    <div class="panel-heading">
-	      <div class="panel-title">Solution du challenge</div>
+	      <div class="panel-title"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> Solution du challenge</div>
 	    </div>
 	    <div class="panel-body">
 	      <p>
 		Vérifiez les clefs que vous trouvez en comparant leur SHA-512 :
 	      </p>
 	      <dl class="dl-horizontal" ng-repeat="key in my.exercices[current_exercice].keys">
-		<dt>{{ key.slice(128) }}</dt>
-		<dd class="samp"><code>{{ key.slice(0, 128) }}</code></dd>
+		<dt title="{{ key.slice(128) }}">{{ key.slice(128) }}</dt>
+		<dd class="samp"><samp>{{ key.slice(0, 128) }}</samp></dd>
 	      </dl>
 	      <iframe type="text/html" ng-show="my.exercices[current_exercice].video_uri" ng-src="{{ my.exercices[current_exercice].video_uri }}" frameborder="0" style="width: 100%; height: 35vw">
 		Regardez la vidéo de résolution de cet exercice : <a ng-href="{{ my.exercices[current_exercice].video_uri }}">{{ my.exercices[current_exercice].video_uri }}</a>.