diff --git a/src/styles/components/_buddypicture.scss b/src/styles/components/_buddypicture.scss
index 049db70d..29259796 100644
--- a/src/styles/components/_buddypicture.scss
+++ b/src/styles/components/_buddypicture.scss
@@ -24,21 +24,24 @@
     display: block;
     margin-bottom: 5px;
   }
-  .showTakePicture {
+  .videoPicture {
     position: relative;
+  }
+  .showTakePicture {
     .btn {
       margin: 5px 0px;
     }
   }
-  .btn-takePicture {
+  .btn-takePicture,
+  .btn-retakePicture {
     position: absolute;
-    right: 90px;
+    left: 85px;
     top: 110px;
   }
   .countdownPicture {
     color: $componentbg;
     font-size: 45px;
-    left: 95px;
+    left: 90px;
     position: absolute;
     top: 55px;
   }
diff --git a/static/partials/buddypicture.html b/static/partials/buddypicture.html
index 59c7d081..f514d730 100644
--- a/static/partials/buddypicture.html
+++ b/static/partials/buddypicture.html
@@ -1,20 +1,18 @@
 <div class="buddyPicture">
-   <img class="picture" ng-show="user.buddyPicture" ng-src="{{user.buddyPicture}}" alt="" />
-   <div class="collapse showTakePicture" collapse="!showTakePicture">
-     <div class="countdownPicture" ng-show="countdown.num">
-         <span ng-bind="countdown.num"></span>
-     </div>
-     <video autoplay="autoplay" width="200"></video>
-     <canvas style="display:none" width="46" height="46"></canvas>
-     <a class="btn btn-xs btn-success btn-takePicture" ng-disabled="countingDown" ng-show="!previewPicture" ng-click="takePicture()"> {{_('Take')}}</a>
-     <a class="btn btn-xs btn-success btn-takePicture" ng-show="previewPicture" ng-click="retakePicture()"> {{_('Retake')}}</a>
-     <div>
-         <a class="btn btn-small btn-default" ng-click="cancelPicture()"> {{_('Cancel')}}</a>
-         <a class="btn btn-small btn-primary" ng-disabled="!previewPicture" ng-click="setAsProfilePicture()"> {{_('Set as Profile Picture')}}</a>
-     </div>
-   </div>
-   <a class="btn btn-small btn-success" ng-show="!showTakePicture" ng-disabled="!showTakePictureReady" ng-click="initPicture()"> {{_('Take picture')}}</a>
-   <span ng-show="!showTakePictureReady">
-      <i class="fa fa-spinner fa-spin"></i> {{_('Waiting for camera')}}
-   </span>
+	<img class="picture" ng-show="user.buddyPicture" ng-src="{{user.buddyPicture}}" alt="" />
+	<div class="collapse showTakePicture" collapse="!showTakePicture">
+		<div class="videoPicture">
+			<div class="countdownPicture" ng-show="countdown.num" ng-bind="countdown.num"></div>
+			<video autoplay="autoplay" width="200"></video>
+			<canvas style="display:none" width="46" height="46"></canvas>
+			<a class="btn btn-xs btn-success btn-takePicture" ng-disabled="countingDown" ng-show="!previewPicture" ng-click="takePicture()"> {{_('Take')}}</a>
+			<a class="btn btn-xs btn-success btn-retakePicture" ng-show="previewPicture" ng-click="retakePicture()"> {{_('Retake')}}</a>
+		</div>
+		<a class="btn btn-small btn-default" ng-click="cancelPicture()"> {{_('Cancel')}}</a>
+		<a class="btn btn-small btn-primary" ng-disabled="!previewPicture" ng-click="setAsProfilePicture()"> {{_('Set as Profile Picture')}}</a>
+	</div>
+	<a class="btn btn-small btn-success" ng-show="!showTakePicture" ng-disabled="!showTakePictureReady" ng-click="initPicture()"> {{_('Take picture')}}</a>
+	<span ng-show="!showTakePictureReady">
+		<i class="fa fa-spinner fa-spin"></i> {{_('Waiting for camera')}}
+	</span>
 </div>