diff --git a/doc/source/horizon/index.rst b/doc/source/horizon/index.rst
index 04e5f7c6..f6796622 100644
--- a/doc/source/horizon/index.rst
+++ b/doc/source/horizon/index.rst
@@ -16,29 +16,21 @@ Screencast and sources of customized Horizon will be published at an early date.
 
 2. Node template details page
 
-.. image:: ../images/horizon/01-savanna-tmpl.png
+.. image:: ../images/horizon/02-savanna-tmpl.png
     :width: 800 px
     :scale: 99 %
     :alt: alternate text
     :align: left
 
-3. Hadoop cluster creation wizard, tab #1
+3. Hadoop cluster creation wizard
 
-.. image:: ../images/horizon/02-savanna-create-1.png
+.. image:: ../images/horizon/03-savanna-create.png
     :width: 800 px
     :scale: 99 %
     :alt: alternate text
     :align: left
 
-4. Hadoop cluster creation wizard, tab #2
-
-.. image:: ../images/horizon/03-savanna-create-2.png
-    :width: 800 px
-    :scale: 99 %
-    :alt: alternate text
-    :align: left
-
-5. Hadoop clusters page with new cluster in 'Starting' state
+4. Hadoop clusters page with new cluster in 'Starting' state
 
 .. image:: ../images/horizon/04-savanna-starting.png
     :width: 800 px
@@ -46,7 +38,7 @@ Screencast and sources of customized Horizon will be published at an early date.
     :alt: alternate text
     :align: left
 
-6. After some time, cluster is active
+5. After some time, cluster is active
 
 .. image:: ../images/horizon/05-savanna-active.png
     :width: 800 px
@@ -54,7 +46,7 @@ Screencast and sources of customized Horizon will be published at an early date.
     :alt: alternate text
     :align: left
 
-7. Hadoop cluster details page
+6. Hadoop cluster details page
 
 .. image:: ../images/horizon/06-savanna-details.png
     :width: 800 px
diff --git a/doc/source/images/eho-architecture.png b/doc/source/images/eho-architecture.png
deleted file mode 100644
index 40679c3a..00000000
Binary files a/doc/source/images/eho-architecture.png and /dev/null differ
diff --git a/doc/source/images/horizon/01-eho-empty.png b/doc/source/images/horizon/01-eho-empty.png
deleted file mode 100644
index bae41e66..00000000
Binary files a/doc/source/images/horizon/01-eho-empty.png and /dev/null differ
diff --git a/doc/source/images/horizon/01-eho-tmpl.png b/doc/source/images/horizon/01-eho-tmpl.png
deleted file mode 100644
index d4d4d83b..00000000
Binary files a/doc/source/images/horizon/01-eho-tmpl.png and /dev/null differ
diff --git a/doc/source/images/horizon/01-savanna-empty.png b/doc/source/images/horizon/01-savanna-empty.png
new file mode 100644
index 00000000..f76b513f
Binary files /dev/null and b/doc/source/images/horizon/01-savanna-empty.png differ
diff --git a/doc/source/images/horizon/02-eho-create-1.png b/doc/source/images/horizon/02-eho-create-1.png
deleted file mode 100644
index bdcbc29f..00000000
Binary files a/doc/source/images/horizon/02-eho-create-1.png and /dev/null differ
diff --git a/doc/source/images/horizon/02-savanna-tmpl.png b/doc/source/images/horizon/02-savanna-tmpl.png
new file mode 100644
index 00000000..8eb99d05
Binary files /dev/null and b/doc/source/images/horizon/02-savanna-tmpl.png differ
diff --git a/doc/source/images/horizon/03-eho-create-2.png b/doc/source/images/horizon/03-eho-create-2.png
deleted file mode 100644
index 8827d00f..00000000
Binary files a/doc/source/images/horizon/03-eho-create-2.png and /dev/null differ
diff --git a/doc/source/images/horizon/03-savanna-create.png b/doc/source/images/horizon/03-savanna-create.png
new file mode 100644
index 00000000..9ee8a4f8
Binary files /dev/null and b/doc/source/images/horizon/03-savanna-create.png differ
diff --git a/doc/source/images/horizon/04-eho-starting.png b/doc/source/images/horizon/04-eho-starting.png
deleted file mode 100644
index 2a39fff2..00000000
Binary files a/doc/source/images/horizon/04-eho-starting.png and /dev/null differ
diff --git a/doc/source/images/horizon/04-savanna-starting.png b/doc/source/images/horizon/04-savanna-starting.png
new file mode 100644
index 00000000..76c5abde
Binary files /dev/null and b/doc/source/images/horizon/04-savanna-starting.png differ
diff --git a/doc/source/images/horizon/05-eho-active.png b/doc/source/images/horizon/05-eho-active.png
deleted file mode 100644
index 28e770b5..00000000
Binary files a/doc/source/images/horizon/05-eho-active.png and /dev/null differ
diff --git a/doc/source/images/horizon/05-savanna-active.png b/doc/source/images/horizon/05-savanna-active.png
new file mode 100644
index 00000000..e6575247
Binary files /dev/null and b/doc/source/images/horizon/05-savanna-active.png differ
diff --git a/doc/source/images/horizon/06-eho-details.png b/doc/source/images/horizon/06-eho-details.png
deleted file mode 100644
index 776b6678..00000000
Binary files a/doc/source/images/horizon/06-eho-details.png and /dev/null differ
diff --git a/doc/source/images/horizon/06-savanna-details.png b/doc/source/images/horizon/06-savanna-details.png
new file mode 100644
index 00000000..97b3b767
Binary files /dev/null and b/doc/source/images/horizon/06-savanna-details.png differ
diff --git a/doc/source/images/openstack-interop.png b/doc/source/images/openstack-interop.png
index 4fb1c107..d9ea95de 100644
Binary files a/doc/source/images/openstack-interop.png and b/doc/source/images/openstack-interop.png differ
diff --git a/doc/source/images/savanna-architecture.png b/doc/source/images/savanna-architecture.png
new file mode 100644
index 00000000..05ebd953
Binary files /dev/null and b/doc/source/images/savanna-architecture.png differ