Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -re2e62167b21f940caccf37f0d8c51f2fe3d8e1ed
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision e2e62167b21f940caccf37f0d8c51f2fe3d8e1ed)
@@ -81,7 +81,7 @@
 		
 		$(document).ready(function () {
 			//update dialog's height and title
-			updateMyProfileDialogSettings('<fmt:message key="title.password.change.screen" />', '430');
+			updateMyProfileDialogSettings('<fmt:message key="title.password.change.screen" />', '550');
 		});	
 	</script>
 </lams:head>
@@ -166,24 +166,23 @@
 							<input class="form-control" type="password" id="passwordConfirm" name="passwordConfirm" autocomplete="new-password" 
 									placeholder="<fmt:message key='label.password.confirm.new.password' />" maxlength="50"/>
 						</div>
-							
-						<div class="form-group" align="right">
-							<c:if test="${not passwordChangeActionForm.passwordExpired}">
-								<button type="button" id="cancelButton" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
-									<fmt:message key="button.cancel"/>
-								</button>
-								&nbsp;&nbsp;
-							</c:if>
-							<button id="saveButton" type="submit" class="btn btn-sm btn-primary voffset5">
-								<fmt:message key="button.save" />
-							</button>
-						</div>
 					</div>
 
 				</div>
+				<div class="form-group" align="right">
+					<c:if test="${not passwordChangeActionForm.passwordExpired}">
+						<button type="button" id="cancelButton" class="btn btn-sm btn-default voffset5" onclick="history.go(-1);">
+							<fmt:message key="button.cancel"/>
+						</button>
+						&nbsp;&nbsp;
+					</c:if>
+					<button id="saveButton" type="submit" class="btn btn-sm btn-primary voffset5">
+						<fmt:message key="button.save" />
+					</button>
+				</div>
 			</div>
 		</div>
 	</div>
 </form:form>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -rb4c7cf180245db7c4d9d5c600eaf294a4c570286 -re2e62167b21f940caccf37f0d8c51f2fe3d8e1ed
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision b4c7cf180245db7c4d9d5c600eaf294a4c570286)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision e2e62167b21f940caccf37f0d8c51f2fe3d8e1ed)
@@ -335,22 +335,24 @@
 
 						</div>
 					</div>
+
+					<div class="form-group" align="right">
+						<button type="button" class="btn btn-sm btn-default voffset5" id="cancelEditProfile" onclick="history.go(-1);">
+							<fmt:message key="button.cancel" />
+						</button>
+						&nbsp;&nbsp;
+						<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
+							<button type="submit" class="btn btn-sm btn-primary voffset5" 
+									name="submit"  id="saveEditProfile"> 
+								<fmt:message key="button.save" />
+							</button>
+						</c:if>
+					</div>
+
 				</div>
 			</div>
 		</div>
 			
-		<div class="form-group" align="right">
-			<button type="button" class="btn btn-sm btn-default voffset5" id="cancelEditProfile" onclick="history.go(-1);">
-				<fmt:message key="button.cancel" />
-			</button>
-			&nbsp;&nbsp;
-			<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
-				<button type="submit" class="btn btn-sm btn-primary voffset5" 
-						name="submit"  id="saveEditProfile"> 
-					<fmt:message key="button.save" />
-				</button>
-			</c:if>
-		</div>
 	</form:form>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_central/web/profile/lessons.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -re2e62167b21f940caccf37f0d8c51f2fe3d8e1ed
--- lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision e2e62167b21f940caccf37f0d8c51f2fe3d8e1ed)
@@ -68,7 +68,7 @@
 					</div>
 					
 					<div align="center">
-						<button type="button" class="btn btn-sm btn-default offset5" onclick="history.go(-1);">
+						<button type="button" class="btn btn-sm btn-primary offset5" onclick="history.go(-1);">
 							<fmt:message key="label.return.to.myprofile" />
 						</button>
 					</div>
@@ -79,4 +79,4 @@
 	</div>
 </div>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_central/web/profile/portrait.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -re2e62167b21f940caccf37f0d8c51f2fe3d8e1ed
--- lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision e2e62167b21f940caccf37f0d8c51f2fe3d8e1ed)
@@ -222,7 +222,7 @@
 
 		<c:if test="${!param.isReturnButtonHidden}">
 			<div align="right">
-				<button type="button" class="btn btn-sm btn-file btn-default offset5" id="portraitReturnButton" onclick="history.go(-1);">
+				<button type="button" class="btn btn-sm btn-file btn-primary offset5" id="portraitReturnButton" onclick="history.go(-1);">
 					<fmt:message key="label.return.to.myprofile" />
 				</button>
 			</div>
@@ -232,4 +232,4 @@
 	</div>	
 </form:form>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_central/web/profile/profilePolicyConsents.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -re2e62167b21f940caccf37f0d8c51f2fe3d8e1ed
--- lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision e2e62167b21f940caccf37f0d8c51f2fe3d8e1ed)
@@ -84,7 +84,7 @@
 					</table>
 					
 					<div class="pull-right">
-						<button type="button" class="btn btn-sm btn-default offset5" onclick="history.go(-1);">
+						<button type="button" class="btn btn-sm btn-primary offset5" onclick="history.go(-1);">
 							<fmt:message key="label.return.to.myprofile" />
 						</button>
 					</div>
@@ -95,4 +95,4 @@
 	</div>
 </div>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>