diff --git a/doc/salome/gui/GEOM/images/image1.gif b/doc/salome/gui/GEOM/images/image1.gif
deleted file mode 100755
index 2f2fe9a21..000000000
Binary files a/doc/salome/gui/GEOM/images/image1.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image1.png b/doc/salome/gui/GEOM/images/image1.png
new file mode 100644
index 000000000..b4b3e26db
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image1.png differ
diff --git a/doc/salome/gui/GEOM/images/image109.jpg b/doc/salome/gui/GEOM/images/image109.jpg
deleted file mode 100755
index de4e1e134..000000000
Binary files a/doc/salome/gui/GEOM/images/image109.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image109.png b/doc/salome/gui/GEOM/images/image109.png
new file mode 100644
index 000000000..0dc60a1c1
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image109.png differ
diff --git a/doc/salome/gui/GEOM/images/image110.jpg b/doc/salome/gui/GEOM/images/image110.jpg
deleted file mode 100755
index 45f72b594..000000000
Binary files a/doc/salome/gui/GEOM/images/image110.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image110.png b/doc/salome/gui/GEOM/images/image110.png
new file mode 100644
index 000000000..eeb9bf8e8
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image110.png differ
diff --git a/doc/salome/gui/GEOM/images/image112.jpg b/doc/salome/gui/GEOM/images/image112.jpg
deleted file mode 100755
index 33399b3e1..000000000
Binary files a/doc/salome/gui/GEOM/images/image112.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image112.png b/doc/salome/gui/GEOM/images/image112.png
new file mode 100644
index 000000000..5941f1cdc
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image112.png differ
diff --git a/doc/salome/gui/GEOM/images/image113.jpg b/doc/salome/gui/GEOM/images/image113.jpg
deleted file mode 100755
index fa01cfb36..000000000
Binary files a/doc/salome/gui/GEOM/images/image113.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image113.png b/doc/salome/gui/GEOM/images/image113.png
new file mode 100644
index 000000000..85d5086c0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image113.png differ
diff --git a/doc/salome/gui/GEOM/images/image145.jpg b/doc/salome/gui/GEOM/images/image145.jpg
deleted file mode 100755
index a035c8d89..000000000
Binary files a/doc/salome/gui/GEOM/images/image145.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image145.png b/doc/salome/gui/GEOM/images/image145.png
new file mode 100644
index 000000000..fd5fc75a6
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image145.png differ
diff --git a/doc/salome/gui/GEOM/images/image15.jpg b/doc/salome/gui/GEOM/images/image15.jpg
deleted file mode 100755
index 50a9c9ece..000000000
Binary files a/doc/salome/gui/GEOM/images/image15.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image15.png b/doc/salome/gui/GEOM/images/image15.png
new file mode 100644
index 000000000..e0f5294e0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image15.png differ
diff --git a/doc/salome/gui/GEOM/images/image154.jpg b/doc/salome/gui/GEOM/images/image154.jpg
deleted file mode 100755
index 5129007a9..000000000
Binary files a/doc/salome/gui/GEOM/images/image154.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image154.png b/doc/salome/gui/GEOM/images/image154.png
new file mode 100644
index 000000000..b259ed3e6
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image154.png differ
diff --git a/doc/salome/gui/GEOM/images/image156.jpg b/doc/salome/gui/GEOM/images/image156.jpg
deleted file mode 100755
index f2d718579..000000000
Binary files a/doc/salome/gui/GEOM/images/image156.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image156.png b/doc/salome/gui/GEOM/images/image156.png
new file mode 100644
index 000000000..14fa25753
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image156.png differ
diff --git a/doc/salome/gui/GEOM/images/image16.jpg b/doc/salome/gui/GEOM/images/image16.jpg
deleted file mode 100755
index 42f79d392..000000000
Binary files a/doc/salome/gui/GEOM/images/image16.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image16.png b/doc/salome/gui/GEOM/images/image16.png
new file mode 100644
index 000000000..5101810d3
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image16.png differ
diff --git a/doc/salome/gui/GEOM/images/image160.jpg b/doc/salome/gui/GEOM/images/image160.jpg
deleted file mode 100755
index a88429f79..000000000
Binary files a/doc/salome/gui/GEOM/images/image160.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image160.png b/doc/salome/gui/GEOM/images/image160.png
new file mode 100644
index 000000000..e7845ab26
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image160.png differ
diff --git a/doc/salome/gui/GEOM/images/image167.jpg b/doc/salome/gui/GEOM/images/image167.jpg
deleted file mode 100755
index 775496ffc..000000000
Binary files a/doc/salome/gui/GEOM/images/image167.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image167.png b/doc/salome/gui/GEOM/images/image167.png
new file mode 100644
index 000000000..b975d996b
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image167.png differ
diff --git a/doc/salome/gui/GEOM/images/image168.jpg b/doc/salome/gui/GEOM/images/image168.jpg
deleted file mode 100755
index f69d2b8df..000000000
Binary files a/doc/salome/gui/GEOM/images/image168.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image180.jpg b/doc/salome/gui/GEOM/images/image180.jpg
deleted file mode 100755
index 1c57ef013..000000000
Binary files a/doc/salome/gui/GEOM/images/image180.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image180.png b/doc/salome/gui/GEOM/images/image180.png
new file mode 100644
index 000000000..1fb4d1e9e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image180.png differ
diff --git a/doc/salome/gui/GEOM/images/image181.jpg b/doc/salome/gui/GEOM/images/image181.jpg
deleted file mode 100755
index d0171dfc9..000000000
Binary files a/doc/salome/gui/GEOM/images/image181.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image181.png b/doc/salome/gui/GEOM/images/image181.png
new file mode 100644
index 000000000..0ae2afda2
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image181.png differ
diff --git a/doc/salome/gui/GEOM/images/image185.jpg b/doc/salome/gui/GEOM/images/image185.jpg
deleted file mode 100755
index 7fb6ef62a..000000000
Binary files a/doc/salome/gui/GEOM/images/image185.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image185.png b/doc/salome/gui/GEOM/images/image185.png
new file mode 100644
index 000000000..a5350ded3
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image185.png differ
diff --git a/doc/salome/gui/GEOM/images/image193.jpg b/doc/salome/gui/GEOM/images/image193.jpg
deleted file mode 100755
index dc184f5fb..000000000
Binary files a/doc/salome/gui/GEOM/images/image193.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image193.png b/doc/salome/gui/GEOM/images/image193.png
new file mode 100644
index 000000000..929ef9bef
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image193.png differ
diff --git a/doc/salome/gui/GEOM/images/image2.gif b/doc/salome/gui/GEOM/images/image2.gif
deleted file mode 100755
index 833410711..000000000
Binary files a/doc/salome/gui/GEOM/images/image2.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image2.jpg b/doc/salome/gui/GEOM/images/image2.jpg
deleted file mode 100755
index 5857ccc61..000000000
Binary files a/doc/salome/gui/GEOM/images/image2.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image204.jpg b/doc/salome/gui/GEOM/images/image204.jpg
deleted file mode 100755
index ce23e6aa0..000000000
Binary files a/doc/salome/gui/GEOM/images/image204.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image204.png b/doc/salome/gui/GEOM/images/image204.png
new file mode 100644
index 000000000..98db0797e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image204.png differ
diff --git a/doc/salome/gui/GEOM/images/image206.jpg b/doc/salome/gui/GEOM/images/image206.jpg
deleted file mode 100755
index 85e9e803d..000000000
Binary files a/doc/salome/gui/GEOM/images/image206.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image206.png b/doc/salome/gui/GEOM/images/image206.png
new file mode 100644
index 000000000..553529ac4
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image206.png differ
diff --git a/doc/salome/gui/GEOM/images/image21.png b/doc/salome/gui/GEOM/images/image21.png
new file mode 100644
index 000000000..e6bc2e7f6
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image21.png differ
diff --git a/doc/salome/gui/GEOM/images/image22.png b/doc/salome/gui/GEOM/images/image22.png
new file mode 100644
index 000000000..f44cb6b1f
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image22.png differ
diff --git a/doc/salome/gui/GEOM/images/image3.jpg b/doc/salome/gui/GEOM/images/image3.jpg
deleted file mode 100755
index 4aacee4ed..000000000
Binary files a/doc/salome/gui/GEOM/images/image3.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image3.png b/doc/salome/gui/GEOM/images/image3.png
new file mode 100644
index 000000000..d237358be
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image3.png differ
diff --git a/doc/salome/gui/GEOM/images/image30.gif b/doc/salome/gui/GEOM/images/image30.gif
deleted file mode 100755
index a773887f1..000000000
Binary files a/doc/salome/gui/GEOM/images/image30.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image30.png b/doc/salome/gui/GEOM/images/image30.png
new file mode 100644
index 000000000..aa5092b3f
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image30.png differ
diff --git a/doc/salome/gui/GEOM/images/image34.gif b/doc/salome/gui/GEOM/images/image34.gif
deleted file mode 100755
index d7f8089db..000000000
Binary files a/doc/salome/gui/GEOM/images/image34.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image34.png b/doc/salome/gui/GEOM/images/image34.png
new file mode 100644
index 000000000..e13e00661
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image34.png differ
diff --git a/doc/salome/gui/GEOM/images/image36.gif b/doc/salome/gui/GEOM/images/image36.gif
deleted file mode 100755
index 8b6955c8a..000000000
Binary files a/doc/salome/gui/GEOM/images/image36.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image36.png b/doc/salome/gui/GEOM/images/image36.png
new file mode 100644
index 000000000..ae6b1a274
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image36.png differ
diff --git a/doc/salome/gui/GEOM/images/image38.gif b/doc/salome/gui/GEOM/images/image38.gif
deleted file mode 100755
index db1f51c2a..000000000
Binary files a/doc/salome/gui/GEOM/images/image38.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image38.png b/doc/salome/gui/GEOM/images/image38.png
new file mode 100644
index 000000000..08e06200f
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image38.png differ
diff --git a/doc/salome/gui/GEOM/images/image4.gif b/doc/salome/gui/GEOM/images/image4.gif
deleted file mode 100755
index 385de8fd5..000000000
Binary files a/doc/salome/gui/GEOM/images/image4.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image4.png b/doc/salome/gui/GEOM/images/image4.png
new file mode 100644
index 000000000..4055b46cf
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image4.png differ
diff --git a/doc/salome/gui/GEOM/images/image40.gif b/doc/salome/gui/GEOM/images/image40.gif
deleted file mode 100755
index b24e58c72..000000000
Binary files a/doc/salome/gui/GEOM/images/image40.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image40.png b/doc/salome/gui/GEOM/images/image40.png
new file mode 100644
index 000000000..804d9a861
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image40.png differ
diff --git a/doc/salome/gui/GEOM/images/image47.gif b/doc/salome/gui/GEOM/images/image47.gif
deleted file mode 100755
index 6e6cbead4..000000000
Binary files a/doc/salome/gui/GEOM/images/image47.gif and /dev/null differ
diff --git a/doc/salome/gui/GEOM/images/image47.png b/doc/salome/gui/GEOM/images/image47.png
new file mode 100644
index 000000000..968d44d2a
Binary files /dev/null and b/doc/salome/gui/GEOM/images/image47.png differ
diff --git a/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc b/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc
index f16624bbd..465928b80 100644
--- a/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc
+++ b/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc
@@ -26,9 +26,9 @@ the point according to one of the selected modes.
\n Example:
-\image html image167.jpg "The initial edge"
+\image html image167.png "The initial edge"
-\image html image168.jpg "The edge split in two segments"
+\image html image168.png "The edge split in two segments"
Our TUI Scripts provide you with useful examples of the use of
\ref tui_add_point_on_edge "Repairing Operations".
diff --git a/doc/salome/gui/GEOM/input/building_by_blocks.doc b/doc/salome/gui/GEOM/input/building_by_blocks.doc
index fa2611d7c..5a39fbf1a 100644
--- a/doc/salome/gui/GEOM/input/building_by_blocks.doc
+++ b/doc/salome/gui/GEOM/input/building_by_blocks.doc
@@ -65,7 +65,7 @@ four edges from which the face is constructed.
\image html block3.png
\n Example:
-\image html image185.jpg "Quadrangle face built by blocks"
+\image html image185.png "Quadrangle face built by blocks"
@@ -104,10 +104,10 @@ automatically.
\n Example:
-\image html image180.jpg
+\image html image180.png