diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig
index e376108891..6dd100fb30 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig
@@ -59,10 +59,10 @@
 									<img src="{{ sUserPhotoUrl }}"/>
 								</span>
 								<span class="actions">
-									<button type="button" class="btn btn-default btn_edit">
+									<span type="button" class="btn btn-default btn_edit">
 										<span class="fa fa-pencil fa-fw"></span>
 										<input id="picture" type="file" name="picture" />
-									</button>
+									</span>
 									{#<button type="button" class="btn btn-default btn_undo" title="{{ 'UI:Button:ResetImage'|dict_s }}" disabled>
 										<span class="fa fa-undo fa-fw"></span>
 									</button>
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
index 1eef822bfc..d2e9d10dd2 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
@@ -515,6 +515,10 @@ footer{
 	max-height: 175px;
 	overflow: hidden;
 }
+#user-profile-wrapper .user_profile_picture .preview img{
+	max-width: 100%;
+	max-height: 100%;
+}
 #user-profile-wrapper .user_profile_picture .actions{
 	display: inline-block;
 	vertical-align: top; /*middle;*/