diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig
index 350a8dba53..bc9852a047 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_create.html.twig
@@ -30,8 +30,8 @@
 			{% endif %}
 			<div class="form_btn_regular">
 				{% if form.editable_fields_count is defined and form.editable_fields_count > 0 %}
-					<input class="btn btn-default form_btn_cancel" type="button" value="{{ 'Portal:Button:Cancel'|dict_s }}" data-dismiss="modal">
-					<input class="btn btn-primary form_btn_submit" type="submit" value="{{ 'Portal:Button:Submit'|dict_s }}">
+					<button class="btn btn-default form_btn_cancel" type="button" value="cancel" title="{{ 'Portal:Button:Cancel'|dict_s }}" data-dismiss="modal">{{ 'Portal:Button:Cancel'|dict_s }}</button>
+					<button class="btn btn-primary form_btn_submit" type="submit" value="submit" title="{{ 'Portal:Button:Submit'|dict_s }}">{{ 'Portal:Button:Submit'|dict_s }}</button>
 				{% else %}
 					{% if tIsModal %}
 						<input class="btn btn-default form_btn_cancel" type="button" value="{{ 'Portal:Button:Close'|dict_s }}" data-dismiss="modal">
@@ -66,6 +66,8 @@
 		var oStickyRegularButtons_{{ sFormIdSanitized }} = oNormalRegularButtons_{{ sFormIdSanitized }}.clone(true, true);
 		oStickyRegularButtons_{{ sFormIdSanitized }}.addClass('sticky');
 		{% if tIsModal == true %}
+			oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_submit').html('<span class="glyphicon glyphicon-ok"></span>');
+			oStickyRegularButtons_{{ sFormIdSanitized }}.find('.form_btn_cancel').html('<span class="glyphicon glyphicon-remove"></span>');
 			$('#{{ sFormId }}').closest('.modal').append(oStickyRegularButtons_{{ sFormIdSanitized }});
 		{% else %}
 			$('#{{ sFormId }}').closest('#main-content').append(oStickyRegularButtons_{{ sFormIdSanitized }});
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
index a9337da095..ae6f086e0d 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css
@@ -72,6 +72,9 @@ footer{
 	width: 100%;
 	text-align: center;
 }
+#sidebar .logo img{
+	max-width: 100%;
+}
 
 /* Overlays*/
 .global_overlay{
@@ -746,35 +749,31 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 	.form_btn_regular.sticky{
 		display: block;
 		position: fixed;
-		bottom: 0px;
 		padding: 15px;
 		background-color: #FFF; /* TODO : SASS this to panel bg */
 		border: 1px solid #DDD; /* TODO : SASS this to panel border */
 		border-radius: 4px; /* TODO : SASS this to panel border */
-		transition: bottom 0.3s;
-	}
-	.form_btn_regular.sticky.closed{
-		bottom: -80px;
 	}
 	/* - For regular layout */
 	#main-content .form_btn_regular.sticky{
+		bottom: 0px;
 		right: 15px; /* TODO : SASS this to col-xs-12 padding */
+		transition: bottom 0.3s;
+	}
+	#main-content .form_btn_regular.sticky.closed{
+		bottom: -80px;
 	}
 	/* - For modal layout */
 	.modal.in .form_btn_regular.sticky{
-		margin-left: 61%;
+		bottom: 5em;
+		right: 15px; /* TODO : SASS this to col-xs-12 padding */
+		transition: right 0.3s;
 	}
-}
-@media (min-width: 992px) {
-	/* - For modal layout */
-	.modal.in .form_btn_regular.sticky{
-		margin-left: 70%;
+	.modal.in .form_btn_regular.sticky.closed{
+		right: -60px;
 	}
-}
-@media (min-width: 1200px) {
-	/* - For modal layout */
-	.modal.in .form_btn_regular.sticky{
-		margin-left: 73%;
+	.modal.in .form_btn_regular.sticky button{
+		display: block;
 	}
 }