diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css
index 86c7506..9fe5a8a 100644
--- a/submodules/devices/devices.css
+++ b/submodules/devices/devices.css
@@ -62,8 +62,8 @@
 	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 {
@@ -386,6 +386,12 @@
 	margin-right: 10px;
 }
 
+.voip-edit-device-popup .keys .fa {
+	display: inline-block;
+	padding-right: 15px;
+	cursor: move;
+}
+
 /* Codecs selector */
 .voip-edit-device-popup .edit-device .content .codec-selector .box-selector {
 	float: left;
@@ -429,4 +435,4 @@
 /* Special checkbox case */
 .voip-edit-device-popup .edit-device .form-horizontal .control-label.checkbox-basic {
 	margin-left: 160px;
-}
\ No newline at end of file
+}
diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index d1f9528..fc52678 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -337,6 +337,17 @@ define(function(require) {
 					});
 				});
 
+				templateDevice.find('.keys').sortable({
+					items: '.control-group',
+					update: function() {
+						templateDevice
+								.find('.feature-key-index')
+									.each(function(idx, el) {
+										$(el).text(idx + 1);
+									});
+					}
+				});
+
 				templateDevice
 					.find('.feature-key-index')
 						.each(function(idx, el) {
diff --git a/views/devices-sip_device.html b/views/devices-sip_device.html
index 7308062..48dbc35 100644
--- a/views/devices-sip_device.html
+++ b/views/devices-sip_device.html
@@ -306,6 +306,7 @@
 						{{/compare}}
 					{{/compare}}
 					<label for="provision.keys.{{../id}}[{{@key}}].type" class="control-label">
+						<i class="fa fa-reorder monster-gray"></i>
 						{{ ../label }} <span class="feature-key-index">{{@key}}</span>
 					</label>
 					<div class="controls">