diff --git a/scripts/common.js b/scripts/common.js
index 30753a4..fdf780a 100644
--- a/scripts/common.js
+++ b/scripts/common.js
@@ -84,10 +84,11 @@ var Tools = {
 		}
 		
 		if(sClass=='danger' && sMsg=='') sMsg = 'Oops ! An unknown error occured';
+		if($.type(sMsg)=='string') sMsg = addPunctuation(sMsg);
 		
 		$('<div>', {'class':'alert shadow alert-dismissible fade show alert-'+sClass, role:'alert'})
 			.append($('<i>', {'class':'fa-inline fa-'+sClass}))
-			.append(addPunctuation(sMsg))
+			.append(sMsg)
 			.append($('<button>', {type:'button', 'class':'close', 'data-dismiss':'alert', 'aria-label':'Close'})
 				.append($('<span>', {'aria-hidden':'true'}).appendIcon('close'))
 			)
@@ -206,7 +207,7 @@ $.prototype.checkForm = function(sSelector)
 		
 		//Icon
 		var sFieldIcon = $This.prev().find('.input-group-text').find("[class^='fa-']").attr('class');
-		var $FieldIcon = (sFieldIcon==undefined)?'':Tools.getIcon(sFieldIcon, true).addClass('fa-fw bold');
+		var $FieldIcon = (sFieldIcon==undefined)?'':Tools.getIcon(sFieldIcon, true).addClass('fa-fw fa-inline mx-1 bold');
 		
 		if(sFieldValue=='' || sFieldValue==$This.data('default_value')) {
 			bOk = false;