diff --git a/i18n/en-US.json b/i18n/en-US.json
index b199bb5..a99ad97 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -85,7 +85,7 @@
 			"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB",
 			"__comment": "UI-1025: Updating media file uploads throughout the UI",
 			"__version": "3.20_s3",
-			"audioUploadButton": "Select an audio file"
+			"audioUploadButton": "Browse ..."
 		},
 		"nextAction": {
 			"title": "Next Action",
@@ -581,7 +581,7 @@
 			"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB",
 			"__comment": "UI-1025: Updating media file uploads throughout the UI",
 			"__version": "3.20_s3",
-			"audioUploadButton": "Select an audio file"
+			"audioUploadButton": "Browse ..."
 		},
 		"hotdesk": {
 			"id": "Hotdesk ID",
@@ -835,7 +835,7 @@
 			"fileTooBigAlert": "You can not upload a file with a size exceeding 5MB",
 			"__comment": "UI-1025: Updating media file uploads throughout the UI",
 			"__version": "3.20_s3",
-			"audioUploadButton": "Select an audio file"
+			"audioUploadButton": "Browse ..."
 		},
 		"callerId": {
 			"title": "Company Caller ID",
diff --git a/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css
index d373f7a..26fcbb1 100644
--- a/submodules/callLogs/callLogs.css
+++ b/submodules/callLogs/callLogs.css
@@ -68,7 +68,7 @@
 #call_logs_container .call-logs-grid {
 	background-color: #f6f6f6;
 	border-bottom: solid 2px #ddd;
-	border-radius: 4px;
+	border-radius: 2px;
 	max-height: 500px;
 	overflow: auto;
 }
@@ -190,7 +190,7 @@
 	margin-top: 10px;
 	padding: 10px;
 	border: solid 1px #999;
-	border-radius: 4px;
+	border-radius: 2px;
 	text-align: center;
 	background-color: #eaeaea;
 }
diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index 6a42b64..90d165e 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.css
@@ -10,7 +10,7 @@
 #devices_container .devices-header .title {
 	padding: 15px;
 	border: 1px solid #dcdcdc;
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #devices_container .devices-header .count-devices {
@@ -32,7 +32,7 @@
 	padding: 9px 13px;
 	border: 1px solid #dcdcdc;
 	border-left: 0;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:     -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
@@ -62,16 +62,14 @@
 	color: #22a5ff;
 }
 
-#devices_container .devices-header .search-box { margin: 16px 0 16px 15px; }
-
-
-
-
+#devices_container .devices-header .search-box { 
+	margin: 16px 0 16px 15px; 
+}
 
 #devices_container .devices-grid {
 	background: #fcfcfc;
 	border: 1px solid #ddd;
-	border-radius: 4px;
+	border-radius: 2px;
 	margin-top: 20px;
 }
 
@@ -266,7 +264,7 @@
 }
 
 .edit-device .title-bar .device-title .device-image {
-	border-radius: 4px;
+	border-radius: 2px;
 	border: 1px solid #CCC;
 }
 
diff --git a/submodules/featureCodes/featureCodes.css b/submodules/featureCodes/featureCodes.css
index 7dee325..b1d0d8a 100644
--- a/submodules/featureCodes/featureCodes.css
+++ b/submodules/featureCodes/featureCodes.css
@@ -7,7 +7,7 @@
 #feature_codes_container .feature-codes-content {
 	padding: 20px;
 	border: 1px solid #dcdcdc;
-	border-radius: 4px;
+	border-radius: 2px;
 	background-color: #f6f6f6;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
diff --git a/submodules/groups/groups.css b/submodules/groups/groups.css
index 5c39e08..05b1497 100644
--- a/submodules/groups/groups.css
+++ b/submodules/groups/groups.css
@@ -20,7 +20,7 @@
 #groups_container .groups-header .title {
 	padding: 15px;
 	border: 1px solid #dcdcdc;
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #groups_container .groups-header .count-groups {
@@ -37,7 +37,7 @@
 	padding: 13px;
 	border: 1px solid #dcdcdc;
 	border-left: 0;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:     -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
@@ -181,7 +181,7 @@
 
 #groups_container .groups-rows .grid-row {
 	margin-bottom: 10px;
-	border-radius: 4px;
+	border-radius: 2px;
 }
 
 #groups_container .groups-rows .grid-cell {
@@ -200,12 +200,12 @@
 }
 
 #groups_container .groups-rows .grid-cell:first-child {
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #groups_container .groups-rows .grid-cell:last-child {
 	border-right: 1px solid #dcdcdc;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 }
 
 #groups_container .groups-rows .grid-cell.active:first-child {
@@ -302,7 +302,7 @@
 #groups_container .list-wrapper {
 	margin: 10px;
 	border: 1px solid #ddd;
-	border-radius: 4px;
+	border-radius: 2px;
 	background: #FFF;
 }
 
@@ -486,11 +486,16 @@
 }
 
 /* Ringback Feature */
+.feature-popup-container[data-feature="ringback"] {
+	width: 516px;
+}
+
 .feature-popup-container[data-feature="ringback"] .media-dropdown {
 	margin-bottom: 0px;
 }
 .feature-popup-container[data-feature="ringback"] .upload-toggle {
 	margin-left: 10px;
+	width: 117px;
 }
 .feature-popup-container[data-feature="ringback"] .upload-div {
 	display: none;
@@ -502,8 +507,13 @@
 }
 .feature-popup-container[data-feature="ringback"] .upload-div button.upload-action {
 	margin-left: 10px;
-	padding-left: 13px;
-	padding-right: 13px;
+	padding-left: 19px;
+	padding-right: 19px;
+}
+
+.feature-popup-container[data-feature="ringback"] .upload-div button > i {
+	margin-right: 0;
+	padding-right: 0;
 }
 
 .feature-popup-container[data-feature="ringback"] .upload-div .file-upload {
@@ -511,10 +521,8 @@
 }
 .feature-popup-container[data-feature="ringback"] .upload-div .file-upload > input {
 	margin: 0;
-	width: 105px;
-}
-.feature-popup-container[data-feature="ringback"] .upload-div .file-upload > button {
-	width: 220px;
+	width: 205px;
+	padding: 6px;
 }
 
 /* Next Action Feature */
diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 9ca82f7..b78208f 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -589,7 +589,7 @@ define(function(require){
 					inputOnly: true,
 					wrapperClass: 'file-upload input-append',
 					btnText: self.i18n.active().groups.ringback.audioUploadButton,
-					btnClass: 'btn',
+					btnClass: 'monster-button',
 					maxSize: 5,
 					success: function(results) {
 						mediaToUpload = results[0];
diff --git a/submodules/myOffice/myOffice.css b/submodules/myOffice/myOffice.css
index e89207b..f88497d 100644
--- a/submodules/myOffice/myOffice.css
+++ b/submodules/myOffice/myOffice.css
@@ -3,7 +3,8 @@
 	height: 60px;
 	background-color: #22a5ff;
 	color: #fff;
-	border: 1px solid #dcdcdc;  border-radius: 4px;
+	border: 1px solid #dcdcdc; 
+	border-radius: 2px;
 	margin-bottom: 20px;
 }
 #myoffice_container .dashboard-header > * {
@@ -39,8 +40,8 @@
 }
 
 #myoffice_container .dashboard-header .header-link:not(.disabled):hover {
-	box-shadow: 0px 0px 20px #666 inset;
-	border-radius: 4px;
+	/*box-shadow: 0px 0px 2px #FFF inset;*/
+	border-radius: 2px;
 	text-decoration: none;
 	font-weight: bold;
 }
@@ -63,7 +64,7 @@
 #myoffice_container .dashboard-content .dashboard-top-message {
 	padding: 10px;
 	margin-bottom: 10px;
-	border-radius: 4px;
+	border-radius: 2px;
 	opacity: 0.8;
 }
 #myoffice_container .dashboard-content .dashboard-top-message i {
@@ -96,7 +97,7 @@
 	background-image: -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image: -o-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image: linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
-	border-radius: 4px;
+	border-radius: 2px;
 	border: 1px solid #dcdcdc;
 }
 #myoffice_container .dashboard-left-content .left-section-header .title {
@@ -163,7 +164,7 @@
 }
 #myoffice_container .dashboard-right-content .dashboard-box {
 	border: 1px solid #dcdcdc;
-	border-radius: 4px;
+	border-radius: 2px;
 }
 #myoffice_container .dashboard-right-content .dashboard-box > :first-child {
 	border-top-left-radius: 4px;
@@ -371,9 +372,11 @@
 /********** Music-On-Hold Popup **********/
 #my_office_music_on_hold_popup .media-dropdown {
 	margin-bottom: 0px;
+	width: 220px;
 }
 #my_office_music_on_hold_popup .upload-toggle {
 	margin-left: 10px;
+	min-width: 117px;
 }
 #my_office_music_on_hold_popup .upload-div {
 	display: none;
@@ -385,18 +388,19 @@
 }
 #my_office_music_on_hold_popup .upload-div button.upload-action {
 	margin-left: 10px;
-	padding-left: 13px;
-	padding-right: 13px;
+	min-width: 20px;
+	padding-right: 10px;
 }
 #my_office_music_on_hold_popup .upload-div .file-upload {
 	margin: 0;
 }
 #my_office_music_on_hold_popup .upload-div .file-upload > input {
 	margin: 0;
-	width: 92px;
+	width: 192px;
+	padding: 6px;
 }
 #my_office_music_on_hold_popup .upload-div .file-upload > button {
-	width: 220px;
+	width: 120px;
 }
 
 /********** Caller ID Popup **********/
diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index a74b0e4..852d172 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -610,7 +610,7 @@ define(function(require){
 				inputOnly: true,
 				wrapperClass: 'file-upload input-append',
 				btnText: self.i18n.active().myOffice.musicOnHold.audioUploadButton,
-				btnClass: 'btn',
+				btnClass: 'monster-button',
 				maxSize: 5,
 				success: function(results) {
 					mediaToUpload = results[0];
diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css
index 32292a0..f4cdaab 100644
--- a/submodules/strategy/strategy.css
+++ b/submodules/strategy/strategy.css
@@ -8,7 +8,7 @@
 
 #strategy_container .element-header-outer {
 	background: #dedede;
-	border-radius: 4px;
+	border-radius: 2px;
 }
 
 #strategy_container .element-header-inner {
@@ -614,7 +614,7 @@
 #strategy_menu_popup_accordion .greeting-option-header {
 	padding: 10px;
 	font-weight: bold;
-	border-radius: 4px;
+	border-radius: 2px;
 	cursor: pointer;
 	background-color: #e0e0e9;
 }
diff --git a/submodules/users/users.css b/submodules/users/users.css
index 07cd9c7..210448f 100644
--- a/submodules/users/users.css
+++ b/submodules/users/users.css
@@ -20,7 +20,7 @@
 #users_container .users-header .title {
 	padding: 15px;
 	border: 1px solid #dcdcdc;
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #users_container .users-header .count-users {
@@ -37,7 +37,7 @@
 	padding: 9px 13px;
 	border: 1px solid #dcdcdc;
 	border-left: 0;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:     -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
@@ -189,7 +189,7 @@
 
 #users_container .user-rows .grid-row {
 	margin-bottom: 10px;
-	border-radius: 4px;
+	border-radius: 2px;
 }
 
 #users_container .user-rows .grid-cell {
@@ -208,12 +208,12 @@
 }
 
 #users_container .user-rows .grid-cell:first-child {
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #users_container .user-rows .grid-cell:last-child {
 	border-right: 1px solid #dcdcdc;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 }
 
 #users_container .user-rows .grid-cell.active:first-child {
@@ -344,7 +344,7 @@
 #users_container .detail-user .email-border {
 	margin-bottom: 10px;
 	border: 2px dotted transparent;
-	border-radius: 4px;
+	border-radius: 2px;
 }
 
 #users_container .detail-user .email-border.open {
@@ -382,7 +382,7 @@
 #users_container .list-wrapper {
 	margin: 10px;
 	border: 1px solid #ddd;
-	border-radius: 4px;
+	border-radius: 2px;
 	background: #FFF;
 }
 
@@ -432,8 +432,6 @@
 
 #users_container .list-wrapper .item-row button {
 	margin-right: 15px;
-	padding: 2px;
-	width: 80px;
 }
 
 /* Detail Numbers */
@@ -540,7 +538,7 @@
 	background: -o-linear-gradient(top,  hsl(0,0%,100%) 0%,hsl(0,0%,87%) 100%); /* Opera 11.10+ */
 	background: -ms-linear-gradient(top,  hsl(0,0%,100%) 0%,hsl(0,0%,87%) 100%); /* IE10+ */
 	background: linear-gradient(to bottom,  hsl(0,0%,100%) 0%,hsl(0,0%,87%) 100%); /* W3C */
-	box-shadow: 0 -1px 2px #666666 inset;
+/*	box-shadow: 0 -1px 2px #666666 inset;*/
 	text-align: center;
 	line-height: 60px;
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
@@ -560,7 +558,7 @@
 
 #users_container .detail-features .features-grid .feature:hover {
 	background: #FFF;
-	box-shadow: 1px 1px 15px #ddd inset;
+/*	box-shadow: 1px 1px 15px #ddd inset;*/
 }
 
 #creation_user_dialog form > div {
@@ -708,6 +706,7 @@
 }
 .feature-popup-container[data-feature="music_on_hold"] .upload-toggle {
 	margin-left: 10px;
+	min-width: 117px;
 }
 .feature-popup-container[data-feature="music_on_hold"] .upload-div {
 	display: none;
@@ -719,18 +718,22 @@
 }
 .feature-popup-container[data-feature="music_on_hold"] .upload-div button.upload-action {
 	margin-left: 10px;
-	padding-left: 13px;
-	padding-right: 13px;
+	padding-left: 19px;
+	padding-right: 19px;
 }
+
+.feature-popup-container[data-feature="music_on_hold"] .upload-div button > i {
+	margin-right: 0;
+	padding-right: 0;
+}
+
 .feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload {
 	margin: 0;
 }
 .feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload > input {
 	margin: 0;
-	width: 92px;
-}
-.feature-popup-container[data-feature="music_on_hold"] .upload-div .file-upload > button {
-	width: 220px;
+	padding: 6px;
+	width: 192px;
 }
 
 /* Faxing Feature Popup */
diff --git a/submodules/users/users.js b/submodules/users/users.js
index cb94b9d..f329436 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -2163,7 +2163,7 @@ define(function(require){
 					inputOnly: true,
 					wrapperClass: 'file-upload input-append',
 					btnText: self.i18n.active().users.music_on_hold.audioUploadButton,
-					btnClass: 'btn',
+					btnClass: 'monster-button',
 					maxSize: 5,
 					success: function(results) {
 						mediaToUpload = results[0];
diff --git a/submodules/vmboxes/vmboxes.css b/submodules/vmboxes/vmboxes.css
index d687a05..2374781 100644
--- a/submodules/vmboxes/vmboxes.css
+++ b/submodules/vmboxes/vmboxes.css
@@ -10,7 +10,7 @@
 #vmboxes_container .vmboxes-header .title {
 	padding: 15px;
 	border: 1px solid #dcdcdc;
-	border-radius: 4px 0 0 4px;
+	border-radius: 2px 0 0 2px;
 }
 
 #vmboxes_container .vmboxes-header .count-vmboxes {
@@ -31,7 +31,7 @@
 	padding: 9px 13px;
 	border: 1px solid #dcdcdc;
 	border-left: 0;
-	border-radius: 0 4px 4px 0;
+	border-radius: 0 2px 2px 0;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:    -moz-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
 	background-image:     -ms-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
@@ -66,7 +66,7 @@
 #vmboxes_container .vmboxes-grid {
 	background: #fcfcfc;
 	border: 1px solid #ddd;
-	border-radius: 4px;
+	border-radius: 2px;
 	margin-top: 20px;
 }
 
diff --git a/views/callLogs-layout.html b/views/callLogs-layout.html
index 5f80e90..8318752 100644
--- a/views/callLogs-layout.html
+++ b/views/callLogs-layout.html
@@ -28,7 +28,7 @@
 				<input id="startDate" type="text" class="date-filter filter-from">
 				<span>{{i18n.endDate}}</span>
 				<input id="endDate" type="text" class="date-filter filter-to">
-				<button type="button" class="apply-filter btn btn-primary" title="{{i18n.callLogs.applyFilter}}">{{i18n.filter}}</button>
+				<button type="button" class="apply-filter monster-button monster-button-primary" title="{{i18n.callLogs.applyFilter}}">{{i18n.filter}}</button>
 			</div>
 
 			{{#if showFilteredDates}}
diff --git a/views/devices-ata.html b/views/devices-ata.html
index e766089..0b49a58 100644
--- a/views/devices-ata.html
+++ b/views/devices-ata.html
@@ -79,7 +79,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -139,7 +139,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-				<button type="button" class="btn btn-success save">
+				<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}
diff --git a/views/devices-cellphone.html b/views/devices-cellphone.html
index b1c64d3..f370de5 100644
--- a/views/devices-cellphone.html
+++ b/views/devices-cellphone.html
@@ -80,7 +80,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">
+			<button type="button" class="monster-button monster-button-success save">
 			{{#if id}}
 				{{ i18n.saveChanges }}
 			{{else}}
diff --git a/views/devices-fax.html b/views/devices-fax.html
index e1115e6..4a66083 100644
--- a/views/devices-fax.html
+++ b/views/devices-fax.html
@@ -90,7 +90,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -150,7 +150,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-				<button type="button" class="btn btn-success save">
+				<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}
diff --git a/views/devices-landline.html b/views/devices-landline.html
index d71c466..6f7273d 100644
--- a/views/devices-landline.html
+++ b/views/devices-landline.html
@@ -86,7 +86,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">
+			<button type="button" class="monster-button monster-button-success save">
 			{{#if id}}
 				{{ i18n.saveChanges }}
 			{{else}}
diff --git a/views/devices-mobile.html b/views/devices-mobile.html
index 3a07910..9073202 100644
--- a/views/devices-mobile.html
+++ b/views/devices-mobile.html
@@ -101,7 +101,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -195,7 +195,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-				<button type="button" class="btn btn-success save">
+				<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index f1f54f3..711cee6 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -138,7 +138,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -298,7 +298,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">
+			<button type="button" class="monster-button monster-button-success save">
 			{{#if id}}
 				{{ i18n.saveChanges }}
 			{{else}}
diff --git a/views/devices-sip_uri.html b/views/devices-sip_uri.html
index 27199a3..860fede 100644
--- a/views/devices-sip_uri.html
+++ b/views/devices-sip_uri.html
@@ -66,7 +66,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">
+			<button type="button" class="monster-button monster-button-success save">
 			{{#if id}}
 				{{ i18n.saveChanges }}
 			{{else}}
diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html
index 33f0e2b..56ad04b 100644
--- a/views/devices-smartphone.html
+++ b/views/devices-smartphone.html
@@ -131,7 +131,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -191,7 +191,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-				<button type="button" class="btn btn-success save">
+				<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 606654f..9d51936 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -95,7 +95,7 @@
 					<div class="restriction-matcher-div">
 						<i class="help-popover fa fa-question-circle fa-lg" data-original-title="{{i18n.devices.popupSettings.restrictions.matcher.help}}" data-placement="top" data-toggle="tooltip"></i>
 						<input type="text" class="restriction-matcher-input" placeholder="{{i18n.devices.popupSettings.restrictions.matcher.placeholder}}" />
-						<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+						<button type="button"  class="monster-button monster-button-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 					</div>
 					<div class="title">
 						{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
@@ -195,7 +195,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-				<button type="button" class="btn btn-success save">
+				<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}
diff --git a/views/groups-creation.html b/views/groups-creation.html
index 7f687c3..7735fed 100644
--- a/views/groups-creation.html
+++ b/views/groups-creation.html
@@ -27,6 +27,6 @@
     </div>
 
 	<div class="dialog-buttons-wrapper">
-		<button id="create_group" class="btn btn-success">{{ i18n.groups.dialogCreationGroup.createGroup }}</button>
+		<button id="create_group" class="monster-button monster-button-success">{{ i18n.groups.dialogCreationGroup.createGroup }}</button>
 	</div>
 </div>
diff --git a/views/groups-extensions.html b/views/groups-extensions.html
index 091187b..5b8e950 100644
--- a/views/groups-extensions.html
+++ b/views/groups-extensions.html
@@ -7,7 +7,7 @@
 			{{#each extensions}}
 				<div class="item-row" data-id="{{this}}" data-search="{{this}}">
 					<div class="number">
-						<button type="button" class="btn btn-danger remove-extension">{{ ../i18n.unassign }}</button>
+						<button type="button" class="monster-button monster-button-danger remove-extension">{{ ../i18n.unassign }}</button>
 						{{ this }}
 					</div>
 				</div>
@@ -19,7 +19,7 @@
 		<a id="add_extensions" class="monster-link" href="javascript:void(0);"><i class="fa fa-plus monster-green"></i>{{ i18n.groups.addExtension }}</a>
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-extensions">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-extensions">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-feature-call_recording.html b/views/groups-feature-call_recording.html
index 2b48e46..fb2a892 100644
--- a/views/groups-feature-call_recording.html
+++ b/views/groups-feature-call_recording.html
@@ -34,7 +34,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-feature-forward.html b/views/groups-feature-forward.html
index 9a1706e..b1b218b 100644
--- a/views/groups-feature-forward.html
+++ b/views/groups-feature-forward.html
@@ -20,7 +20,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/groups-feature-next_action.html b/views/groups-feature-next_action.html
index edfd567..f54db24 100644
--- a/views/groups-feature-next_action.html
+++ b/views/groups-feature-next_action.html
@@ -38,7 +38,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-feature-ringback.html b/views/groups-feature-ringback.html
index 83e7125..48781ff 100644
--- a/views/groups-feature-ringback.html
+++ b/views/groups-feature-ringback.html
@@ -20,21 +20,21 @@
 					<option value="{{this.id}}" {{#compare ../media '===' this.id}}selected{{/compare}}>{{this.name}}</option>
 				{{/each}}
 			</select>
-			<button type="button" class="btn btn-primary upload-toggle" data-toggle="button">
+			<button type="button" class="monster-button monster-button-primary non-fixed upload-toggle" data-toggle="button">
 				{{ i18n.upload }}
 			</button>
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
+			<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/groups-members.html b/views/groups-members.html
index 5364fb4..88c77c0 100644
--- a/views/groups-members.html
+++ b/views/groups-members.html
@@ -9,7 +9,7 @@
 		</a>
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-groups">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-groups">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-name.html b/views/groups-name.html
index df6a8f3..216a872 100644
--- a/views/groups-name.html
+++ b/views/groups-name.html
@@ -12,7 +12,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-group">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-group">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-numbers.html b/views/groups-numbers.html
index c909ccd..f482fe5 100644
--- a/views/groups-numbers.html
+++ b/views/groups-numbers.html
@@ -33,7 +33,7 @@
 						</div>
 					</div>
 					<div class="number">
-						<button type="button" class="btn btn-danger remove-number">{{ ../i18n.unassign }}</button>
+						<button type="button" class="monster-button monster-button-danger remove-number">{{ ../i18n.unassign }}</button>
 						{{ formatPhoneNumber @key }}
 					</div>
 					<!--<div class="locality">
@@ -69,7 +69,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-numbers">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-numbers">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html
index a9665ce..be3c9b4 100644
--- a/views/groups-numbersItemRow.html
+++ b/views/groups-numbersItemRow.html
@@ -26,7 +26,7 @@
 		</div>
 	</div>
 	<div class="number">
-		<button type="button" class="btn btn-danger remove-number">{{ i18n.unassign }}</button>
+		<button type="button" class="monster-button monster-button-danger remove-number">{{ i18n.unassign }}</button>
 		{{ formatPhoneNumber number.phoneNumber }}
 	</div>
 </div>
diff --git a/views/myOffice-callerIdPopup.html b/views/myOffice-callerIdPopup.html
index 316a241..86673a4 100644
--- a/views/myOffice-callerIdPopup.html
+++ b/views/myOffice-callerIdPopup.html
@@ -71,7 +71,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/myOffice-musicOnHoldPopup.html b/views/myOffice-musicOnHoldPopup.html
index 88b472d..fa78fc5 100644
--- a/views/myOffice-musicOnHoldPopup.html
+++ b/views/myOffice-musicOnHoldPopup.html
@@ -20,21 +20,21 @@
 					<option value="{{this.id}}" {{#compare ../media '===' this.id}}selected{{/compare}}>{{this.name}}</option>
 				{{/each}}
 			</select>
-			<button type="button" class="btn btn-primary upload-toggle" data-toggle="button">
+			<button type="button" class="monster-button monster-button-primary upload-toggle" data-toggle="button">
 				{{ i18n.upload }}
 			</button>
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
+			<button type="button" class="monster-button monster-button-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="monster-button monster-button-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/strategy-calls.html b/views/strategy-calls.html
index 9bb6921..dc82d30 100644
--- a/views/strategy-calls.html
+++ b/views/strategy-calls.html
@@ -33,5 +33,5 @@
 
 <div class="calls-actions basic-actions">
 	<a href="#" class="monster-link blue cancel-link">{{i18n.cancel}}</a>
-	<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
+	<button class="monster-button monster-button-success save-button">{{i18n.saveChanges}}</button>
 </div>
\ No newline at end of file
diff --git a/views/strategy-confnum.html b/views/strategy-confnum.html
index 2c54705..c816e87 100644
--- a/views/strategy-confnum.html
+++ b/views/strategy-confnum.html
@@ -1,7 +1,7 @@
 {{#each numbers}}
 <div class="number-element">
 	<div class="number">
-		<button type="button" class="btn btn-danger remove-number" data-number="{{this.number}}">
+		<button type="button" class="monster-button monster-button-danger remove-number" data-number="{{this.number}}">
 			{{ ../i18n.unassign }}
 		</button>
 		<span>{{formatPhoneNumber this.number}}</span>
diff --git a/views/strategy-holidays.html b/views/strategy-holidays.html
index cf8305c..daec7b6 100644
--- a/views/strategy-holidays.html
+++ b/views/strategy-holidays.html
@@ -28,5 +28,5 @@
 
 <div class="holidays-actions basic-actions">
 	<a href="#" class="cancel-link monster-link blue">{{i18n.cancel}}</a>
-	<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
+	<button class="monster-button monster-button-success save-button">{{i18n.saveChanges}}</button>
 </div>
\ No newline at end of file
diff --git a/views/strategy-hours.html b/views/strategy-hours.html
index aecf685..a17ae6a 100644
--- a/views/strategy-hours.html
+++ b/views/strategy-hours.html
@@ -66,7 +66,7 @@
 		</div>
 		<div class="custom-hours-actions basic-actions">
 			<a href="#" class="monster-link blue cancel-link">{{i18n.cancel}}</a>
-			<button class="btn btn-success save-button">{{i18n.saveChanges}}</button>
+			<button class="monster-button monster-button-success save-button">{{i18n.saveChanges}}</button>
 		</div>
 	</form>
 </div>
\ No newline at end of file
diff --git a/views/strategy-menuPopup.html b/views/strategy-menuPopup.html
index 62ea4cf..682ff7e 100644
--- a/views/strategy-menuPopup.html
+++ b/views/strategy-menuPopup.html
@@ -83,7 +83,7 @@
 		</div>
 	</div>
 	<div class="action-block clearfix">
-		<button class="save-button btn btn-success pull-right">{{i18n.save}}</button>
+		<button class="save-button monster-button monster-button-success pull-right">{{i18n.save}}</button>
 		<a href="#" class="monster-link blue cancel-link pull-right">{{i18n.cancel}}</a>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/strategy-numbers.html b/views/strategy-numbers.html
index c07ada3..d3d909f 100644
--- a/views/strategy-numbers.html
+++ b/views/strategy-numbers.html
@@ -1,7 +1,7 @@
 {{#each numbers}}
 <div class="number-element">
 	<div class="number">
-		<button type="button" class="btn btn-danger remove-number" data-number="{{this.number}}" data-e911="{{this.features.dash_e911.active}}">
+		<button type="button" class="monster-button monster-button-danger remove-number" data-number="{{this.number}}" data-e911="{{this.features.dash_e911.active}}">
 			{{ ../i18n.unassign }}
 		</button>
 		<span>{{formatPhoneNumber this.number}}</span>
diff --git a/views/strategy-popupRemoveFeatures.html b/views/strategy-popupRemoveFeatures.html
index adc91c5..55c41fb 100644
--- a/views/strategy-popupRemoveFeatures.html
+++ b/views/strategy-popupRemoveFeatures.html
@@ -24,6 +24,6 @@
 	</div>
 	<div class="actions pull-right">
 		<a class="cancel-link monster-link blue" href="javascript:void(0);">{{i18n.cancel}}</a>
-		<button class="btn btn-danger" id="remove_features">{{i18n.remove}}</button>
+		<button class="monster-button monster-button-danger" id="remove_features">{{i18n.remove}}</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/users-changePassword.html b/views/users-changePassword.html
index c7b4241..f261dc5 100644
--- a/views/users-changePassword.html
+++ b/views/users-changePassword.html
@@ -22,7 +22,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-new-username">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-new-username">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-changePin.html b/views/users-changePin.html
index bab6ecb..6a9327c 100644
--- a/views/users-changePin.html
+++ b/views/users-changePin.html
@@ -17,7 +17,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-new-pin">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-new-pin">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-changePresenceIDPopup.html b/views/users-changePresenceIDPopup.html
index 8452ae2..cf34e47 100644
--- a/views/users-changePresenceIDPopup.html
+++ b/views/users-changePresenceIDPopup.html
@@ -15,7 +15,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-presence-id">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-presence-id">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/users-creation.html b/views/users-creation.html
index 6cc47a2..a0ec6e7 100644
--- a/views/users-creation.html
+++ b/views/users-creation.html
@@ -68,6 +68,6 @@
 	</div>
 	</form>
 	<div class="dialog-buttons-wrapper">
-		<button id="create_user" class="btn btn-success">{{ i18n.users.dialogCreationUser.createUser }}</button>
+		<button id="create_user" class="monster-button monster-button-success">{{ i18n.users.dialogCreationUser.createUser }}</button>
 	</div>
 </div>
diff --git a/views/users-devices.html b/views/users-devices.html
index 2a5f497..f16b98b 100644
--- a/views/users-devices.html
+++ b/views/users-devices.html
@@ -7,7 +7,7 @@
 			{{#each assignedDevices}}
 				<div class="item-row assigned" data-id="{{this.id}}">
 					<div class="device">
-						<button type="button" class="btn btn-danger remove-device">{{ ../i18n.unassign }}</button>
+						<button type="button" class="monster-button monster-button-danger remove-device">{{ ../i18n.unassign }}</button>
 						<a href="javascript:void(0);" class="edit-device-link monster-link">{{ this.name }}</a>
 					</div>
 				</div>
@@ -35,7 +35,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-devices">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-devices">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-extensions.html b/views/users-extensions.html
index c1a5673..055c4ac 100644
--- a/views/users-extensions.html
+++ b/views/users-extensions.html
@@ -7,7 +7,7 @@
 			{{#each extensions}}
 				<div class="item-row" data-id="{{this}}" data-search="{{this}}">
 					<div class="number">
-						<button type="button" class="btn btn-danger remove-extension">{{ ../i18n.unassign }}</button>
+						<button type="button" class="monster-button monster-button-danger remove-extension">{{ ../i18n.unassign }}</button>
 						{{ this }}
 					</div>
 				</div>
@@ -19,7 +19,7 @@
 		<a id="add_extensions" class="monster-link" href="javascript:void(0);"><i class="fa fa-plus monster-green"></i>{{ i18n.users.addExtension }}</a>
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-extensions">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-extensions">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-call_forward.html b/views/users-feature-call_forward.html
index b9c70cb..629d9ce 100644
--- a/views/users-feature-call_forward.html
+++ b/views/users-feature-call_forward.html
@@ -62,7 +62,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-call_recording.html b/views/users-feature-call_recording.html
index 685cc62..244c1a2 100644
--- a/views/users-feature-call_recording.html
+++ b/views/users-feature-call_recording.html
@@ -34,7 +34,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-caller_id.html b/views/users-feature-caller_id.html
index fc672ac..875cf76 100644
--- a/views/users-feature-caller_id.html
+++ b/views/users-feature-caller_id.html
@@ -27,7 +27,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-conferencing.html b/views/users-feature-conferencing.html
index b18177a..81d0f72 100644
--- a/views/users-feature-conferencing.html
+++ b/views/users-feature-conferencing.html
@@ -36,7 +36,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-faxing.html b/views/users-feature-faxing.html
index 961e27c..115a4f9 100644
--- a/views/users-feature-faxing.html
+++ b/views/users-feature-faxing.html
@@ -63,7 +63,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-find_me_follow_me.html b/views/users-feature-find_me_follow_me.html
index 14ccdc0..6441481 100644
--- a/views/users-feature-find_me_follow_me.html
+++ b/views/users-feature-find_me_follow_me.html
@@ -19,7 +19,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/users-feature-hotdesk.html b/views/users-feature-hotdesk.html
index 90f1929..373e3aa 100644
--- a/views/users-feature-hotdesk.html
+++ b/views/users-feature-hotdesk.html
@@ -38,7 +38,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-feature-music_on_hold.html b/views/users-feature-music_on_hold.html
index d3985bd..cab9da3 100644
--- a/views/users-feature-music_on_hold.html
+++ b/views/users-feature-music_on_hold.html
@@ -20,21 +20,21 @@
 					<option value="{{this.id}}" {{#compare ../media '===' this.id}}selected{{/compare}}>{{this.name}}</option>
 				{{/each}}
 			</select>
-			<button type="button" class="btn btn-primary upload-toggle" data-toggle="button">
+			<button type="button" class="monster-button monster-button-primary non-fixed upload-toggle" data-toggle="button">
 				{{ i18n.upload }}
 			</button>
 		</div>
 		<div class="upload-div">
 			<input type="file" class="upload-input" accept="audio/*">
-			<button type="button" class="btn btn-success upload-action upload-submit"><i class="fa fa-upload"></i></button>
-			<button type="button" class="btn btn-danger upload-action upload-cancel"><i class="fa fa-times"></i></button>
+			<button type="button" class="monster-button monster-button-success non-fixed upload-action upload-submit"><i class="fa fa-upload"></i></button>
+			<button type="button" class="monster-button monster-button-danger non-fixed upload-action upload-cancel"><i class="fa fa-times"></i></button>
 		</div>
 	</div>
 
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/users-feature-vm_to_email.html b/views/users-feature-vm_to_email.html
index e4e8226..f083ed2 100644
--- a/views/users-feature-vm_to_email.html
+++ b/views/users-feature-vm_to_email.html
@@ -32,7 +32,7 @@
 	<div class="actions clearfix">
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-name.html b/views/users-name.html
index e80f67f..53ef3b6 100644
--- a/views/users-name.html
+++ b/views/users-name.html
@@ -116,7 +116,7 @@
 		</div>
 		<!--<div class="advanced-fields content-centered span3">
 			<a id="resend_instructions" href="javascript:void(0)">{{ i18n.users.resendInstructions }}</a>
-			<button type="button" id="reset_password" class="btn btn-primary">{{ i18n.users.resetPassword }}</button>
+			<button type="button" id="reset_password" class="monster-button monster-button-primary">{{ i18n.users.resetPassword }}</button>
 		</div>-->
 	</form>
 	<div class="actions">
@@ -127,7 +127,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-user">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-user">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-numbers.html b/views/users-numbers.html
index 1998371..4fd69bf 100644
--- a/views/users-numbers.html
+++ b/views/users-numbers.html
@@ -33,7 +33,7 @@
 						</div>
 					</div>
 					<div class="number">
-						<button type="button" class="btn btn-danger remove-number">{{ ../i18n.unassign }}</button>
+						<button type="button" class="monster-button monster-button-danger remove-number">{{ ../i18n.unassign }}</button>
 						{{ formatPhoneNumber this.phoneNumber }}
 					</div>
 					<!--<div class="locality">
@@ -69,7 +69,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save-numbers">{{ i18n.saveChanges }}</button>
+			<button type="button" class="monster-button monster-button-success save-numbers">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
 </div>
diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html
index a9665ce..be3c9b4 100644
--- a/views/users-numbersItemRow.html
+++ b/views/users-numbersItemRow.html
@@ -26,7 +26,7 @@
 		</div>
 	</div>
 	<div class="number">
-		<button type="button" class="btn btn-danger remove-number">{{ i18n.unassign }}</button>
+		<button type="button" class="monster-button monster-button-danger remove-number">{{ i18n.unassign }}</button>
 		{{ formatPhoneNumber number.phoneNumber }}
 	</div>
 </div>
diff --git a/views/users-rowSpareDevice.html b/views/users-rowSpareDevice.html
index 3216a9f..3dc7d4a 100644
--- a/views/users-rowSpareDevice.html
+++ b/views/users-rowSpareDevice.html
@@ -1,6 +1,6 @@
 <div class="item-row{{#if this.owner_id}} assigned{{/if}}" data-id="{{this.id}}">
 	<div class="device">
-		<button type="button" class="btn btn-danger remove-device">{{ i18n.unassign }}</button>
+		<button type="button" class="monster-button monster-button-danger remove-device">{{ i18n.unassign }}</button>
 		<a href="javascript:void(0);" class="edit-device-link monster-link">{{ this.name }}</a>
 	</div>
 </div>
diff --git a/views/vmboxes-edit.html b/views/vmboxes-edit.html
index cb48390..72ad5fc 100644
--- a/views/vmboxes-edit.html
+++ b/views/vmboxes-edit.html
@@ -157,7 +157,7 @@
 							<div class="create-inputs">
 								{{ i18n.vmboxes.popupSettings.recipients.email }}
 								<input type="text" id="entity_name" name="extra.entityName" class="input-medium">
-								<button id="add_entity" class="btn btn-success">{{ i18n.add }}</button>
+								<button id="add_entity" class="monster-button monster-button-success">{{ i18n.add }}</button>
 								<a href="javascript:void(0);" id="cancel_entity">{{ i18n.cancel }}</a>
 							</div>
 						</div>
@@ -177,7 +177,7 @@
 
 		<div class="pull-right">
 			<a class="cancel-link monster-link blue" href="javascript:void(0);">{{ i18n.cancel }}</a>
-			<button type="button" class="btn btn-success save">
+			<button type="button" class="monster-button monster-button-success save">
 				{{#if id}}
 					{{ i18n.saveChanges }}
 				{{else}}