diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css
index 1e2732fc..4ec90e7c 100644
--- a/admin/assets/css/um-admin-misc.css
+++ b/admin/assets/css/um-admin-misc.css
@@ -198,56 +198,58 @@ p.disabled-on-off .um-admin-yesno *{
 }
 
 .um-admin-yesno {
-	border-radius: 3px;
-	width: 120px;
+	width: 100px !important;
 	height: 26px;
-	background: #aaa;
 	display: block;
-	color: #fff;
 	position: relative;
+	color: #fff;
 }
 
 .um-admin-yesno span.btn {
 	position: absolute;
 	left: 0;
-	top: 0;
-	width: 60px;
-	height: 26px;
+	top: -2px;
+	width: 50px;
+	height: 28px;
 	text-align: center;
 	background: #f9f9f9;
 	z-index: 101;
-	border-radius: 1px;
+	border-radius: 3px;
 	cursor: pointer;
-	border: solid 1px #cccccc;
+	border: solid 1px #D0D9DB;
 	margin: 0;
 	padding: 0 !important;
 }
 
-.um-admin-yesno span.btn.pos-1 {left: 60px}
-
-.um-admin-yesno span.btn i {
-	position: relative;
-	top: 4px;
-	font-size: 18px;
-	line-height: 18px !important;
-	color: #aaa;
-}
+.um-admin-yesno span.btn.pos-1 {left: 48px}
 
 .um-admin-yesno span.yes, .um-admin-yesno span.no {
-	width: 60px;
+	width: 50px;
 	float: left;
-	line-height: 28px;
-	height: 28px;
-	text-align: right;
+	line-height: 24px;
+	height: 26px;
 	cursor: default;
-	font-size: 13px;
+	font-size: 14px;
 	color: #fff;
-	text-align: center;
+	padding: 0 0 0 10px;
+	box-sizing: border-box;
 }
 
-.um-admin-yesno span.no {float: right}
-.um-admin-yesno .yes {background: #7ACE5A;border-radius: 3px 0 0 3px;}
-.um-admin-yesno .no   {background: #cb3838;border-radius: 0 3px 3px 0}
+.um-admin-yesno .yes {
+	background: #3ba1da;
+	border-radius: 3px 0 0 3px;
+	border: 1px solid rgba(0,0,0,.2);
+}
+
+.um-admin-yesno .no   {
+	padding: 0 10px 0 0 !important;
+	text-align: right;
+	float: right;
+	background: #fff;
+	color: #222 !important;
+	border-radius: 0 3px 3px 0;
+	border: 1px solid #ddd;
+}
 
 /*
 	- SelectJS
diff --git a/admin/assets/js/um-admin-scripts.js b/admin/assets/js/um-admin-scripts.js
index f92af6dd..77f3756d 100644
--- a/admin/assets/js/um-admin-scripts.js
+++ b/admin/assets/js/um-admin-scripts.js
@@ -64,7 +64,7 @@ jQuery(document).ready(function() {
 		if (!jQuery(this).parents('p').hasClass('disabled-on-off')){
 		if ( jQuery(this).parent().find('input[type=hidden]').val() == 0 ){
 			update_val = 1;
-			jQuery(this).animate({'left': '60px'}, 200);
+			jQuery(this).animate({'left': '48px'}, 200);
 			jQuery(this).parent().find('input[type=hidden]').val( update_val ).trigger('change');
 		} else {
 			update_val = 0;
diff --git a/admin/core/um-admin-metabox.php b/admin/core/um-admin-metabox.php
index 1be0e641..e96790b9 100644
--- a/admin/core/um-admin-metabox.php
+++ b/admin/core/um-admin-metabox.php
@@ -125,7 +125,7 @@ class UM_Admin_Metabox {
 		?>
 
 		<span class="um-admin-yesno">
-			<span class="btn pos-<?php echo $active; ?>"><i class="um-faicon-circle-thin"></i></span>
+			<span class="btn pos-<?php echo $active; ?>"></span>
 			<span class="yes" data-value="1"><?php echo $yes; ?></span>
 			<span class="no" data-value="0"><?php echo $no; ?></span>
 			<input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $active; ?>" <?php echo $is_conditional; ?> />