diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css
index c385df4..26e2183 100644
--- a/app/styles/aria-ng.css
+++ b/app/styles/aria-ng.css
@@ -359,6 +359,14 @@ td {
     color: #208fe5;
 }
 
+.skin-aria-ng .has-success .input-group .input-group-addon {
+    border-color: #00a65a;
+}
+
+.skin-aria-ng .has-error .input-group .input-group-addon {
+    border-color: #dd4b39;
+}
+
 /* font-awesome extend */
 .fa-half {
     font-size: 0.5em;
@@ -696,10 +704,14 @@ td {
     color: #3c8dbc;
 }
 
-.settings-table .setting-value .form-group .form-control-feedback {
+.settings-table .setting-value .form-group select.form-control + .form-control-icon > .form-control-feedback {
     right: 10px;
 }
 
+.settings-table .setting-value .input-group .form-group .form-control:focus {
+    z-index: inherit;
+}
+
 .settings-table .tip {
     background-color: #fff !important;
     font-size: 12px;
diff --git a/app/views/setting.html b/app/views/setting.html
index 6ef7bd7..9f2cabe 100644
--- a/app/views/setting.html
+++ b/app/views/setting.html
@@ -8,35 +8,24 @@
               ng-bind="'format.settings.total-count' | translate: {count: getTotalCount()}"></span>
     </div>
     <div class="setting-value col-sm-8">
-        <div ng-class="{'input-group': option.suffix}">
-            <div class="form-group" ng-if="option.type == 'string' || option.type == 'integer' || option.type == 'float'" ng-class="[optionStatus.getStatusFeedbackStyle()]">
-                <div class="has-feedback">
-                    <input class="form-control" type="text" ng-disabled="!!option.readonly" ng-model="optionValue" ng-change="changeValue(optionValue, true)"/>
-                    <div class="form-control-icon" ng-if="optionStatus.isShowStatusIcon()">
-                        <span class="fa form-control-feedback" ng-class="[optionStatus.getStatusIcon()]"></span>
-                    </div>
+        <div ng-class="{'input-group': !!option.suffix}">
+            <div class="form-group has-feedback" ng-class="[optionStatus.getStatusFeedbackStyle()]">
+                <input class="form-control" type="text" ng-disabled="!!option.readonly"
+                       ng-if="option.type == 'string' || option.type == 'integer' || option.type == 'float'"
+                       ng-model="optionValue" ng-change="changeValue(optionValue, true)"/>
+                <textarea class="form-control" rows="6" ng-disabled="!!option.readonly"
+                          ng-if="option.type == 'text'"
+                          ng-model="optionValue" ng-change="changeValue(optionValue, true)"></textarea>
+                <select class="form-control" style="width: 100%;" ng-disabled="!!option.readonly"
+                        ng-if="option.type == 'boolean' || option.type == 'option'"
+                        ng-model="optionValue" ng-change="changeValue(optionValue, false)"
+                        ng-options="item.value as (item.name | translate) for item in option.options">
+                </select>
+                <div class="form-control-icon" ng-if="optionStatus.isShowStatusIcon()">
+                    <span class="fa form-control-feedback" ng-class="[optionStatus.getStatusIcon()]"></span>
                 </div>
             </div>
-            <div class="form-group" ng-if="option.type == 'text'" ng-class="[optionStatus.getStatusFeedbackStyle()]">
-                <div class="has-feedback">
-                    <textarea class="form-control" rows="6" ng-disabled="!!option.readonly" ng-model="optionValue" ng-change="changeValue(optionValue, true)"></textarea>
-                    <div class="form-control-icon" ng-if="optionStatus.isShowStatusIcon()">
-                        <span class="fa form-control-feedback" ng-class="[optionStatus.getStatusIcon()]"></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group" ng-if="option.type == 'boolean' || option.type == 'option'" ng-class="[optionStatus.getStatusFeedbackStyle()]">
-                <div class="has-feedback">
-                    <select class="form-control" style="width: 100%;" ng-disabled="!!option.readonly"
-                            ng-model="optionValue" ng-change="changeValue(optionValue, false)"
-                            ng-options="value.value as (value.name | translate) for value in option.options">
-                    </select>
-                    <div class="form-control-icon" ng-if="optionStatus.isShowStatusIcon()">
-                        <span class="fa form-control-feedback" ng-class="[optionStatus.getStatusIcon()]"></span>
-                    </div>
-                </div>
-            </div>
-            <span class="input-group-addon" ng-if="option.suffix" ng-bind="option.suffix | translate"></span>
+            <span class="input-group-addon" ng-if="!!option.suffix" ng-bind="option.suffix | translate"></span>
         </div>
     </div>
 </div>