diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index 887158f..5eace64 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.css
@@ -220,11 +220,11 @@
 .edit-device .title-bar .device-title .device-icon {
 	height: 75px;
 	line-height: 75px;
-	padding-top: 5px;
 }
 
 .edit-device .title-bar .device-title .device-icon > i {
 	font-size: 48px;
+	vertical-align: middle;
 }
 
 .edit-device .title-bar .device-title .device-image {
@@ -258,6 +258,24 @@
 	font-weight: bold;
 }
 
+.edit-device .restriction-matcher-div {
+	margin-right: 50px;
+	float: right;
+}
+
+.edit-device .restriction-matcher-input {
+	width: 120px;
+	margin-right: 10px;
+	margin-left: 5px;
+}
+
+.edit-device .restriction-matcher-label {
+	line-height: 30px;
+	margin-right: 50px;
+	float: right;
+	display: none;
+}
+
 /* Codecs selector */
 .edit-device .content .codec-selector .box-selector {
 	float: left;
diff --git a/views/devices-ata.html b/views/devices-ata.html
index 06a71e8..e585c19 100644
--- a/views/devices-ata.html
+++ b/views/devices-ata.html
@@ -91,7 +91,7 @@
 				<div class="restriction-matcher-div">
 					<i class="help-popover icon-question-sign icon-large" 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="restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+					<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 				</div>
 				<div class="title">
 					{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
diff --git a/views/devices-fax.html b/views/devices-fax.html
index a5f3c51..5bf0517 100644
--- a/views/devices-fax.html
+++ b/views/devices-fax.html
@@ -102,7 +102,7 @@
 				<div class="restriction-matcher-div">
 					<i class="help-popover icon-question-sign icon-large" 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="restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+					<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 				</div>
 				<div class="title">
 					{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index eb44f09..c6f0453 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -161,7 +161,7 @@
 				<div class="restriction-matcher-div">
 					<i class="help-popover icon-question-sign icon-large" 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="restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+					<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 				</div>
 				<div class="title">
 					{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
diff --git a/views/devices-smartphone.html b/views/devices-smartphone.html
index 35773ea..5888acf 100644
--- a/views/devices-smartphone.html
+++ b/views/devices-smartphone.html
@@ -153,7 +153,7 @@
 				<div class="restriction-matcher-div">
 					<i class="help-popover icon-question-sign icon-large" 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="restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+					<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 				</div>
 				<div class="title">
 					{{ i18n.devices.popupSettings.restrictions.sectionTitle }}
diff --git a/views/devices-softphone.html b/views/devices-softphone.html
index 8a0bd92..48851b4 100644
--- a/views/devices-softphone.html
+++ b/views/devices-softphone.html
@@ -118,7 +118,7 @@
 				<div class="restriction-matcher-div">
 					<i class="help-popover icon-question-sign icon-large" 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="restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
+					<button type="button"  class="btn btn-primary restriction-matcher-button">{{i18n.devices.popupSettings.restrictions.matcher.button}}</button>
 				</div>
 				<div class="title">
 					{{ i18n.devices.popupSettings.restrictions.sectionTitle }}