diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php
index 45f30744ed..9931b7152b 100755
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -276,7 +276,7 @@ class ModelsController extends AdminController
     **/
     public function getView($modelId = null)
     {
-        $model = Model::find($modelId);
+        $model = Model::withTrashed()->find($modelId);
 
         if (isset($model->id)) {
                 return View::make('backend/models/view', compact('model'));
diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php
index 6f655b20e0..2772f5abf1 100755
--- a/app/controllers/admin/UsersController.php
+++ b/app/controllers/admin/UsersController.php
@@ -511,7 +511,7 @@ class UsersController extends AdminController
             }
         )
         ->addColumn('activated', function ($model) {
-                $activated = $model->isActivated() ? '<i class="fa fa-ok"></i>' : '';
+                $activated = $model->isActivated() ? '<i class="fa fa-check"></i>' : '';
                 return $activated;
             }
         )
diff --git a/app/lang/en/admin/models/general.php b/app/lang/en/admin/models/general.php
index b266ea7153..564f6b4fd3 100755
--- a/app/lang/en/admin/models/general.php
+++ b/app/lang/en/admin/models/general.php
@@ -2,6 +2,8 @@
 
 return array(
 
+    'deleted'  					=> 'This model has been deleted. <a href="/hardware/models/:model_id/restore">Click here to restore it</a>.',
+    'restore'                   => 'Restore Model',
 	'show_mac_address'			=> 'Show MAC address field in assets in this model',
     'view_deleted'              => 'View Deleted',
     'view_models'               => 'View Models',
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 85f02e95f3..e3be7fb6da 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -169,7 +169,9 @@
                 data-title="@lang('general.delete')
                  {{ htmlspecialchars($asset->asset_tag) }}?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>
         	@else
+                @if ($asset->model->deleted_at=='')
         		 <a href="{{ route('restore/hardware', $asset->id) }}" class="btn btn-warning"><i class="fa fa-recycle icon-white"></i></a>
+                @endif
         	@endif
 
             </td>
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index b5516338d2..17585ac587 100755
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -49,7 +49,7 @@
 
 		@if ($asset->deleted_at!='')
 			<div class="alert alert-warning alert-block">
-				<i class="icon-warning-sign"></i>
+				<i class="fa fa-warning"></i>
 				@lang('admin/hardware/general.deleted', array('asset_id' => $asset->id))
 
 			</div>
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php
index b86d954bed..e6b44effc6 100755
--- a/app/views/backend/models/view.blade.php
+++ b/app/views/backend/models/view.blade.php
@@ -20,7 +20,9 @@
             <ul class="dropdown-menu">
                     <li><a href="{{ route('update/model', $model->id) }}">@lang('admin/models/table.edit')</a></li>
                     <li><a href="{{ route('clone/model', $model->id) }}">@lang('admin/models/table.clone')</a></li>
+                @if ($model->deleted_at=='')
                     <li><a href="{{ route('create/hardware', $model->id) }}">@lang('admin/hardware/form.create')</a></li>
+                @endif
             </ul>
         </div>
         <h3>
@@ -35,6 +37,15 @@
 <div class="user-profile">
 <div class="row profile">
 <div class="col-md-9 bio">
+    
+    @if ($model->deleted_at!='')
+			<div class="alert alert-warning alert-block">
+				<i class="fa fa-warning"></i>
+				@lang('admin/models/general.deleted', array('model_id' => $model->id))
+
+			</div>
+
+		@endif
 
 
                             <!-- checked out models table -->
@@ -128,6 +139,11 @@
                                 @if ($model->image)
                                 <li><br /><img src="/uploads/models/{{{ $model->image }}}" /></li>
                                 @endif
+                                   
+                                @if  ($model->deleted_at!='')
+                                   <li><br /><a href="{{ route('restore/model', $model->id) }}" class="btn-flat large info ">@lang('admin/models/general.restore')</a></li>
+
+                    	@endif
 
                             </ul>