diff --git a/app/docker/components/volumesCIFSForm/volumesCifsForm.html b/app/docker/components/volumesCIFSForm/volumesCifsForm.html
index 45c6f7450..3ef69a017 100644
--- a/app/docker/components/volumesCIFSForm/volumesCifsForm.html
+++ b/app/docker/components/volumesCIFSForm/volumesCifsForm.html
@@ -10,9 +10,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_address.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="cifsInformationForm.cifs_address.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -25,9 +25,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_share.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="cifsInformationForm.cifs_share.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -40,9 +40,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_version.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="cifsInformationForm.cifs_version.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -55,9 +55,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_username.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="cifsInformationForm.cifs_username.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -70,9 +70,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="cifsInformationForm.password.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="cifsInformationForm.cifs_password.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
diff --git a/app/docker/components/volumesNFSForm/volumesnfsForm.html b/app/docker/components/volumesNFSForm/volumesnfsForm.html
index db68c3d6c..822702ea4 100644
--- a/app/docker/components/volumesNFSForm/volumesnfsForm.html
+++ b/app/docker/components/volumesNFSForm/volumesnfsForm.html
@@ -10,9 +10,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_address.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="nfsInformationForm.nfs_address.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -25,9 +25,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_version.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="nfsInformationForm.nfs_version.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -47,9 +47,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_mountpoint.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="nfsInformationForm.nfs_mountpoint.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
@@ -65,9 +65,9 @@
       </div>
     </div>
     <div class="form-group col-md-12" ng-show="nfsInformationForm.nfs_options.$invalid">
-      <div class="small text-warning">
+      <div class="small">
         <div ng-messages="nfsInformationForm.nfs_options.$error">
-          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+          <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
         </div>
       </div>
     </div>
diff --git a/app/docker/views/containers/console/attach.html b/app/docker/views/containers/console/attach.html
index a142040a4..38ac09cb7 100644
--- a/app/docker/views/containers/console/attach.html
+++ b/app/docker/views/containers/console/attach.html
@@ -15,16 +15,16 @@
     <rd-widget>
       <rd-widget-header icon="terminal" feather-icon="true" title-text="Attach"></rd-widget-header>
       <rd-widget-body>
-        <div class="small text-warning" ng-if="!container.Config.OpenStdin">
+        <div class="small" ng-if="!container.Config.OpenStdin">
           <p>
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
             The interactive-flag is not set. You might not be able to use the console properly.
           </p>
         </div>
 
-        <div class="small text-warning" ng-if="!container.Config.Tty">
+        <div class="small" ng-if="!container.Config.Tty">
           <p>
-            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+            <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
             The TTY-flag is not set. You might not be able to use the console properly.
           </p>
         </div>
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 8a4836b00..b7c1a8734 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -266,7 +266,7 @@
                             <span class="input-group-addon">container</span>
                             <input type="text" class="form-control" ng-model="volume.Target" placeholder="e.g. /path/in/container" />
                           </div>
-                          <div class="small text-warning" ng-show="!volume.Target"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target is required. </div>
+                          <div class="small" ng-show="!volume.Target"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target is required. </div>
                         </div>
                         <!-- !container-path -->
                         <!-- volume-type -->
@@ -299,7 +299,7 @@
                               <option selected disabled value="">Select a volume</option>
                             </select>
                           </div>
-                          <div class="small text-warning" ng-show="!volume.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
+                          <div class="small" ng-show="!volume.Source"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Source is required. </div>
                         </div>
                         <!-- !volume -->
                         <!-- bind -->
@@ -308,7 +308,7 @@
                             <span class="input-group-addon">host</span>
                             <input type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host" />
                           </div>
-                          <div class="small text-warning" ng-show="!volume.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
+                          <div class="small" ng-show="!volume.Source"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Source is required. </div>
                         </div>
                         <!-- !bind -->
                         <!-- read-only -->
diff --git a/app/docker/views/services/create/includes/config.html b/app/docker/views/services/create/includes/config.html
index b4fa82f2f..2c46fbe86 100644
--- a/app/docker/views/services/create/includes/config.html
+++ b/app/docker/views/services/create/includes/config.html
@@ -6,8 +6,8 @@
     </div>
     <!-- info message -->
     <div class="form-group" ng-show="formValues.Configs.$invalid" style="margin-bottom: 0px">
-      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px">
-        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{ formValues.Configs.$error }}
+      <div class="col-sm-12 small" style="padding-left: 35px; padding-top: 20px">
+        <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> {{ formValues.Configs.$error }}
       </div>
     </div>
     <div class="col-sm-12 form-inline" style="margin-top: 10px">
diff --git a/app/docker/views/services/create/includes/secret.html b/app/docker/views/services/create/includes/secret.html
index fb7ce1a8a..18d9659eb 100644
--- a/app/docker/views/services/create/includes/secret.html
+++ b/app/docker/views/services/create/includes/secret.html
@@ -12,8 +12,8 @@
     </div>
     <!-- info message -->
     <div class="form-group" ng-show="formValues.Secrets.$invalid" style="margin-bottom: 0px">
-      <div class="col-sm-12 small text-warning" style="padding-left: 35px; padding-top: 20px">
-        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {{ formValues.Secrets.$error }}
+      <div class="col-sm-12 small" style="padding-left: 35px; padding-top: 20px">
+        <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> {{ formValues.Secrets.$error }}
       </div>
     </div>
     <div class="col-sm-12 form-inline" style="margin-top: 10px">
diff --git a/app/docker/views/services/edit/includes/mounts.html b/app/docker/views/services/edit/includes/mounts.html
index 22346e690..ffe808343 100644
--- a/app/docker/views/services/edit/includes/mounts.html
+++ b/app/docker/views/services/edit/includes/mounts.html
@@ -57,7 +57,7 @@
                 ng-disabled="isUpdating || (!isAdmin && !allowBindMounts && mount.Type === 'bind')"
                 ng-if="mount.Type === 'bind'"
               />
-              <div class="col-sm-12 small text-warning" ng-show="!mount.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
+              <div class="col-sm-12 small" ng-show="!mount.Source"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Source is required. </div>
             </td>
             <td>
               <input
@@ -69,7 +69,7 @@
                 ng-disabled="isUpdating"
                 disable-authorization="DockerServiceUpdate"
               />
-              <div class="col-sm-12 small text-warning" ng-show="!mount.Target"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target is required. </div>
+              <div class="col-sm-12 small" ng-show="!mount.Target"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target is required. </div>
             </td>
             <td authorization="DockerServiceUpdate">
               <input type="checkbox" class="form-control" ng-model="mount.ReadOnly" ng-change="updateMount(service, mount)" ng-disabled="isUpdating" />