diff --git a/frontend/app/views/directives/tlp.html b/frontend/app/views/directives/tlp.html
index 2b4b76e5ab..a72abb610d 100644
--- a/frontend/app/views/directives/tlp.html
+++ b/frontend/app/views/directives/tlp.html
@@ -1,23 +1,18 @@
-<span ng-switch="format">
-	<div ng-switch-when="active">
-		<!-- strong>TLP:</strong -->
-		<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 0]" ng-click="update(0)">WHITE</span>
-		<span class="label" ng-class="{ true:'label-success', false:'label-default' }[value == 1]" ng-click="update(1)">GREEN</span>
-		<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 2]" ng-click="update(2)">AMBER</span>
-		<span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(3)">RED</span>
-	</div>
-
-	<span ng-switch-when="static" ng-switch="value">
-		<span ng-switch-when="0" class="label label-info">{{namespace || 'TLP'}}:WHITE</span>
-		<span ng-switch-when="1" class="label label-success">{{namespace || 'TLP'}}:GREEN</span>
-		<span ng-switch-when="2" class="label label-warning">{{namespace || 'TLP'}}:AMBER</span>
-		<span ng-switch-when="3" class="label label-danger">{{namespace || 'TLP'}}:RED</span>
-	</span>
-
-	<span ng-switch-default ng-switch="value">
-		<span ng-switch-when="0" class="text-tlp-default fa fa-circle-o hpad10" uib-tooltip="{{namespace || 'TLP'}}:WHITE"></span>
-		<span ng-switch-when="1" class="text-tlp-green fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:GREEN"></span>
-		<span ng-switch-when="2" class="text-tlp-amber fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:AMBER"></span>
-		<span ng-switch-when="3"  class="text-tlp-red fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:RED"></span>
-	</span>
+<div ng-if="format === 'active'">
+	<span class="label" ng-class="{ true:'label-info', false:'label-default' }[value == 0]" ng-click="update(0)">WHITE</span>
+	<span class="label" ng-class="{ true:'label-success', false:'label-default' }[value == 1]" ng-click="update(1)">GREEN</span>
+	<span class="label" ng-class="{ true:'label-warning', false:'label-default' }[value == 2]" ng-click="update(2)">AMBER</span>
+	<span class="label" ng-class="{ true:'label-danger', false:'label-default' }[value == 3]" ng-click="update(3)">RED</span>
+</div>
+<span ng-if="format === 'static'" ng-switch="value">
+	<span ng-switch-when="0" class="label label-info">{{namespace || 'TLP'}}:WHITE</span>
+	<span ng-switch-when="1" class="label label-success">{{namespace || 'TLP'}}:GREEN</span>
+	<span ng-switch-when="2" class="label label-warning">{{namespace || 'TLP'}}:AMBER</span>
+	<span ng-switch-when="3" class="label label-danger">{{namespace || 'TLP'}}:RED</span>
+</span>
+<span ng-if="format !== 'active' && format !== 'static'">
+	<span ng-switch-when="0" class="text-tlp-default fa fa-circle-o hpad10" uib-tooltip="{{namespace || 'TLP'}}:WHITE"></span>
+	<span ng-switch-when="1" class="text-tlp-green fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:GREEN"></span>
+	<span ng-switch-when="2" class="text-tlp-amber fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:AMBER"></span>
+	<span ng-switch-when="3"  class="text-tlp-red fa fa-circle hpad10" uib-tooltip="{{namespace || 'TLP'}}:RED"></span>
 </span>
diff --git a/frontend/app/views/partials/case/case.details.html b/frontend/app/views/partials/case/case.details.html
index 8a9b2cc1ca..79ead25542 100644
--- a/frontend/app/views/partials/case/case.details.html
+++ b/frontend/app/views/partials/case/case.details.html
@@ -16,7 +16,7 @@ <h4 class="vpad10 text-primary">Summary</h4>
             <dt class="pull-left">Severity</dt>
             <dd ng-if="canEdit">
                 <a class="noline" href ng-click="activeSev = true" ng-init="activeSev = false">
-                    <severity active="activeSev" on-update="updateField('severity', newValue)" style="float:left; font-size:16px" value="caze.severity"></severity>
+                    <severity active="activeSev" on-update="updateField('severity', newValue)" value="caze.severity"></severity>
                 </a>
             </dd>
             <dd ng-if="!canEdit">
diff --git a/frontend/app/views/partials/observables/details/summary.html b/frontend/app/views/partials/observables/details/summary.html
index 741319e11a..360ea6f016 100644
--- a/frontend/app/views/partials/observables/details/summary.html
+++ b/frontend/app/views/partials/observables/details/summary.html
@@ -25,7 +25,7 @@ <h4 class="vpad10 text-primary">
             <dt class="pull-left">TLP</dt>
             <dd ng-if="canEdit">
                 <a class="noline" href ng-init="activeTlp = 'static'" ng-click="activeTlp = 'active'">
-                    <tlp value="artifact.tlp" format="activeTlp" style="font-size:16px" on-update="updateField('tlp', newValue)"></tlp>
+                    <tlp value="artifact.tlp" format="activeTlp" on-update="updateField('tlp', newValue)"></tlp>
                 </a>
             </dd>
             <dd ng-if="!canEdit">