diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index 38f7e56e6..27721adc0 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -254,7 +254,7 @@
       <property name="file" value="${checkstyle.importcontrol.file}"/>
     </module>
     <module name="ImportOrder">
-      <property name="groups" value="/^javax?\./,org"/>
+      <property name="groups" value="/^java\./,javax,org"/>
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
       <property name="option" value="top"/>
diff --git a/src/site/resources/images/gui_screenshot_organize_imports_eclipse.jpg b/src/site/resources/images/gui_screenshot_organize_imports_eclipse.jpg
deleted file mode 100644
index 7586fc106..000000000
Binary files a/src/site/resources/images/gui_screenshot_organize_imports_eclipse.jpg and /dev/null differ
diff --git a/src/site/resources/images/gui_screenshot_organize_imports_eclipse.png b/src/site/resources/images/gui_screenshot_organize_imports_eclipse.png
new file mode 100644
index 000000000..a662704f6
Binary files /dev/null and b/src/site/resources/images/gui_screenshot_organize_imports_eclipse.png differ
diff --git a/src/xdocs/eclipse.xml b/src/xdocs/eclipse.xml
index 6a90d2533..483a3b8c6 100644
--- a/src/xdocs/eclipse.xml
+++ b/src/xdocs/eclipse.xml
@@ -96,7 +96,7 @@
         are likely to work the same way), please go to Window -> Preferences in menu.<br/>
         In Preferences window select Java->Code Style->Organize Imports (follow numbers on a picture).<br/>
         Default configuration should look as following (you can also try Restore Defaults button):<br/><br/>
-        <img alt="Organize Imports settings in Eclipse" src="images/gui_screenshot_organize_imports_eclipse.jpg"/>
+        <img alt="Organize Imports settings in Eclipse" src="images/gui_screenshot_organize_imports_eclipse.png"/>
         <br/>
       </p>
     </section>