From 1db8b0f23c5657f7740fc49d0c5c332dc7537ff0 Mon Sep 17 00:00:00 2001
From: ultimatemember <umplugin@gmail.com>
Date: Wed, 14 Jan 2015 00:10:22 +0200
Subject: [PATCH] Revert "Theme compatibility fixes"

This reverts commit f9ec4c05d18083ab0d6d0c3af648c6939cfac31b.
---
 admin/assets/css/um-admin-misc.css     |  2 -
 assets/css/um-account.css              | 24 ++++----
 assets/css/um-fileupload.css           | 12 ----
 assets/css/um-members.css              | 14 ++---
 assets/css/um-modal.css                | 12 ----
 assets/css/um-profile.css              | 13 +----
 assets/css/um-responsive.css           | 18 ++----
 assets/css/um-select.css               | 20 +------
 assets/css/um-styles.css               | 77 ++++++++------------------
 assets/dynamic_css/dynamic_profile.php |  6 +-
 assets/js/um-tipsy.js                  | 10 +---
 core/um-actions-account.php            | 24 ++------
 core/um-actions-login.php              |  2 +-
 core/um-actions-profile.php            |  2 +-
 core/um-setup.php                      |  1 -
 templates/account.php                  |  4 +-
 um-config.php                          | 13 -----
 17 files changed, 60 insertions(+), 194 deletions(-)

diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css
index ea9a4769..52b5258c 100644
--- a/admin/assets/css/um-admin-misc.css
+++ b/admin/assets/css/um-admin-misc.css
@@ -228,8 +228,6 @@ p.disabled-on-off .um-admin-yesno *{
 	border-radius: 1px;
 	cursor: pointer;
 	border: solid 1px #cccccc;
-	margin: 0;
-	padding: 0 !important;
 }
 
 .um-admin-yesno span.btn.pos-1 {left: 60px}
diff --git a/assets/css/um-account.css b/assets/css/um-account.css
index f44e51bf..4942e817 100644
--- a/assets/css/um-account.css
+++ b/assets/css/um-account.css
@@ -28,6 +28,10 @@
 	- Main tab
 */
 
+.um-account-main div.um-field {
+	padding-top: 25px;
+}
+
 .um-account-main div.um-account-heading {
 	margin: 0 !important;
 	font-size: 18px;
@@ -61,26 +65,20 @@
 	margin-bottom: 20px;
 }
 
-.um-account-meta img {
-	margin: 0 !important;
-	position: static !important;
-	float: none !important;
-	display: inline-block;
-}
+.um-account-meta img {margin: 0 !important}
 
-.um-account-meta.radius-1 img { 	-moz-border-radius: 999px;-webkit-border-radius: 999px;border-radius: 999px }
-.um-account-meta.radius-2 img { 	-moz-border-radius: 4px;-webkit-border-radius: 4px;border-radius: 4px }
-.um-account-meta.radius-3 img { 	-moz-border-radius: 0;-webkit-border-radius: 0;border-radius: 0 }
+.um-account-meta.radius-1 img { border-radius: 999px }
+.um-account-meta.radius-2 img { border-radius: 4px }
+.um-account-meta.radius-3 img { border-radius: 0 }
 
 .um-account-name a {
 	font-weight: bold;
-	color: #555 !important;
+	color: #555;
 	text-decoration: none !important;
 	font-size: 18px;
-	line-height: 2em;
 }
 
-.um-account-name a:hover {color: #3ba1da !important}
+.um-account-name a:hover {color: #3ba1da}
 
 /*
 	- Account nav
@@ -90,7 +88,7 @@
 	display: block;
 	height: 44px;
 	line-height: 44px;
-	color: #666 !important;
+	color: #666;
 	text-decoration: none !important;
 	position: relative;
 	padding-left: 40px;
diff --git a/assets/css/um-fileupload.css b/assets/css/um-fileupload.css
index 5710a92d..933265d3 100644
--- a/assets/css/um-fileupload.css
+++ b/assets/css/um-fileupload.css
@@ -12,8 +12,6 @@
 	display: block;
 	overflow: hidden;
 	margin: auto;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
@@ -39,8 +37,6 @@
 	right: -15px;
 	width: 30px;
 	height: 30px;
-	-moz-border-radius: 999px;
-	-webkit-border-radius: 999px;
 	border-radius: 999px;
 	background: #ddd;
 	cursor: pointer;
@@ -77,8 +73,6 @@
 	display: inline-block;
 	width: 100px;
 	height: 70px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	background-color: #666;
 	color: #fff !important;
@@ -129,8 +123,6 @@
 	height: 10px;
 	color: #666;
 	background: #7ACF58;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
@@ -145,8 +137,6 @@
 	padding: 20px;
 	box-sizing: border-box;
 	border: 2px dashed #ddd;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	font-size: 18px;
 	line-height: 1em;
@@ -181,8 +171,6 @@
 	height: 34px;
 	display: inline-block;
 	text-decoration: none;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	padding: 0 20px;
 	color: #fff;
diff --git a/assets/css/um-members.css b/assets/css/um-members.css
index 65bcad90..cddf354d 100644
--- a/assets/css/um-members.css
+++ b/assets/css/um-members.css
@@ -5,9 +5,7 @@
 .um-members img {
 	display: block;
 	overflow:hidden;
-	-moz-border-radius: 0!important;
-	-webkit-border-radius: 0!important;
-	border-radius: 0!important;
+	border-radius:0!important;
 	margin: 0!important;
 	padding: 0!important;
 }
@@ -191,9 +189,9 @@
 	opacity: 1;
 }
 
-.um-member-photo.radius-1 img { -moz-border-radius: 999px !important;-webkit-border-radius: 999px !important;border-radius: 999px !important }
-.um-member-photo.radius-2 img { -moz-border-radius: 4px !important;-webkit-border-radius: 4px !important;border-radius: 4px !important }
-.um-member-photo.radius-3 img { -moz-border-radius: 0 !important;-webkit-border-radius: 0 !important; border-radius: 0 !important }
+.um-member-photo.radius-1 img { border-radius: 999px !important }
+.um-member-photo.radius-2 img { border-radius: 4px !important }
+.um-member-photo.radius-3 img { border-radius: 0 !important }
 
 /*
 	- Member name
@@ -226,7 +224,6 @@
 	font-size: 13px;
 	line-height: 22px;
 	color: #999;
-	padding: 0 15px;
 }
 
 /*
@@ -286,8 +283,6 @@
 	width: 40px;
 	line-height: 40px;
 	height: 40px;
-	-moz-border-radius: 999px;
-	-webkit-border-radius: 999px;
 	border-radius: 999px;
 	color: #fff !important;
 	opacity: 0.85;
@@ -342,7 +337,6 @@
 	transition: all .2s linear;
 	padding: 0px 14px;
 	color: #666;
-	font-weight: normal;
 }
 
 .um-members-pagi a:hover {
diff --git a/assets/css/um-modal.css b/assets/css/um-modal.css
index 8c934d4a..a6165761 100644
--- a/assets/css/um-modal.css
+++ b/assets/css/um-modal.css
@@ -37,8 +37,6 @@
 }
 
 .um-modal {
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	position: fixed;
 	left: 50%;
@@ -57,14 +55,10 @@
 	box-sizing: border-box;
 	width: 100%;
 	background: #fff;
-	-moz-border-radius: 0 0 3px 3px;
-	-webkit-border-radius: 0 0 3px 3px;
 	border-radius: 0 0 3px 3px;
 }
 
 .um-modal-body.photo {
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), 0px 0px 0px 1px rgba(255, 255, 255, 0.12) inset;
 	background: #888;
@@ -72,8 +66,6 @@
 }
 
 .um-modal-body.photo img {
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	display: block;
 	overflow: hidden;
@@ -90,8 +82,6 @@
 }
 
 .um-modal-header {
-	-moz-border-radius: 3px 3px 0 0;
-	-webkit-border-radius: 3px 3px 0 0;
 	border-radius: 3px 3px 0 0;
 	height: 44px;
 	line-height: 44px;
@@ -126,8 +116,6 @@
 	line-height: 34px !important;
 	height: 34px;
 	display: inline-block;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	padding: 0 20px;
 	text-align: center;
diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css
index 762fe39d..beb82430 100644
--- a/assets/css/um-profile.css
+++ b/assets/css/um-profile.css
@@ -103,9 +103,7 @@
 	vertical-align: middle;
 	height: 100%;
 	text-decoration: none !important;
-	background: none !important;
-	color: #fff !important;
-	border-bottom: none !important;
+	background: none;
 }
 
 .um-cover-overlay i {
@@ -123,7 +121,6 @@
 	padding: 0 0 25px 0;
 	border-bottom: solid 2px #eee;
 	min-height: 85px;
-	box-sizing: content-box !important;
 }
 
 .um-profile-edit {
@@ -173,10 +170,6 @@
 	- Profile photo
 */
 
-.um-profile .gravatar {
-	position: static;
-}
-
 .um-profile-photo {
 	float: left;
 	position: relative;
@@ -227,9 +220,7 @@
 	vertical-align: middle;
 	height: 100%;
 	text-decoration: none !important;
-	background: none !important;
-	color: #fff !important;
-	border-bottom: none !important;
+	background: none;
 }
 
 .um-profile-photo-overlay i {
diff --git a/assets/css/um-responsive.css b/assets/css/um-responsive.css
index 553efb64..277bdc13 100644
--- a/assets/css/um-responsive.css
+++ b/assets/css/um-responsive.css
@@ -56,8 +56,6 @@ div.uimob340 .um-profile-photo-overlay i
 .um-modal.uimob340,
 .um-modal.uimob340 .um-modal-body,
 .um-modal.uimob340 .um-modal-header {
-	-moz-border-radius: 0;
-	-webkit-border-radius: 0;
 	border-radius: 0;
 }
 
@@ -197,6 +195,8 @@ div.uimob340 .um-account-tab {
 	border-bottom: 1px solid #eee;
 }
 
+div.uimob340 .um-account-main div.um-field {padding-top: 15px}
+
 div.uimob340 .um-account-meta {
 	margin-bottom: 0;
 }
@@ -247,8 +247,6 @@ div.uimob500 .um-profile-photo-overlay i
 .um-modal.uimob500,
 .um-modal.uimob500 .um-modal-body,
 .um-modal.uimob500 .um-modal-header {
-	-moz-border-radius: 0;
-	-webkit-border-radius: 0;
 	border-radius: 0;
 }
 
@@ -388,6 +386,8 @@ div.uimob500 .um-account-tab {
 	border-bottom: 1px solid #eee;
 }
 
+div.uimob500 .um-account-main div.um-field {padding-top: 15px}
+
 div.uimob500 .um-account-meta {
 	margin-bottom: 0;
 }
@@ -408,8 +408,6 @@ div.uimob800 .um-account-side {
 
 div.uimob800 .um-account-side ul {
 	border: 1px solid #ddd;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
@@ -426,8 +424,8 @@ div.uimob800 .um-account-side li a{
 	background: transparent;
 	transition: all .2s linear;
 }
-div.uimob800 .um-account-side li:first-child a {-moz-border-radius: 3px 3px 0 0;-webkit-border-radius: 3px 3px 0 0;border-radius: 3px 3px 0 0 }
-div.uimob800 .um-account-side li:last-child a {-moz-border-radius: 0 0 3px 3px;-webkit-border-radius: 0 0 3px 3px;border-radius: 0 0 3px 3px}
+div.uimob800 .um-account-side li:first-child a {border-radius: 3px 3px 0 0 }
+div.uimob800 .um-account-side li:last-child a {border-radius: 0 0 3px 3px}
 
 div.uimob800 .um-account-side li a span.um-account-icontip {
 	display: block;
@@ -460,8 +458,6 @@ div.uimob800 .um-account-meta a,
 div.uimob800 .um-account-meta img {
 	display: block;
 	overflow: hidden;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
@@ -581,8 +577,6 @@ div.uimob960 .um-gutter-sizer {width: 4%}
 	.um-modal.no-photo,
 	.um-modal.no-photo .um-modal-body,
 	.um-modal.no-photo .um-modal-header {
-		-moz-border-radius: 0;
-		-webkit-border-radius: 0;
 		border-radius: 0;
 	}
 
diff --git a/assets/css/um-select.css b/assets/css/um-select.css
index d7733262..4bb7cc87 100644
--- a/assets/css/um-select.css
+++ b/assets/css/um-select.css
@@ -43,8 +43,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
 	text-align: left !important;
     text-decoration: none !important;
 
-	-moz-border-radius: 2px !important;
-	-webkit-border-radius: 2px !important;
     border-radius: 2px !important;
 
     background-clip: padding-box !important;
@@ -60,8 +58,7 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
 }
 
 .select2-container.select2-drop-above .select2-choice {
-	-moz-border-radius: 0 0 2px 2px !important;
-	-webkit-border-radius: 0 0 2px 2px !important;
+
     border-radius: 0 0 2px 2px !important;
 }
 
@@ -79,7 +76,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
     text-overflow: ellipsis !important;
     float: none !important;
     width: auto !important;
-	font-weight: normal;
 }
 
 .select2-container .select2-choice abbr {
@@ -133,8 +129,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
     background: #fff;
     color: #666;
 
-	-moz-border-radius: 0 0 2px 2px;
-	-webkit-border-radius: 0 0 2px 2px;
     border-radius: 0 0 2px 2px;
 
 	box-shadow: none;
@@ -144,8 +138,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
 .select2-drop.select2-drop-above {
     margin-top: 1px;
 
-	-moz-border-radius: 2px 2px 0 0;
-	-webkit-border-radius: 2px 2px 0 0;
     border-radius: 2px 2px 0 0;
 
     box-shadow: none;
@@ -175,8 +167,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
     position: absolute !important;
     right: 0 !important;
     top: 0 !important;
-	-moz-border-radius: 0 2px 2px 0 !important;
-	-webkit-border-radius: 0 2px 2px 0 !important;
     border-radius: 0 2px 2px 0 !important;
     background-clip: padding-box !important;
 	text-align: center !important;
@@ -230,8 +220,6 @@ Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
 	outline: 0 !important;
 	border: 1px solid #ddd !important;
 	color: #666 !important;
-	-moz-border-radius: 2px !important;
-	-webkit-border-radius: 2px !important;
 	border-radius: 2px !important;
 	font-size: 15px !important;
 	box-sizing: border-box !important;
@@ -437,10 +425,7 @@ disabled look for disabled choices in the results dropdown
     cursor: text !important;
     overflow: hidden !important;
 
-	-moz-border-radius: 2px !important;
-	-webkit-border-radius: 2px !important;
 	border-radius: 2px !important;
-	
 	box-shadow: none !important;
 }
 
@@ -500,10 +485,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
     cursor: default;
     border: 1px solid #dddddd;
 
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
     border-radius: 2px;
-	
 	box-shadow: none !important;
 
     -webkit-touch-callout: none;
diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css
index 4b47255a..629abcc7 100644
--- a/assets/css/um-styles.css
+++ b/assets/css/um-styles.css
@@ -45,15 +45,6 @@
 	outline: 0 !important;
 }
 
-.um a .image-overlay,
-.um a:hover .image-overlay,
-.um a:hover .image-overlay * {
-	display: none !important;
-	width: 0 !important;
-	height: 0 !important;
-	position: static !important;
-}
-
 /* only in admin mode */
 .um.um-in-admin {
 	padding-top: 0;
@@ -156,14 +147,12 @@
 
 p.um-notice {
 	width: auto;
+	border-radius: 3px;
 	color: #fff;
 	box-sizing: border-box;
 	font-size: 15px;
 	padding: 12px !important;
 	margin: 12px 0 0 0 !important;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
 }
 
 p.um-notice.success {
@@ -182,8 +171,6 @@ p.um-notice.err {
 	width: auto;
 	max-width: 100%;
 	background: #C74A4A;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	color: #fff;
 	box-sizing: border-box;
@@ -210,8 +197,6 @@ p.um-notice.err {
 	width: auto;
 	max-width: 100%;
 	background: #C74A4A;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	color: #fff;
 	box-sizing: border-box;
@@ -274,9 +259,9 @@ p.um-notice.err {
 .um-field-label .um-field-label-icon  i { font-size: 22px; height: 22px; line-height: 22px; vertical-align: middle; }
 
 .um-field-label label {
-	display: inline-block !important;
+	display: inline-block;
 	height: 22px;
-	font-size: 15px !important;
+	font-size: 15px;
 	line-height: 22px !important;
 	font-weight: bold;
 	font-weight: 600;
@@ -318,21 +303,18 @@ p.um-notice.err {
 
 .um-form input[type=text],
 .um-form input[type=password] {
-	padding: 0 12px !important;
-	width: 100% !important;
-	display: block !important;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
+	padding: 0 12px;
+	width: 100%;
+	display: block;
 	border-radius: 2px;
 	outline: none !important;
 	cursor: text !important;
 	font-size: 15px !important;
 	height: 40px !important;
-	box-sizing: border-box !important;
+	box-sizing: border-box;
 	box-shadow: none !important;
-	margin: 0 !important;
+	margin: 0;
 	position: static;
-	outline: none !important;
 }
 
 .um-form input[type=text]:focus ,
@@ -341,7 +323,6 @@ p.um-notice.err {
 	border-color: #ccc;
 	background-color: #fff !important;
 	box-shadow: none !important;
-	outline: none !important;
 }
 
 .um-form input[type=text].um-iconed,
@@ -352,18 +333,15 @@ p.um-notice.err {
 
 .um-form textarea {
 	width: 100%;
-	padding: 8px 12px !important;
+	padding: 8px 12px;
 	display: block;
 	font-size: 15px !important;
 	line-height: 22px !important;
 	background: #fff;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
 	border-radius: 2px;
 	box-sizing: border-box;
-	min-height: 80px !important;
+	min-height: 80px;
 	box-shadow: none;
-	outline: none !important;
 }
 
 /*
@@ -376,9 +354,14 @@ p.um-notice.err {
 	margin: 8px 0;
 	position: relative;
 	cursor: pointer;
+	color: #888;
 }
 
-.um-field-checkbox:hover i, .um-field-radio:hover i {color: #666}
+.um-field-checkbox:hover i,
+.um-field-radio:hover i
+{
+color: #666
+}
 
 .um-field-checkbox input,
 .um-field-radio input{display:none!important}
@@ -406,7 +389,6 @@ p.um-notice.err {
 .um-field-radio-option {
 	margin: 0 0 0 36px;
 	line-height: 24px;
-	color: #888 !important;
 }
 
 /*
@@ -426,11 +408,10 @@ p.um-notice.err {
 
 	transition: 0.25s;
 	box-sizing: border-box;
-	-moz-border-radius: 4px !important;
-	-webkit-border-radius: 4px !important;
 	border-radius: 4px !important;
 	border-top: 1px solid rgba(0,0,0,0.0) !important;
 	border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important;
+	letter-spacing: 0.5px;
 }
 
 .um-field-group-head i {
@@ -447,8 +428,6 @@ p.um-notice.err {
 	margin: 15px 0 0 0;
 	padding: 15px 20px 5px 20px;
 	background: #f9f9f9;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 	position: relative;
 	box-sizing: border-box;
@@ -490,14 +469,6 @@ input[type=submit].um-button:focus {
 	width: 100%;
 	box-shadow: none;
 	text-shadow: none;
-	font-family: inherit;
-	outline: none !important;
-	margin: 0;
-	opacity: 1;
-}
-
-input[type=submit].um-button:hover {
-	opacity: 1;
 }
 
 .um-button {
@@ -516,12 +487,10 @@ input[type=submit].um-button:hover {
 
 	transition: 0.25s;
 	box-sizing: border-box;
-	-moz-border-radius: 4px !important;
-	-webkit-border-radius: 4px !important;
 	border-radius: 4px !important;
 	border-top: 1px solid rgba(0,0,0,0.0) !important;
 	border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important;
-	opacity: 1;
+	letter-spacing: 0.5px;
 }
 
 
@@ -551,10 +520,8 @@ a.um-link-alt:hover {text-decoration: underline !important;}
 	position: absolute;
 	height: auto;
 	background: #fff;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
 	border-radius: 5px;
-	z-index: 10;
+	z-index: 1;
 	display: none;
     border: 1px solid #e5e5e5;
 	box-sizing: border-box;
@@ -573,8 +540,10 @@ a.um-link-alt:hover {text-decoration: underline !important;}
 	display: block;
 	padding: 8px 12px;
 	color: #666;
+	z-index: 4;
 	font-size: 14px;
 	line-height: 18px;
+	position: relative;
 }
 
 .um-dropdown li:last-child a {
@@ -597,7 +566,7 @@ a.um-link-alt:hover {text-decoration: underline !important;}
 	width: 24px;
 	height: 24px;
 	overflow: hidden;
-	z-index: 15;
+	z-index: 2;
 	color: #eee;
 }
 
@@ -617,8 +586,6 @@ div.um-photo {
 div.um-photo,
 div.um-photo a,
 div.um-photo img {
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
diff --git a/assets/dynamic_css/dynamic_profile.php b/assets/dynamic_css/dynamic_profile.php
index f74432f2..da17cca0 100644
--- a/assets/dynamic_css/dynamic_profile.php
+++ b/assets/dynamic_css/dynamic_profile.php
@@ -10,7 +10,7 @@ print "
 .um-$form_id.um .um-profile-photo a.um-profile-photo-img,
 .um-$form_id.um .um-profile-photo img,
 .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay
-{ -moz-border-radius: 999px !important; -webkit-border-radius: 999px !important; border-radius: 999px !important }";
+{ border-radius: 999px !important }";
 }
 
 if ( $photocorner == 2 ) {
@@ -18,7 +18,7 @@ print "
 .um-$form_id.um .um-profile-photo a.um-profile-photo-img,
 .um-$form_id.um .um-profile-photo img,
 .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay
-{ -moz-border-radius: 4px !important; -webkit-border-radius: 4px !important; border-radius: 4px !important }";
+{ border-radius: 4px !important }";
 }
 
 if ( $photocorner == 3 ) {
@@ -26,7 +26,7 @@ print "
 .um-$form_id.um .um-profile-photo a.um-profile-photo-img,
 .um-$form_id.um .um-profile-photo img,
 .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay
-{ -moz-border-radius: 0px !important; -webkit-border-radius: 0px !important; border-radius: 0px !important }";
+{ border-radius: 0px !important }";
 }
 
 print "
diff --git a/assets/js/um-tipsy.js b/assets/js/um-tipsy.js
index d0c6a872..f95c063f 100644
--- a/assets/js/um-tipsy.js
+++ b/assets/js/um-tipsy.js
@@ -37,7 +37,7 @@
                     width: this.$element[0].offsetWidth,
                     height: this.$element[0].offsetHeight
                 });
-				
+                
                 var actualWidth = $tip[0].offsetWidth,
                     actualHeight = $tip[0].offsetHeight,
                     gravity = maybeCall(this.options.gravity, this.$element[0]);
@@ -54,13 +54,7 @@
                         tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
                         break;
                     case 'w':
-						extra_gap = 0;
-						if ( $('body').css('position').length > 0 && $('body').css('position') == 'relative' ) {
-							if ( $('#wpadminbar').length ) {
-								extra_gap = $('#wpadminbar').height();
-							}
-						}
-						tp = {top: pos.top + pos.height / 2 - actualHeight / 2 - extra_gap, left: pos.left + pos.width + this.options.offset};
+                        tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset};
                         break;
                 }
                 
diff --git a/core/um-actions-account.php b/core/um-actions-account.php
index 93ad448f..a08c2246 100644
--- a/core/um-actions-account.php
+++ b/core/um-actions-account.php
@@ -133,7 +133,7 @@
 		
 		if ( $output ) { ?>
 		
-		<div class="um-account-heading uimob300-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php echo wpautop( um_get_option('delete_account_text') ); ?>
 		
@@ -158,7 +158,7 @@
 
 		if ( $output ) { ?>
 		
-		<div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php echo $output; ?>
 		
@@ -181,7 +181,7 @@
 		
 		if ( $output ) { ?>
 		
-		<div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php echo $output; ?>
 		
@@ -205,7 +205,7 @@
 		
 		if ( $output ) { ?>
 		
-		<div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
+		<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
 		
 		<?php echo $output; ?>
 		
@@ -226,7 +226,7 @@
 		
 		?>
 		
-		<div class="um-account-meta radius-<?php echo um_get_option('profile_photocorner'); ?> uimob340-show uimob500-show">
+		<div class="um-account-meta uimob500-show">
 			
 			<div class="um-account-meta-img"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
 			
@@ -252,16 +252,8 @@
 			
 			<div class="um-account-meta-img uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
 			
-			<?php if ( $ultimatemember->mobile->isMobile() ) { ?>
-			
-			<div class="um-account-meta-img-b uimob800-show" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
-			
-			<?php } else { ?>
-			
 			<div class="um-account-meta-img-b uimob800-show um-tip-w" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
 			
-			<?php } ?>
-			
 			<div class="um-account-name uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div>
 		
 		</div>
@@ -310,13 +302,7 @@
 				
 				<li>
 					<a data-tab="<?php echo $id; ?>" href="<?php echo $ultimatemember->account->tab_link($id); ?>" class="um-account-link <?php if ( $id == $current_tab ) echo 'current'; ?>">
-						
-						<?php if ( $ultimatemember->mobile->isMobile() ) { ?>
-						<span class="um-account-icontip uimob800-show" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span>
-						<?php } else { ?>
 						<span class="um-account-icontip uimob800-show um-tip-w" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span>
-						<?php } ?>
-						
 						<span class="um-account-icon uimob800-hide"><i class="<?php echo $icon; ?>"></i></span>
 						<span class="um-account-title uimob800-hide"><?php echo $title; ?></span>
 						<span class="um-account-arrow uimob800-hide"><i class="um-icon-right-open"></i></span>
diff --git a/core/um-actions-login.php b/core/um-actions-login.php
index 687fa93d..1eed4bac 100644
--- a/core/um-actions-login.php
+++ b/core/um-actions-login.php
@@ -66,7 +66,7 @@
 
 				case 'incorrect_password':
 					if ( username_exists( $user_name ) ) {
-						$ultimatemember->form->add_error( 'user_password',  __('Password is incorrect. Please try again.') );
+						$ultimatemember->form->add_error( 'user_password',  __('That password is incorrect. Please try again.') );
 					}
 					break;
 					
diff --git a/core/um-actions-profile.php b/core/um-actions-profile.php
index b64f540a..8355c89b 100644
--- a/core/um-actions-profile.php
+++ b/core/um-actions-profile.php
@@ -389,7 +389,7 @@
 				
 			}
 			
-			echo $ultimatemember->menu->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
+			echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-edit', 'click', $items );
 			
 			?>
 		
diff --git a/core/um-setup.php b/core/um-setup.php
index dc308de8..595c140b 100644
--- a/core/um-setup.php
+++ b/core/um-setup.php
@@ -87,7 +87,6 @@ class UM_Setup {
 			'_um_profile_show_name' => 1,
 			'_um_profile_show_bio' => 1,
 			'_um_profile_bio_maxchars' => 180,
-			'_um_profile_header_menu' => 'bc',
 			'_um_profile_role' => '0',
 			'_um_profile_template' => 'profile',
 			'_um_profile_max_width' => '1000px',
diff --git a/templates/account.php b/templates/account.php
index 3952b753..48eafaed 100644
--- a/templates/account.php
+++ b/templates/account.php
@@ -8,7 +8,7 @@
 			
 			<?php do_action('um_account_user_photo_hook__mobile', $args ); ?>
 			
-			<div class="um-account-side uimob340-hide uimob500-hide">
+			<div class="um-account-side uimob500-hide">
 			
 				<?php do_action('um_account_user_photo_hook', $args ); ?>
 				
@@ -30,7 +30,7 @@
 					
 							?>
 							
-							<div class="um-account-nav uimob340-show uimob500-show"><a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>"><?php echo $title; ?>
+							<div class="um-account-nav uimob500-show"><a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>"><?php echo $title; ?>
 								<span class="ico"><i class="<?php echo $icon; ?>"></i></span>
 								<span class="arr"><i class="um-icon-chevron-down-3"></i></span>
 							</a></div>
diff --git a/um-config.php b/um-config.php
index cb5ed843..3594fa51 100644
--- a/um-config.php
+++ b/um-config.php
@@ -1202,19 +1202,6 @@ $this->sections[] = array(
 				'required'		=> array( 'profile_show_bio', '=', 1 ),
         ),
 		
-        array(
-                'id'       		=> 'profile_header_menu',
-                'type'     		=> 'select',
-                'title'    		=> __( 'Profile Header Menu Position' ),
-				'default' 		=> um_get_metadefault('profile_header_menu'),
-				'desc' 	   		=> __('For incompatible themes, please make the menu open from left instead of bottom by default.','ultimatemember'),
-				'select2'		=> array( 'allowClear' => 0, 'minimumResultsForSearch' => -1 ),
-				'options' 		=> array(
-									'bc' 		=> 'Bottom of Icon',
-									'lc' 		=> 'Left of Icon',
-				),
-        ),
-		
 	)
 	
 );