diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
index a83b7e6c8..ccf574725 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
@@ -10,7 +10,7 @@ aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [
     </mat-form-field>
 
     <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)" [displayWith]="displayFn">
-        <mat-option *ngIf="searching" color="accent">
+        <mat-option *ngIf="searching" color="warn">
             <mat-spinner diameter="50"></mat-spinner>
         </mat-option>
         <ng-container *ngIf="!searching">
diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts
index 10fed25a4..41ca0e926 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts
@@ -58,6 +58,7 @@ export class NavSearchComponent implements OnInit {
   }
 
   public selected(event: MatAutocompleteSelectedEvent) {
+    this.searchForm.controls.input.setValue(null);
       const val = event.option.value as IMultiSearchResult;
     if (val.mediaType == "movie") {
       this.router.navigate([`details/movie/${val.id}`]);
diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
index 7af303f97..1d6b6f5d3 100644
--- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
@@ -7,14 +7,14 @@
     <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="allowNoPassword" name="allowNoPassword" formControlName="allowNoPassword">
-                    Allow users to login without a password</mat-checkbox>
+                    <mat-slide-toggle id="allowNoPassword" name="allowNoPassword" formControlName="allowNoPassword">
+                    Allow users to login without a password</mat-slide-toggle>
                 </div>
             </div>
 
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">Enable Plex OAuth</mat-checkbox>
+                    <mat-slide-toggle id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">Enable Plex OAuth</mat-slide-toggle>
                 </div>
             </div>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
index a096fd4ab..55f4a1b42 100644
--- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
@@ -32,14 +32,14 @@
             </div>
         </div>
         <div class="md-form-field">
-            <mat-checkbox [(ngModel)]="settings.hideAvailableFromDiscover" matTooltip="Any media content that is available will now be hidden on the discover page, the user still can search for it">
+            <mat-slide-toggle [(ngModel)]="settings.hideAvailableFromDiscover" matTooltip="Any media content that is available will now be hidden on the discover page, the user still can search for it">
                 Hide Available Content On The Discover Page
-            </mat-checkbox>
+            </mat-slide-toggle>
         </div>
         <div class="md-form-field">
-            <mat-checkbox [(ngModel)]="settings.enableCustomDonations" matTooltip="Enable to show a custom donation link in the navigation bar">
+            <mat-slide-toggle [(ngModel)]="settings.enableCustomDonations" matTooltip="Enable to show a custom donation link in the navigation bar">
                 Enable Custom Donation Link
-            </mat-checkbox>
+            </mat-slide-toggle>
         </div>
         <div class="md-form-field">
             <mat-form-field *ngIf="settings.enableCustomDonations" appearance="outline">
@@ -54,9 +54,9 @@
             </mat-form-field>
         </div>
         <div class="md-form-field">
-            <mat-checkbox [(ngModel)]="settings.useCustomPage" matTooltip="Enabled a custom page where you can fully edit. You will need the Edit Custom Page role.">
+            <mat-slide-toggle [(ngModel)]="settings.useCustomPage" matTooltip="Enabled a custom page where you can fully edit. You will need the Edit Custom Page role.">
                 Enable Custom Page
-            </mat-checkbox>
+            </mat-slide-toggle>
         </div>
         <div class="md-form-field">
             <mat-form-field appearance="outline"> 
diff --git a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
index d9ba9e342..702ca6915 100644
--- a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
@@ -9,21 +9,21 @@
         <div class="col-md-6">
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="enable" formControlName="enabled" ng-checked="form.enabled">
-                    Enable</mat-checkbox>
+                    <mat-slide-toggle id="enable" formControlName="enabled" ng-checked="form.enabled">
+                    Enable</mat-slide-toggle>
                 </div>
             </div>
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="enableInProgress" formControlName="enableInProgress" ng-checked="form.enableInProgress">
-                    Enable In Progress State</mat-checkbox>
+                    <mat-slide-toggle id="enableInProgress" formControlName="enableInProgress" ng-checked="form.enableInProgress">
+                    Enable In Progress State</mat-slide-toggle>
                 </div>
             </div>
 
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="deleteIssues" formControlName="deleteIssues" ng-checked="form.deleteIssues">
-                    Delete issues after they have been resolved</mat-checkbox>
+                    <mat-slide-toggle id="deleteIssues" formControlName="deleteIssues" ng-checked="form.deleteIssues">
+                    Delete issues after they have been resolved</mat-slide-toggle>
                 </div>
             </div>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
index a6c3f888d..91b923833 100644
--- a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
@@ -5,9 +5,9 @@
         <legend>Landing Page Configuration</legend>
         <div class="md-form-field" style="margin-top:1em;"></div>
         <div class="col-12">
-                <mat-checkbox [(ngModel)]="settings.enabled"> 
+                <mat-slide-toggle [(ngModel)]="settings.enabled"> 
                 Enable
-                </mat-checkbox>
+                </mat-slide-toggle>
             <!--<div class="form-group">
                 <div class="checkbox">
                     <input type="checkbox" id="enable" name="enable" [(ngModel)]="settings.enabled" ng-checked="settings.enabled">
@@ -15,11 +15,13 @@
                 </div>
             </div>-->
 
-            <p class="form-group">Notice Message</p>
             <div class="form-group">
                 <div>
-                    <textarea rows="4" type="text" class="form-control-custom form-control " id="NoticeMessage" name="NoticeMessage" placeholder="e.g. The server will be down for maintenance (HTML is allowed)" [(ngModel)]="settings.noticeText">{{settings.noticeText}}</textarea>
-                </div>
+                    <mat-form-field class="example-full-width">
+                        <mat-label>Notice Message</mat-label>
+                        <textarea matInput  rows="4" type="text" id="NoticeMessage" name="NoticeMessage" placeholder="e.g. The server will be down for maintenance (HTML is allowed)" [(ngModel)]="settings.noticeText">{{settings.noticeText}}</textarea>
+                      </mat-form-field>
+                    </div>
             </div>
 
             <p class="form-group">Notice Preview:</p>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
index c34f61687..a569a6ef4 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/cloudmobile.component.html
@@ -15,8 +15,8 @@
 
                             </th>
                             <td mat-cell *matCellDef="let row">
-                                <mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null" [checked]="selection.isSelected(row)">
-                                </mat-checkbox>
+                                <mat-slide-toggle (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null" [checked]="selection.isSelected(row)">
+                                </mat-slide-toggle>
                             </td>
                         </ng-container>
                         <ng-container matColumnDef="username">
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
index de484e726..80aeba34f 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
@@ -5,49 +5,52 @@
     <fieldset>
         <legend>Newsletter</legend>
         <div class="col-md-6">
+
                 <div class="form-group">
                     <div class="checkbox">
-                        <input type="checkbox" id="enabled" [(ngModel)]="settings.enabled" ng-checked="settings.enabled"><label for="enabled">Enable</label>
+                        <mat-slide-toggle  type="checkbox" id="enabled" [(ngModel)]="settings.enabled"  ng-checked="settings.enabled">Enable</mat-slide-toggle>
+                    </div>
+                </div>
+    
+                <div class="form-group">
+                    <div class="checkbox">
+                        <mat-slide-toggle  type="checkbox" id="disableTv" [(ngModel)]="settings.disableTv"  ng-checked="settings.disableTv">Disable TV</mat-slide-toggle>
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="checkbox">
-                        <input type="checkbox" id="disableTv" [(ngModel)]="settings.disableTv" ng-checked="settings.disableTv"><label for="disableTv">Disable TV</label>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <div class="checkbox">
-                        <input type="checkbox" id="disableMovies" [(ngModel)]="settings.disableMovies" ng-checked="settings.disableMovies"><label for="disableMovies">Disable Movies</label>
+                        <mat-slide-toggle  type="checkbox" id="disableMovies" [(ngModel)]="settings.disableMovies"  ng-checked="settings.disableMovies">Disable Movies</mat-slide-toggle>
                     </div>
                 </div>
 
                 <div class="form-group">
                     <div class="checkbox">
-                        <input type="checkbox" id="disableMusic" [(ngModel)]="settings.disableMusic" ng-checked="settings.disableMusic"><label for="disableMusic">Disable Music</label>
+                        <mat-slide-toggle  type="checkbox" id="disableMusic" [(ngModel)]="settings.disableMusic"  ng-checked="settings.disableMusic">Disable Music</mat-slide-toggle>
                     </div>
                 </div>
                  <div class="form-group">
-                    <label class="control-label">Subject</label>
-                    <div>
-                        <input type="text" class="form-control form-control-custom" [(ngModel)]="settings.notificationTemplate.subject" value="{{settings.notificationTemplate.subject}}">
-                    </div>
+                    <mat-form-field appearance="outline" floatLabel=auto>
+                        <mat-label>Subject</mat-label>
+                        <input matInput id="subject" name="subject"
+                        [(ngModel)]="settings.notificationTemplate.subject" value="{{settings.notificationTemplate.subject}}">
+                    </mat-form-field>
                 </div>
 
                 <div class="form-group">
-                    <label class="control-label">Message</label>
-                    <div>
-                        <textarea type="text" class="form-control form-control-custom" [(ngModel)]="settings.notificationTemplate.message" value="{{settings.notificationTemplate.message}}"></textarea>
-                    </div>
+                    <mat-form-field appearance="outline" floatLabel=auto>
+                        <mat-label>Message</mat-label>
+                        <textarea matInput id="message" name="message"
+                        [(ngModel)]="settings.notificationTemplate.message" value="{{settings.notificationTemplate.message}}"> </textarea>
+                    </mat-form-field>
                 </div>
 
                 <div class="form-group">
                     <div>
-                        <button type="submit" id="save" (click)="onSubmit()" class="btn btn-primary-outline">Submit</button>
-                        <button type="button" (click)="test()" class="btn btn-danger-outline">Test</button>
-                        <button type="button" (click)="updateDatabase()" class="btn btn-info-outline" tooltipPosition="top" pTooltip="I recommend running this with a fresh Ombi install, this will set all the current *found* content to have been sent via Newsletter, 
+                        <button mat-raised-button type="submit" id="save" (click)="onSubmit()" class="btn btn-primary-outline">Submit</button>
+                        <button mat-raised-button type="button" (click)="test()" class="btn btn-danger-outline">Test</button>
+                        <button mat-raised-button type="button" (click)="updateDatabase()" class="btn btn-info-outline" tooltipPosition="top" matTooltip="I recommend running this with a fresh Ombi install, this will set all the current *found* content to have been sent via Newsletter, 
                         if you do not do this then everything that Ombi has found in your libraries will go out on the first email!">Update Database</button>
-                        
-                        <button type="button" (click)="trigger()" class="btn btn-danger-outline">Trigger now</button>
+                        <button mat-raised-button type="button" (click)="trigger()" class="btn btn-danger-outline">Trigger now</button>
                     </div>
                                  </div>
         </div>
@@ -62,15 +65,15 @@
             <br/>
             <br/>
             <div class="form-group row">
-                <div class="col-md-12">
-                    <label for="emailToAdd" class="control-label">Add External Email (For users that are not in Ombi)</label>
-                </div>
                 <div class="col-md-9">
-                    <input type="text" [(ngModel)]="emailToAdd" class="form-control form-control-custom " id="emailToAdd" 
-                    email name="emailToAdd" value="{{emailToAdd}}">
+                    <mat-form-field appearance="outline" floatLabel=auto>
+                        <mat-label>Add External Email (For users that are not in Ombi)</mat-label>
+                        <input matInput id="emailToAdd" name="emailToAdd"
+                        [(ngModel)]="emailToAdd" value="{{emailToAdd}}">
+                    </mat-form-field>
                 </div>
                 <div class="col-md-3">
-                    <button class="btn btn-primary-outline" (click)="addEmail()" pTooltip="Don't forget to press the Submit button!">Add</button>
+                    <button mat-raised-button class="btn btn-primary-outline" (click)="addEmail()" matTooltip="Don't forget to press the Submit button!">Add</button>
                 </div>
             </div>
 
@@ -80,7 +83,7 @@
                         {{email}}
                     </div>
                     <div class="col-md-3">
-                        <button class="btn btn-sm btn-danger-outline" (click)="deleteEmail(email)">Delete</button>
+                        <button mat-raised-button class="btn btn-sm btn-danger-outline" (click)="deleteEmail(email)">Delete</button>
                     </div>
                 </div>
             </div>
diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
index 9932e137e..63d9ce2a1 100644
--- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
@@ -18,27 +18,22 @@
                     <button type="button" matSuffix (click)="refreshApiKey()" style="display:inline-block;">
                         <mat-icon class="fa fa-refresh"></mat-icon>
                     </button>
-                    <!-- THIS IS NOT WORKING
-                    <button type="button" mat-icon-button matSuffix [cdkCopyToClipboard]="apiKey" style="display:inline-block">
-                    
-                        <mat-icon class="fa fa-clipboard"></mat-icon>
-                    </button> -->
 
                 </mat-form-field>
             </div>
             <div>
-                <mat-checkbox formControlName="doNotSendNotificationsForAutoApprove">
-                    Do not send Notifications if a User has the Auto Approve permission</mat-checkbox>
+                <mat-slide-toggle formControlName="doNotSendNotificationsForAutoApprove">
+                    Do not send Notifications if a User has the Auto Approve permission</mat-slide-toggle>
             </div>
             <div>
-                <mat-checkbox formControlName="hideRequestsUsers">
+                <mat-slide-toggle formControlName="hideRequestsUsers">
                     Hide requests from other users
-                </mat-checkbox>
+                </mat-slide-toggle>
             </div>
             <div>
-                <mat-checkbox formControlName="autoDeleteAvailableRequests">
+                <mat-slide-toggle formControlName="autoDeleteAvailableRequests">
                     Auto Delete Available Requests
-                </mat-checkbox>
+                </mat-slide-toggle>
             </div>
             <div *ngIf="form.get('autoDeleteAvailableRequests').value">
                 <mat-form-field appearance="outline" >
@@ -47,20 +42,20 @@
                 </mat-form-field>
             </div>
             <div>
-                <mat-checkbox formControlName="ignoreCertificateErrors" matTooltip="Enable if you are having connectivity problems over SSL">
+                <mat-slide-toggle formControlName="ignoreCertificateErrors" matTooltip="Enable if you are having connectivity problems over SSL">
                     Ignore any certificate errors (Please restart after changing)
-                </mat-checkbox>
+                </mat-slide-toggle>
             </div>
             <div>
-                <mat-checkbox formControlName="collectAnalyticData" matTooltip="This will allow us to have a better understanding of the userbase so we know what we should be supporting (Uses Google Analytics)">
+                <mat-slide-toggle formControlName="collectAnalyticData" matTooltip="This will allow us to have a better understanding of the userbase so we know what we should be supporting (Uses Google Analytics)">
                     Allow us to collect anonymous analytical data e.g. browser used
-                </mat-checkbox>
+                </mat-slide-toggle>
             </div>
             <!-- <div>
-                <mat-checkbox formControlName="disableHealthChecks">
+                <mat-slide-toggle formControlName="disableHealthChecks">
                     Disable the health checks page
                     <a href="/healthchecks-ui" target="_blank">/healthchecks-ui</a>
-                </mat-checkbox>
+                </mat-slide-toggle>
             </div> -->
             <div>
                 <mat-form-field *ngIf="langauges">
diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html
index 1ad5d445a..57f25a1c4 100644
--- a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-Upgraded    <fieldset *ngIf="settings">
+    <fieldset *ngIf="settings">
         <legend>The Movie Database</legend>
         <div class="md-form-field" style="margin-top:1em;">
             <div class="form-group">
diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
index c8365eead..870bd45ae 100644
--- a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
@@ -9,13 +9,13 @@
 
             <div class="form-group">
                 <div>
-                    <mat-checkbox id="importPlex" [(ngModel)]="settings.importPlexUsers">
-                    Import Plex Users</mat-checkbox>
+                    <mat-slide-toggle id="importPlex" [(ngModel)]="settings.importPlexUsers">
+                    Import Plex Users</mat-slide-toggle>
                 </div>
             </div>
             
             <div class="form-group">
-                <mat-checkbox id="importAdmin" [(ngModel)]="settings.importPlexAdmin">Import Plex Admin</mat-checkbox>
+                <mat-slide-toggle id="importAdmin" [(ngModel)]="settings.importPlexAdmin">Import Plex Admin</mat-slide-toggle>
                 </div>
             <div *ngIf="plexUsers">
                 <p>Plex Users excluded from Import</p>
@@ -25,7 +25,7 @@
         </div>
         <div *ngIf="embyEnabled">
             <div class="form-group">
-                <mat-checkbox id="importEmbyUsers" [(ngModel)]="settings.importEmbyUsers">Import Emby Users</mat-checkbox>
+                <mat-slide-toggle id="importEmbyUsers" [(ngModel)]="settings.importEmbyUsers">Import Emby Users</mat-slide-toggle>
             </div>
             
             <div *ngIf="embyUsers">
@@ -42,8 +42,8 @@
         <div *ngFor="let c of claims">
             <div class="form-group">
                 <div>
-                    <mat-checkbox [(ngModel)]="c.enabled" [value]="c.value" id="create{{c.value}}" [attr.name]="'create' + c.value" ng-checked="c.enabled">
-                    {{c.value | humanize}}</mat-checkbox>
+                    <mat-slide-toggle [(ngModel)]="c.enabled" [value]="c.value" id="create{{c.value}}" [attr.name]="'create' + c.value" ng-checked="c.enabled">
+                    {{c.value | humanize}}</mat-slide-toggle>
                 </div>
             </div>
         </div>
diff --git a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
index c8a0b5d25..a556fa048 100644
--- a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
@@ -8,7 +8,7 @@
         <div class="md-form-field" style="margin-top:1em;"></div>
             <div class="form-group">
                 <div class="checkbox">
-                    <mat-checkbox id="enable" formControlName="enabled" ng-checked="form.enabled">Enable</mat-checkbox>
+                    <mat-slide-toggle id="enable" formControlName="enabled" ng-checked="form.enabled">Enable</mat-slide-toggle>
                 </div>
             </div>