diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index bab2897b6b..7a7e928549 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -115,7 +115,11 @@ module.exports = React.createClass({
         return (
             <div className="team__header theme">
                 <a className="settings_link" href="#" data-toggle="modal" data-target="#user_settings1">
+                    { me.last_picture_update ?
                     <img className="user__picture" src={"/api/v1/users/" + me.id + "/image?time=" + me.update_at} />
+                    :
+                    <div />
+                    }
                     <div className="header__info">
                         <div className="user__name">{ '@' + me.username}</div>
                         <div className="team__name">{ teamDisplayName }</div>
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index adeaa70d71..c45ffb6bf5 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -106,9 +106,9 @@
 			height: 36px;
 			float: left;
 			@include border-radius(36px);
+			margin-right: 6px;
 		}
 		.header__info {
-			padding-left: 42px;
 			color: #fff;
 		}
 		.team__name, .user__name {