diff --git a/erpnext/docs/assets/img/accounts/chart-of-cost-center.png b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
new file mode 100644
index 0000000..7e36be2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-login.png b/erpnext/docs/assets/img/website/website-login.png
index 6943098..ba57937 100644
--- a/erpnext/docs/assets/img/website/website-login.png
+++ b/erpnext/docs/assets/img/website/website-login.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-signup-details.png b/erpnext/docs/assets/img/website/website-signup-details.png
new file mode 100644
index 0000000..aa96d7f
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-signup-details.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png b/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
deleted file mode 100644
index ff14072..0000000
--- a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png b/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
deleted file mode 100644
index 6791d32..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png b/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
deleted file mode 100644
index 6eacdf1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
deleted file mode 100644
index 459d503..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
deleted file mode 100644
index f7ff81b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
deleted file mode 100644
index 7693877..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
deleted file mode 100644
index 771de78..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png b/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
deleted file mode 100644
index d3e1143..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png b/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
deleted file mode 100644
index 0993cb5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-menu.png b/erpnext/docs/assets/old_images/erpnext/portal-menu.png
deleted file mode 100644
index 0f9ea82..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-menu.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png b/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
deleted file mode 100644
index e92e8dc..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index 6b8459e..c74029b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -4,18 +4,18 @@
 Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
 Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
 
-![Portalmenü]({{docs_base_url}}/assets/old_images/erpnext/portal-menu.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
 
 Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
 
-![Kundenportal]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-orders-1.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 ### Rechnung mit Status "gezahlt"
 
-![Rechnung gezahlt]({{docs_base_url}}/assets/old_images/erpnext/portal-invoice-paid.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
 
 ### Rechnung mit Status "abgerechnet"
 
-![Rechnung berechnet]({{docs_base_url}}/assets/old_images/erpnext/portal-order-billed.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
index d5cc22e..455dfac 100644
--- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
 
 Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
 
-![Login]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-login.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
index 5ffc307..0a91145 100644
--- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
@@ -1,20 +1,17 @@
 # Registrieren
+
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
 Kunden müssen sich über die Webseite als Kunden registrieren.
 
-### Schritt 1: Klicken Sie auf das Login-Symbol
+### Schritt 1: Klicken Sie auf das Registrieren-Symbol
 
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-1.png)
-
-### Schritt 2: Klicken Sie auf das Registrieren-Symbol
-
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-2.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 ### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein
 
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-3.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
 
 Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
 
-{next}
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index 25c40e1..feeb7d9 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -28,31 +28,31 @@
 
 Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
 
-![Dokument mit benutzerdefiniertem Feld]({{docs_base_url}}/assets/old_images/erpnext/custom-field-document.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-1.gif">
 
 ### Feldbezeichnung einstellen
 
 Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
 
-![Bezeichnung des benutzerdefinierten Feldes]({{docs_base_url}}/assets/old_images/erpnext/custom-field-label.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
 
 ### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach")
 
 Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen.
 
-![Benutzerdefiniertes Feld einfügen]({{docs_base_url}}/assets/old_images/erpnext/custom-field-insert.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-3.png">
 
 ### Feldtyp auswählen
 
 Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
 
-![Typ des benutzerdefinierten Feldes]({{docs_base_url}}/assets/old_images/erpnext/custom-field-type.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-4.png">
 
 ### Optionen einstellen
 
 Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
 
-![Verknüpfung mit einem benutzerdefinierten Feld]({{docs_base_url}}/assets/old_images/erpnext/custom-field-link.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
 
 Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
 
@@ -71,7 +71,7 @@
 5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
 6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
 
-![Eigenschaften von benutzerdefinierten Feldern]({{docs_base_url}}/assets/old_images/erpnext/custom-field-properties.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-6.png">
 
 ### Benutzerdefiniertes Feld löschen
 
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 16b5431..5ed3802 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -32,6 +32,6 @@
 
 > Accounts > Setup > Chart of Cost Centers
 
-![Chart of Cost Center]({{docs_base_url}}/assets/old_images/erpnext/chart-of-cost-centers.png)
+<img class="screenshot" alt="Cost Center" src="{{docs_base_url}}/assets/img/chart-of-cost-center.png">
 
 {next}
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 83d7bf6..257370e 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,22 +1,17 @@
-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.
+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.
 
-![Portal Menu]({{docs_base_url}}/assets/old_images/erpnext/portal-menu.png)
+<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.
+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.
 
-![Customer Portal]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-orders-1.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
-#### Invoice with paid status.
+#### Outstanding Sales Invoice
 
-![Invoice Paid]({{docs_base_url}}/assets/old_images/erpnext/portal-invoice-paid.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
 
-#### Invoice with billed status.
+#### Paid Sales Invoice
 
-![Billed Invoice]({{docs_base_url}}/assets/old_images/erpnext/portal-order-billed.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 43c2f08..554285c 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -1,22 +1,15 @@
-Customers have to log-in to the Company Website, and sign-up as a customer.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
 
-#### Step 1: Click on Login Icon
+#### Step 1: Signup
 
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-1.png)
+On the Login Page, you will find option to Signup.
 
-  
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
-#### Step 2: Click on Sign Up Icon
+#### Step 2: Enter Customer Name and ID
 
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-2.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
 
-  
-
-#### Step 3: Enter Customer Name and ID
-
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-3.png)
-
-After the sign up process, a mail will be sent to the customers Email Address with
-the password details.
+After the sign up process, an email will be sent to the customers Email Address with the password details.
 
 {next}
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index c4f0b77..b2250e0 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -1,8 +1,8 @@
-#Managing User Sign Up via Website
+#Customer / Supplier Signup
 
-Users can sign up for ERPNext account via the ERPNext Website.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
 
-<img src="{{docs_base_url}}/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.