diff --git a/erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg b/erpnext/docs/assets/img/setup/sms-setting2.jpg
similarity index 100%
rename from erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg
rename to erpnext/docs/assets/img/setup/sms-setting2.jpg
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/sms-settings1.png b/erpnext/docs/assets/img/setup/sms-settings1.png
new file mode 100644
index 0000000..8f70eb1
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/sms-settings1.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/sms-settings1.png b/erpnext/docs/assets/old_images/erpnext/sms-settings1.png
deleted file mode 100644
index 64678d0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/sms-settings1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
index 1aeb2d1..28110fa 100644
--- a/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/de/CRM/setup/customer-group.md
@@ -7,6 +7,6 @@
 
 > Tipp: Wenn Sie der Meinung sind, dass hier zu viel Aufwand getrieben wird, dann können Sie es bei einer Standard-Kundengruppe belassen. Aber der gesamte Aufwand wird sich dann auszahlen, wenn Sie die ersten Berichte erhalten. Ein Beispiel eines Berichts ist unten abgebildet.
 
-![Vertriebsanalyse]({{docs_base_url}}/assets/old_images/erpnext/sales-analytics-customer.png)
+<img class="screenshot" alt="Customer Group report" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif)">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/buying/purchase-order.md b/erpnext/docs/user/manual/de/buying/purchase-order.md
index 705dd8d..55a1cdb 100644
--- a/erpnext/docs/user/manual/de/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/de/buying/purchase-order.md
@@ -7,7 +7,7 @@
 
 ### Flußdiagramm der Lieferantenbestellung
 
-![Lieferantenauftrag]({{docs_base_url}}/assets/img/buying/purchase-order-f.jpg)
+<img class="screenshot" alt="Lieferantenauftrag" src="{{docs_base_url}}/assets/img/buying/purchase-order-f.jpg)">
 
 In ERPNext können Sie einen Lieferantenauftrag auch direkt erstellen über:
 
diff --git a/erpnext/docs/user/manual/de/buying/supplier-quotation.md b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
index 3295d38..1ec3ba7 100644
--- a/erpnext/docs/user/manual/de/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/de/buying/supplier-quotation.md
@@ -7,7 +7,7 @@
 
 ### Flußdiagramm zum Lieferantenangebot
 
-![Lieferantenangebot]({{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg)
+<img class="screenshot" alt="Lieferantenangebot" src="{{docs_base_url}}/assets/img/buying/supplier-quotation-f.jpg)">
 
 Sie können ein Lieferantenangebot auch direkt erstellen über:
 
diff --git a/erpnext/docs/user/manual/de/customer-portal/issues.md b/erpnext/docs/user/manual/de/customer-portal/issues.md
index 9650cca..bd3af17 100644
--- a/erpnext/docs/user/manual/de/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/de/customer-portal/issues.md
@@ -5,18 +5,17 @@
 
 ### Ticketliste leeren
 
-![Ticketliste]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png)
-
+<img class="screenshot" alt="Issue List" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png)">
 ### Neuer Fall
 
-![Neues Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png)
+<img class="screenshot" alt="New Issue " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png)">
 
 ### Fall öffnen
 
-![Fall eröffnen]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png)
+<img class="screenshot" alt="Issue Raised" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif)">
 
 ### Fall beantworten
 
-![Fall beantworten]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png)
+<img class="screenshot" alt="Issue reply" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif)">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/selling/sales-order.md b/erpnext/docs/user/manual/de/selling/sales-order.md
index bd9ddc4..6e478af 100644
--- a/erpnext/docs/user/manual/de/selling/sales-order.md
+++ b/erpnext/docs/user/manual/de/selling/sales-order.md
@@ -9,11 +9,9 @@
 
 ### Flußdiagramm des Kundenauftrags
 
-![Kundenauftrag]({{docs_base_url}}/assets/old_images/erpnext/sales-order-f.jpg)
+<img class="screenshot" alt="Kundenauftrag aus Angebot erstellen" src="{{docs_base_url}}/assets/img/selling/sales-order-f.jpg)">
 
-Um einen neuen Kundenauftrag zu erstellen gehen Sie zu:
-
-> Vertrieb > Kundenauftrag > Neuer Kundenauftrag
+Um einen neuen Kundenauftrag zu erstellen gehen Sie zu: > Vertrieb > Kundenauftrag > Neuer Kundenauftrag
 
 ### Einen Kundenauftrag aus einem Angebot erstellen
 
diff --git a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
index 7cbf0d8..d017d1a 100644
--- a/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/de/selling/setup/sales-partner.md
@@ -27,10 +27,7 @@
 
 https://example.erpnext.com/Partners
 
-![Auflistung der Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png)
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png)">
 
-Im Folgenden sehen Sie, wie die vollständigen Daten Ihres Partners auf der Webseite angezeigt werden.
-
-![Veröffentlichte Vertriebspartner]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png)
 
 {next}
diff --git a/erpnext/docs/user/manual/de/stock/material-request.md b/erpnext/docs/user/manual/de/stock/material-request.md
index f7f441b..4e18d5b 100644
--- a/erpnext/docs/user/manual/de/stock/material-request.md
+++ b/erpnext/docs/user/manual/de/stock/material-request.md
@@ -3,13 +3,13 @@
 
 Eine Materialanfrage ist ein einfaches Dokument, welches einen Bedarf an Artikeln (Produkte oder Dienstleistungen) für einen bestimmten Zweck erfasst.
 
-![Workflow]({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg)
+<img class="screenshot" alt="Materialanfrage" src="({{docs_base_url}}/assets/img/buying/material-request-workflow.jpg)">
 
 Um eine Materialanfrage manuell zu erstellen, gehen Sie bitte zu: 
 
 > Lagerbestand > Dokumente > Materialanfrage > Neu
 
-### Materialanfrage erstelle
+### Materialanfrage erstellen
 
 <img class="screenshot" alt="Materialanfrage" src="{{docs_base_url}}/assets/img/buying/material-request.png">
 
diff --git a/erpnext/docs/user/manual/de/stock/projected-quantity.md b/erpnext/docs/user/manual/de/stock/projected-quantity.md
index 18448be..cc75b55 100644
--- a/erpnext/docs/user/manual/de/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/de/stock/projected-quantity.md
@@ -7,7 +7,7 @@
 
 Eine strikte Kontrolle des projizierten Lagerbestandes ist entscheidend um Engpässe vorherzusagen und die richtige Bestellmenge kalkulieren zu können.
 
-![Bericht zur projizierten Menge]({{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png)
+<img class="screenshot" alt="Projected Quantity" src="{{docs_base_url}}/assets/img/stock/projected-quantity-stock-report.png)">
 
 > Projizierte Menge = Momentan vorhandene Menge + Geplante Menge + Angefragte Menge + Bestellte Menge - Reservierte Menge
 
diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 68608a7..c65a833 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -9,6 +9,6 @@
 Customer Group”. But all this effort, will pay off when you start getting
 reports. An example of a sample report is given below:
 
-![Sales Analytics]({{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif)
+<img class="screenshot" alt="Customer Group report" src="{{docs_base_url}}/assets/img/crm/sales-analytics-customer.gif)">
 
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
index 180ad3e..2a611aa 100644
--- a/erpnext/docs/user/manual/en/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -8,7 +8,7 @@
 > Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
 Master
 
-![Purchase-Taxes]({{docs_base_url}}/assets/img/buying/purchase-taxes.png)
+<img class="screenshot" alt="Purchase taxes" src="{{docs_base_url}}/assets/img/buying/purchase-taxes.png)">
 
 
 You can specify if the tax / charge is only for valuation (not a part of
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 257370e..c170d91 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -1,10 +1,19 @@
 ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
 
+<<<<<<< HEAD
 <img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
 
 Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
 
 <img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
+=======
+Once an order is raised, either using the Shopping Cart or from within
+ERPNext, your customer can view the order and keep an eye on the billing and
+shipment status. When the invoice and payment against these orders are
+submitted, the customer can see the updated status on the portal, at a glance.
+
+<img class="screenshot" alt="Customer Portal" src={{docs_base_url}}/assets/img/website/place-order.png)
+>>>>>>> Edited help page
 
 #### Outstanding Sales Invoice
 
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
index 31fec08..a441a45 100644
--- a/erpnext/docs/user/manual/en/customer-portal/issues.md
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -5,18 +5,18 @@
 
 #### Empty Issue List
 
-![Ticket List]({{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png)
+<img class="screenshot" alt="Issue List" src="{{docs_base_url}}/assets/img/website/portal-ticket-list-empty.png)">
 
 #### New Issue
 
-![New Ticket]({{docs_base_url}}/assets/img/website/portal-new-ticket.png)
+<img class="screenshot" alt="New Issue " src="{{docs_base_url}}/assets/img/website/portal-new-ticket.png)">
 
 #### Open Issue
 
-![Open Issue]({{docs_base_url}}/assets/img/website/portal-ticket-1.gif)
+<img class="screenshot" alt="Issue Raised" src="{{docs_base_url}}/assets/img/website/portal-ticket-1.gif)">
 
 #### Reply on Issue
 
-![Reply Issue]({{docs_base_url}}/assets/img/website/portal-ticket-reply.gif)
+<img class="screenshot" alt="Issue reply" src="{{docs_base_url}}/assets/img/website/portal-ticket-reply.gif)">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
index 5f74004..ccfa63a 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/kanban-board.md
@@ -8,35 +8,35 @@
 
 To  create a Kanban board in ERPNext click the Kanban dropdown on the sidebar, and select New Kanban Board.
 
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-1.png">
+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-1.png">
 
 ###Add new Card/Document
 
 To add Cards on Kanban Board click Add Tasks. You can Edit a card details by click on the card and it will take you to the Task Doctype where you can further add and edit card details.
 
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-2.png">
+<img class="screenshot" alt="Add card in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-2.png">
 
 ###Update Cards/Document Status
  
 Based on the Task status you can drag and drop the Cards in the respective column. For example if the task is work in progress you can move the card for the task from the status Open to Working.
  
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-3.gif">
+<img class="screenshot" alt="Move Cards on Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-3.gif">
 
 ###Manage Columns
  
 To add more columns in the Kanban board click Add columns.
 
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-4.gif">
+<img class="screenshot" alt="Add New column in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-4.gif">
  
 To move columns based on the priority drag and drop the columns as per requirement.
  
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-5.gif">
+<img class="screenshot" alt="Move columns in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-5.gif">
 
 To set Colors to a Card click drop down menu on the card and assign color to it.
 
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-6.gif">
+<img class="screenshot" alt="Add color to cards in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-6.gif">
  
 You can also Archive and Restore the columns added in a Kanban board. To do so click Archive in drop down menu on the card. Once archived you can restore the column from the list of the archived columns in the Kanban board.
 
-+<img class="screenshot" alt="Add New Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-7.gif">
+<img class="screenshot" alt="Archive and Restore in Kanban Board" src="{{docs_base_url}}/assets/img/customize/kanban-board-7.gif">
  
diff --git a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
index 4fbdf8e..1efed75 100644
--- a/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
+++ b/erpnext/docs/user/manual/en/selling/articles/Selling-in-different-UOM.md
@@ -7,7 +7,7 @@
 ###Step 1: In the Item master, under Unit of Measure section, you can list all the possible UoM of an item, with its UoM Conversion Factor. Update UoM Conversion Factors
 In one Box, if you get 10 Nos. of Pen, UoM Conversion Factor would be 10.
 
-+<img class="screenshot" alt="Item Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Item-UOM.png">
+<img class="screenshot" alt="Item Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Item-UOM.png">
 
 
 ###Setp 2: In the Sale Order, you will find two UoM fields
@@ -17,7 +17,7 @@
 
 In both the fields, default UoM of an item will be fetched by default. You should edit UoM field, and select Sale UoM (Box in this case).  Updating Sales UoM is mainly for the reference of the Customer. In the print format, you will see item quantity in the Sales UoM.
 
-+<img class="screenshot" alt="Sale order Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Sale-Order-UOM.png">
+<img class="screenshot" alt="Sale order Unit of Measure" src="{{docs_base_url}}/assets/img/selling/Sale-Order-UOM.png">
  
 Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you sell just one Box, then Qty as per stock UoM will be set as 10.
  
@@ -26,4 +26,4 @@
  
 Irrespective of the Sales UoM selected in the Sale Order, stock ledger posting will be done in the Default UoM of an item. Hence you should ensure that conversion factor is entered correctly while selling item in different UoM.
 
- +<img class="screenshot" alt="Stock report in UOM" src="{{docs_base_url}}/assets/img/selling/stock ledger for as STOCK-UOM.png">
+<img class="screenshot" alt="Stock report in UOM" src="{{docs_base_url}}/assets/img/selling/stock ledger for as STOCK-UOM.png">
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 18b84fd..aaf558d 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@
 
 ### Sales Order Flow-Chart
 
-![Sales Order]({{docs_base_url}}/assets/img/buying/sales-order-f.jpg)
+<img class="screenshot" alt="Sales Order flow" src="{{docs_base_url}}/assets/img/selling/{{docs_base_url}}/assets/img/buying/sales-order-f.jpg)">
 
 To create a new Sales Order go to:
 
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index 0495a1e..bd462d3 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -25,7 +25,7 @@
 
 https://example.erpnext.com/partners
 
-![Sales Partner Listing]({{docs_base_url}}/assets/img/crm/sales-partner-listing.png)
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/crm/sales-partner-listing.png)">
 
 
 {next}
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 258f4c6..4f12ee1 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -22,7 +22,8 @@
 
 If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation).
 
-![Sales Person Target Distribution]({{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif)
+
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/im/selling/sales-person-target-distribution.gif">
 
 ####Report - Sales Person Target Variance Item Groupwise
 
@@ -32,7 +33,8 @@
 
 This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
 
-![Sales Person Item Group Report]({{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png)
+
+<img class="screenshot" alt="Target Item Group" src="{{docs_base_url}}/assets/img/selling/sales-person-item-group-report.png">
 
 As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
 
@@ -48,7 +50,7 @@
 
 In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
 
-![Sales Person Territory Manager]({{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png)
+<img class="screenshot" alt="Sales Person Territory Manager" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-manager.png">
 
 ####2.2 Allocating Target
 
@@ -62,7 +64,7 @@
 
 This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
 
-![Sales Person Territory Report]({{docs_base_url}}/assets/img/selling/sales-person-territory-report.png)
+<img class="screenshot" alt="Sales Person Territory Report" src="{{docs_base_url}}/assets/img/selling/sales-person-territory-report.png">
 
 ---
 
@@ -74,7 +76,7 @@
 
 `Accounts > Monthly Distributon`
 
-![Target Distribution]({{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png)
+<img class="screenshot" alt="Target Distribution" src="{{docs_base_url}}/assets/img.selling/erpnext/target-distribution.png">
 
 You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.
 
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index 28bf0af..a5dd939 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -38,7 +38,8 @@
 <img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
 
 ### Download in Excel
-<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-excel.png">
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-excel.png">
 
 ### 3\. Upload the File ethier in .xlsx or .csv 
 
diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
index 4871ed1..5d44cb5 100644
--- a/erpnext/docs/user/manual/en/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
@@ -17,7 +17,8 @@
     http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
     
 
-![SMS Settings]({{docs_base_url}}/assets/old_images/erpnext/sms-setting2.jpg)
+<img class="screenshot" alt="SMS Setting 2" src="{{docs_base_url}}/assets/img/setup/sms-settings2.jpg">
+
 
 > Note: the string up to the "?" is the SMS Gateway URL
 
@@ -35,6 +36,6 @@
 from your SMS Provider like username, password etc. These static values should
 be entered in the Static Parameters table.
 
-![SMS Setting]({{docs_base_url}}/assets/old_images/erpnext/sms-settings1.png)
+<img class="screenshot" alt="SMS Setting" src="{{docs_base_url}}/assets/img/setup/sms-settings1.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 b3b7279..9bb2604 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -52,7 +52,11 @@
 
 ### Purchase Details
 
+<<<<<<< HEAD
 <img alt="Item Purchase Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
+=======
+<img class="screenshot" alt="Purchase details" src="{{docs_base_url}}/assets/img/stock/item-purchase.png">
+>>>>>>> Edited help page
 
 * **Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
 
@@ -72,9 +76,14 @@
 
 ### Sales Details
 
+<<<<<<< HEAD
 <img alt="Item Sales Details" class="screenshot" src="{{docs_base_url}}/assets/img/stock/item-sales.png">
 
 * **Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
+=======
+
+<img class="screenshot" alt="Sales details" src="{{docs_base_url}}/assets/img/stock/item-sales.png)">
+>>>>>>> Edited help page
 
 * **Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
 
@@ -82,7 +91,12 @@
 
 ### Manufacturing And Website
 
+<<<<<<< HEAD
 <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">
+>>>>>>> Edited 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.