diff --git a/erpnext/docs/assets/old_images/erpnext/overview.png b/erpnext/docs/assets/img/setup/overview.png
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/overview.png
rename to erpnext/docs/assets/img/setup/overview.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/stock-reco-data.png b/erpnext/docs/assets/img/setup/stock-reco-data.png
new file mode 100644
index 0000000..98338e1
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/stock-reco-data.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/stock-reco-ledger.png b/erpnext/docs/assets/img/setup/stock-reco-ledger.png
new file mode 100644
index 0000000..aa4be32
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/stock-reco-ledger.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/stock-reco-upload.gif b/erpnext/docs/assets/img/setup/stock-reco-upload.gif
new file mode 100644
index 0000000..20ff7bb
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/stock-reco-upload.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-1.png b/erpnext/docs/assets/img/setup/workflow-1.png
index 7fd6f17..9a7283f 100644
--- a/erpnext/docs/assets/img/setup/workflow-1.png
+++ b/erpnext/docs/assets/img/setup/workflow-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-4.png b/erpnext/docs/assets/img/setup/workflow-4.png
index ee991f9..9faf4dd 100644
--- a/erpnext/docs/assets/img/setup/workflow-4.png
+++ b/erpnext/docs/assets/img/setup/workflow-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-5.png b/erpnext/docs/assets/img/setup/workflow-5.png
index ad360c6..8bf2cbf 100644
--- a/erpnext/docs/assets/img/setup/workflow-5.png
+++ b/erpnext/docs/assets/img/setup/workflow-5.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-leave-fl.jpg b/erpnext/docs/assets/img/setup/workflow-leave-fl.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/workflow-leave-fl.jpg
rename to erpnext/docs/assets/img/setup/workflow-leave-fl.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/item-manufacturing-and-website.png b/erpnext/docs/assets/img/stock/item-manufacturing-and-website.png
deleted file mode 100644
index 5fc5606..0000000
--- a/erpnext/docs/assets/img/stock/item-manufacturing-and-website.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/email-digest.png b/erpnext/docs/assets/old_images/erpnext/email-digest.png
deleted file mode 100644
index ac26e94..0000000
--- a/erpnext/docs/assets/old_images/erpnext/email-digest.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png b/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png
deleted file mode 100644
index 42fbe57..0000000
--- a/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png
deleted file mode 100644
index 50c027e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png
deleted file mode 100644
index 811689f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png
deleted file mode 100644
index 1c6d7d0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg b/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg
deleted file mode 100644
index 03c50de..0000000
--- a/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/third-party-backups.png b/erpnext/docs/assets/old_images/erpnext/third-party-backups.png
deleted file mode 100644
index 3bd10c8..0000000
--- a/erpnext/docs/assets/old_images/erpnext/third-party-backups.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png
deleted file mode 100644
index e0878a3..0000000
--- a/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png
deleted file mode 100644
index 80f3ecc..0000000
--- a/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png
deleted file mode 100644
index 26ff3e6..0000000
--- a/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/accounts/opening-accounts.md b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
index 47acaca..f264fc8 100644
--- a/erpnext/docs/user/manual/de/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/de/accounts/opening-accounts.md
@@ -38,15 +38,13 @@
 
 Vervollständigen Sie die Buchungssätze auf der Soll- und Haben-Seite.
 
-![Eröffnungsbuchung]({{docs_base_url}}/assets/old_images/erpnext/opening-entry-1.png)
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-6.png">
 
 Um einen Eröffnungsstand einzupflegen, erstellen Sie einen Buchungssatz für ein Konto oder eine Gruppe von Konten.
 
 Beispiel: Wenn Sie die Kontenstände von drei Bankkonten einpflegen möchten, dann erstellen Sie Buchungssätze der folgenden Art und Weise:
 
-![Eröffnungsbuchung]({{docs_base_url}}/assets/old_images/erpnext/image-temp-opening.png)
-
-![Eröffnungsbuchung]({{docs_base_url}}/assets/old_images/erpnext/opening-entry-2.png)
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-3.png">
 
 Um einen Ausgleich herzustellen, wird ein temporäres Konto für Vermögen und Verbindlichkeiten verwendet. Wenn Sie einen Anfangsbestand in einem Verbindlichkeitenkonto einpflegen, können Sie zum Ausgleich ein temporäres Vermögenskonto verwenden.
 
@@ -61,7 +59,8 @@
 
 Wenn Sie die Buchungen erstellt haben, schaut der Bericht zur Probebilanz in etwa wie folgt aus:
 
-![Probebilanz]({{docs_base_url}}/assets/old_images/erpnext/trial-balance-1.png)
+<img class="screenshot" alt="Probebilanz" src="{{docs_base_url}}/assets/img/accounts/opening-4.png">
+
 
 ### Offene Rechnungen
 
diff --git a/erpnext/docs/user/manual/de/introduction/key-workflows.md b/erpnext/docs/user/manual/de/introduction/key-workflows.md
index 7edd47b..ac5392c 100644
--- a/erpnext/docs/user/manual/de/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/de/introduction/key-workflows.md
@@ -3,10 +3,9 @@
 
 Dieses Diagramm stellt dar, wie ERPNext die Informationen und Vorgänge in Ihrem Unternehmen über Schlüsselfunktionen nachverfolgt. Dieses Diagramm gibt nicht alle Funktionalitäten von ERPNext wieder.
 
-![]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
 
+<img class="screenshot" alt="Hohe Auflösung" src="{{docs_base_url}}/assets/img/setup/overview.png">
 
-[Hohe Auflösung]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
 
 _Anmerkung: Nicht alle Schritte sind zwingend erforderlich. ERPNext erlaubt es Ihnen nach eigenem Gutdünken Schritte auszulassen, wenn Sie den Prozess vereinfachen wollen._
 
diff --git a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
index 28fa3cd..2796610 100644
--- a/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/de/manufacturing/subcontracting.md
@@ -11,7 +11,8 @@
 2. Erstellen Sie ein Lager für den Lieferanten, damit Sie die übergebenen Artikel nachverfolgen können (möglicherweise geben Sie ja Artikel im Wert einer Monatslieferung außer Haus).
 3. Stellen Sie für den bearbeiteten Artikel  und der Artikelvorlage den Punkt "Ist Fremdvergabe" auf JA ein.
 
-![Fremdvergabe]({{docs_base_url}}/assets/old_images/erpnext/subcontract.png)
+<img class="screenshot" alt="Fremdvergabe" src="{{docs_base_url}}/assets/img/manufacturing/subcontract.png">
+
 
 **Schritt 1:** Erstellen Sie für den bearbeiteten Artikel eine Stückliste, die den unbearbeiteten Artikel als Unterartikel enthält. Beispiel: Wenn Sie einen Stift herstellen, wird der bearbeitete Stift mit der Stückliste benannt, wbei der Tintentank, der Knopf und andere Artikel, die in die Fertigung eingehen als Unterartikel verwaltet werden.
 
diff --git a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
index 55f86ab..01f2281 100644
--- a/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/de/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -27,7 +27,7 @@
 
 #### Schritt 2: Geben Sie Daten in die CSV-Datei ein.
 
-![Lagerabgleichsdaten]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-data.png)
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-reco-data.png">
 
 Das CSV-Format beachtet Groß- und Kleinschreibung. Verändern Sie nicht die Kopfbezeichnungen, die in der Vorlage vordefiniert wurden. In den Spalten "Artikelnummer" und "Lager" geben Sie bitte die richtige Artikelnummer und das Lager ein, so wie es in ERPNext bezeichnet wird. Für die Menge geben Sie den Lagerbestand, den Sie für diesen Artikel erfassen wollen, in einem bestimmten Lager ein. Wenn Sie die Menge oder den wertmäßigen Betrag eines Artikels nicht ändern wollen, dann lassen Sie den Eintrag leer.
 Anmerkung: Geben Sie keine "0" ein, wenn sie die Menge oder den wertmäßigen Betrag nicht ändern wollen. Sonst kalkuliert das System eine Menge von "0". Lassen Sie also das Feld leer!
@@ -52,11 +52,12 @@
 
 #### Schritt 4: Überprüfen Sie die Daten zum Bestandsabgleich
 
-![Bestandsabgleich Überprüfung]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-upload.png)
+<img class="screenshot" alt="Bestandsabgleich Überprüfung" src="{{docs_base_url}}/assets/img/setup/stock-reco-upload.gif">
 
 ### Bericht zum Lagerbuch
 
-![Bestandsabgleich Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-ledger.png)
+<img class="screenshot" alt="Bestandsabgleich" src="{{docs_base_url}}/assets/img/setup/stock-reco-ledger.png">
+
 
 ##### So arbeitet der Bestandsabgleich
 
diff --git a/erpnext/docs/user/manual/de/setting-up/workflows.md b/erpnext/docs/user/manual/de/setting-up/workflows.md
index 5af2a07..7879a0a 100644
--- a/erpnext/docs/user/manual/de/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/de/setting-up/workflows.md
@@ -7,7 +7,7 @@
 
 Wenn ein Benutzer einen Urlaub beantragt, dann wird seine Anfrage an die Personalabteilung weiter geleitet. Die Personalabteilung, repräsentiert durch einen Mitarbeiter der Personalabteilung, wird diese Anfrage dann entweder genehmigen oder ablehnen. Wenn dieser Prozess abgeschlossen ist, dann bekommt der Vorgesetzte des Benutzers (der Urlaubsgenehmiger) eine Mitteilung, dass die Personalabteilung den Antrag genehmigt oder abgelehnt hat. Der Vorgesetzte, der die genehmigende Instanz ist, wird dann den Antrag entweder genehmigen oder ablehnen. Dementsprechend bekommt der Benutzer dann eine Genehmigung oder eine Ablehnung.
 
-![Workflow]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-fl.jpg)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-leave-fl.jpg">
 
 Um einen Workflow und Übergangsregeln zu erstellen, gehen Sie zu:
 
@@ -37,14 +37,14 @@
 
 Wenn ein Urlaubsantrag übertragen wird, steht der Status in der Ecke der rechten Seite auf "Beantragt".
 
-![Workflow Mitarbeiter LA]({{docs_base_url}}/assets/old_images/erpnext/workflow-employee-la.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-3.png">
 
 Wenn sich ein Mitarbeiter der Personalabteilung anmeldet, dann kann er den Antrag genehmigen oder ablehnen. Wenn eine Genehmigung erfolgt, wechselt der Status in der rechten Ecke zu "Genehmigt". Es wird jedoch ein blaues Informationssymbol angezeigt, welches aussagt, dass der Urlaubsantrag noch anhängig ist.
 
-![Urlaubsgenehmiger]({{docs_base_url}}/assets/old_images/erpnext/workflow-hr-user-la.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-4.png">
 
 Wenn der Urlaubsgenehmiger die Seite mit den Urlaubsanträgen öffnet, kann er den Status von "Genehmigt" auf "Abgelehnt" ändern.
 
-![Workflow Urlaubsgenehmiger]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-approver-la.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-5.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
index 8c8d6ec..bb03269 100644
--- a/erpnext/docs/user/manual/en/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md
@@ -6,7 +6,7 @@
 ![]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
 
 
-[Full Resolution]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/overview.png">
 
 _Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
 steps if you want to simplify the process._
diff --git a/erpnext/docs/user/manual/en/setting-up/email/.md b/erpnext/docs/user/manual/en/setting-up/email/.md
index feb724f..5e024b0 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md
@@ -91,5 +91,5 @@
 
 #### Figure 4: Set up Email Digest
 
-![Email Digest]({{docs_base_url}}/assets/old_images/erpnext/email-digest.png)
+<img class="screenshot" alt="Email Digest" src="{{docs_base_url}}/assets/img/setup/email/email-digest.png">
 
diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
index 630e247..743f398 100644
--- a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -31,7 +31,7 @@
 
 #### Step 2: Enter Data in csv file.
 
-![Stock Reco Data]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-data.png)
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-reco-data.png">
 
 The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
 
@@ -59,11 +59,12 @@
 
 #### Step 4: Review the reconciliation data
 
-![Stock Reco Review]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-upload.png)
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-reco-upload.gif">
 
 ### Stock Ledger Report
 
-![Stock Reco Ledger]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-ledger.png)
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup//stock-reco-ledger.png">
+
 
 **How Stock Reconciliation Works**
 
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index 5593a53..bedb6db 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -11,7 +11,7 @@
 Manager, who is the approving authority, will either Approve or Reject this
 request. Accordingly,the user will get his Approved or Rejected status.
 
-![Workflow]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-fl.jpg)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-leave-fl.jpg">
 
 To make this Workflow and transition rules go to :
 
@@ -46,15 +46,15 @@
 
 When a Leave Application is saved by Employee, the status of the document changes to "Applied"
 
-![Workflow Employee LA]({{docs_base_url}}/assets/img/setup/workflow-3.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-3.png">
 
 When the HR User logs in, he can either Approve or Reject. If approved the
 status of the document changes to "Approved by HR". However, it is yet to be approved by Leave Approver.
 
-![Leave Approver]({{docs_base_url}}/assets/img/setup/workflow-4.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-4.png">
 
 When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application.
 
-![Workflow Leave Approver]({{docs_base_url}}/assets/img/setup/workflow-5.png)
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-5.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index c0a96df..a68d673 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -85,9 +85,18 @@
 
 <img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
 
+<<<<<<< HEAD
 ### Manufacturing And Website
 
 <img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
+=======
+
+<img alt="Item Manfacturing and Website Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-and-website.png">
+=======
+
+<img class="screenshot" alt="Manufaturing details" src="{{docs_base_url}}/assets/img/stock/item-manufacturing-website.png">
+
+>>>>>>> Deleted old Images and added Global Search Help page
 
 Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
 
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
new file mode 100644
index 0000000..776c6e8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/Global-search.md
@@ -0,0 +1,16 @@
+Global-search.md
+
+
+Global search is a word-processing operation in which a complete computer file or set of files is searched for every occurrence of a particular word or other sequence of characters.
+
+We have made the Awesome Bar of ERPNext lot more powerful by adding Global Search feature. 
+Global Search helps users find information quickly. It’s located in the upper right-hand corner in ERPNext.  Simply entering a few characters in the Search will show results from several different record types (Contact, Customer, Issues etc.) related to that keyword. You can also customise the fields based on which search will be shown.
+
+### Using Awesome bar for Global Search.
+
+<img alt="Global Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Global Search .gif">
+
+### Enable Global Search for fields in a Doctype.
+
+<img alt="Global Search" class="screenshot" src="{{docs_base_url}}/assets/img/articles/Enable Global Search .gif">
+