diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index 33b8e609a..eb3c46c44 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -672,7 +672,7 @@
                 <div class="col-sm-12" style="margin-top: 5px">
                   <label class="control-label text-left">Sysctls</label>
                   <span class="label label-default interactive" style="margin-left: 10px" ng-click="addSysctl()">
-                    <pr-icon icon="'plus'" mode="'alt'" feather="true"></pr-icon> add sysctl
+                    <pr-icon icon="'plus'" feather="true"></pr-icon> add sysctl
                   </span>
                 </div>
                 <!-- sysctls-input-list -->
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-panel.html b/app/portainer/components/environment-variables-panel/environment-variables-panel.html
index 06c0b7438..1bf871e43 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-panel.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-panel.html
@@ -18,14 +18,14 @@
         <a class="small interactive" ng-click="$ctrl.switchEnvMode()"> <i class="fa fa-list-ol space-right" aria-hidden="true"></i> Simple mode </a>
       </div>
       <div class="col-sm-12 small text-muted">
-        <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
+        <pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
         Switch to simple mode to define variables line by line, or load from .env file
       </div>
       <div class="form-group" style="margin-left: 1px">
         <code-editor identifier="environment-variables-editor" placeholder="e.g. key=value" value="$ctrl.editorText" yml="false" on-change="($ctrl.editorUpdate)"></code-editor>
       </div>
       <div class="col-sm-12 small text-muted" ng-if="$ctrl.showHelpMessage">
-        <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
+        <pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
         Environment changes will not take effect until redeployment occurs manually or via webhook.
       </div>
     </div>
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
index 2815e6196..80765b402 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
@@ -14,9 +14,9 @@
       />
     </div>
     <div class="form-group" style="margin-top: 5px" ng-show="$ctrl[$ctrl.formName].name.$invalid">
-      <div class="col-sm-12 small text-warning">
+      <div class="col-sm-12 small">
         <div ng-messages="$ctrl[$ctrl.formName].name.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Name is required. </p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Name is required. </p>
           <p ng-message="pattern">
             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
             This field must consist alphanumeric characters, '-' or '_', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-var', or 'MY_VAR123').
diff --git a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode.html b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode.html
index 68156f806..2d8c694fe 100644
--- a/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode.html
+++ b/app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode.html
@@ -1,13 +1,13 @@
 <div class="environment-variables-simple-mode">
   <div class="col-sm-12">
-    <a class="small interactive" ng-click="$ctrl.onSwitchModeClick()"> <i class="fa fa-list-ol space-right" aria-hidden="true"></i> Advanced mode </a>
+    <a class="small interactive" ng-click="$ctrl.onSwitchModeClick()"> <pr-icon icon="'list'" feather="true"></pr-icon> Advanced mode </a>
   </div>
   <div class="col-sm-12 small text-muted">
-    <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
+    <pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
     Switch to advanced mode to copy & paste multiple variables
   </div>
   <div class="col-sm-12 environment-variables-simple-mode--actions">
-    <button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.add()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> Add an environment variable </button>
+    <button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.add()"> <pr-icon icon="'plus'" feather="true"></pr-icon> Add an environment variable </button>
     <button
       type="button"
       class="btn btn-sm btn-default"
@@ -17,7 +17,7 @@
       ngf-max-size="1MB"
       ngf-model-invalid="errorFile"
     >
-      <i class="fa fa-file-upload" aria-hidden="true"></i> Load variables from .env file
+      <pr-icon icon="'upload'" feather="true"></pr-icon>
     </button>
     <span class="space-left" ng-if="errorFile.$error == 'maxSize'">
       <i class="fa fa-times red-icon space-right" aria-hidden="true"></i>
@@ -34,7 +34,7 @@
     ></environment-variables-simple-mode-item>
   </div>
   <div class="col-sm-12 small text-muted" ng-if="$ctrl.ngModel.length > 0 && $ctrl.showHelpMessage">
-    <i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
+    <pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
     Environment changes will not take effect until redeployment occurs manually or via webhook.
   </div>
 </div>