diff --git a/CMakeExternals/SOFA.cmake b/CMakeExternals/SOFA.cmake
index c7dc5cccfb..d42e18c443 100644
--- a/CMakeExternals/SOFA.cmake
+++ b/CMakeExternals/SOFA.cmake
@@ -1,176 +1,37 @@
 #-----------------------------------------------------------------------------
 # SOFA
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_SOFA)
   # Sanity checks
   if(DEFINED SOFA_DIR AND NOT EXISTS ${SOFA_DIR})
     message(FATAL_ERROR "SOFA_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
-  function(write_downloadfile_script script_filename remote local md5)
-    file(WRITE ${script_filename}
-"message(STATUS \"downloading...
-     src='${remote}'
-     dst='${local}'\")
-
-file(DOWNLOAD
-  \"${remote}\"
-  \"${local}\"
-  SHOW_PROGRESS
-  EXPECTED_MD5 ${md5}
-  STATUS status
-  LOG log)
-
-list(GET status 0 status_code)
-list(GET status 1 status_string)
-
-if(NOT status_code EQUAL 0)
-  message(FATAL_ERROR \"error: downloading '${remote}' failed
-     status_code: \${status_code}
-     status_string: \${status_string}
-     log: \${log}\")
-endif()
-
-message(STATUS \"downloading... done\")")
-  endfunction()
-
-  function(write_extractfile_script script_filename filename directory)
-    set(args "")
-
-    if(filename MATCHES "(\\.|=)(bz2|tar\\.gz|tgz|zip)$")
-      set(args "xfz")
-    elseif(filename MATCHES "(\\.|=)tar$")
-      set(args "xf")
-    else()
-      message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .bz2, .tar, .tar.gz, .tgz, and .zip")
-      return()
-    endif()
-
-    file(WRITE ${script_filename}
-"get_filename_component(filename \"${filename}\" ABSOLUTE)
-get_filename_component(directory \"${directory}\" ABSOLUTE)
-
-message(STATUS \"extracting...
-     src='\${filename}'
-     dst='\${directory}'\")
-
-if(NOT EXISTS \"\${filename}\")
-  message(FATAL_ERROR \"error: file to extract does not exists: '\${filename}'\")
-endif()
-
-set(i 0)
-while(EXISTS \"\${directory}/../tmp-\${i}\")
-  math(EXPR i \"\${i} + 1\")
-endwhile()
-set(ut_dir \"\${directory}/../tmp-\${i}\")
-file(MAKE_DIRECTORY \"\${ut_dir}\")
-
-message(STATUS \"extracting... [tar ${args}]\")
-execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename} WORKING_DIRECTORY \${ut_dir} RESULT_VARIABLE rv)
-
-if(NOT rv EQUAL 0)
-  message(STATUS \"extracting... [error clean up]\")
-  file(REMOVE_RECURSE \"\${ut_dir}\")
-  message(FATAL_ERROR \"error: extract of '\${filename}' failed\")
-endif()
-
-message(STATUS \"extracting... [copy]\")
-file(GLOB contents \"\${ut_dir}/*\")
-file(COPY \${contents} DESTINATION \${directory})
-
-message(STATUS \"extracting... [clean up]\")
-file(REMOVE_RECURSE \"\${ut_dir}\")
-
-message(STATUS \"extracting... done\")")
-  endfunction()
-
   set(proj SOFA)
   set(proj_DEPENDENCIES)
   set(SOFA_DEPENDS ${proj})
 
-  set(stamp_dir "${CMAKE_BINARY_DIR}/${proj}-cmake/src/${proj}-stamp")
-  set(download_dir "${CMAKE_BINARY_DIR}/${proj}-cmake/src")
-  set(source_dir "${CMAKE_BINARY_DIR}/${proj}-src")
-
-  set(url_base "http://dl.dropbox.com/u/5822501/")
-  set(rev "8935")
-  set(file "sofa-rev${rev}.zip")
-  set(md5 "3d151df2b797130a9b8fa4fd60cc4cab")
-
-  write_downloadfile_script(
-    "${stamp_dir}/download-sofa.cmake"
-    "${url_base}${file}"
-    "${download_dir}/${file}"
-    "${md5}"
-  )
-
-  write_extractfile_script(
-    "${stamp_dir}/extract-sofa.cmake"
-    "${download_dir}/${file}"
-    "${source_dir}"
-  )
-
-  set(download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-sofa.cmake)
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-sofa.cmake)
-
-  set(file "sofa-rev${rev}-gl.zip")
-  set(md5 "0eb29af3eb1de3779c9afa2ff825aed0")
-
-  write_downloadfile_script(
-    "${stamp_dir}/download-gl.cmake"
-    "${url_base}${file}"
-    "${download_dir}/${file}"
-    "${md5}"
-  )
-
-  write_extractfile_script(
-    "${stamp_dir}/extract-gl.cmake"
-    "${download_dir}/${file}"
-    "${source_dir}"
-  )
-
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-gl.cmake)
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-gl.cmake)
-
-  set(file "sofa-rev${rev}-cmake.zip")
-  set(md5 "5a4079191277749267f0b3864387693d")
-
-  write_downloadfile_script(
-    "${stamp_dir}/download-cmake.cmake"
-    "${url_base}${file}"
-    "${download_dir}/${file}"
-    "${md5}"
-  )
-
-  write_extractfile_script(
-    "${stamp_dir}/extract-cmake.cmake"
-    "${download_dir}/${file}"
-    "${source_dir}"
-  )
-
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/download-cmake.cmake)
-  list(APPEND download_cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-cmake.cmake)
-
   set(SOFA_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchSOFA-rev8935.cmake)
 
   if(NOT DEFINED SOFA_DIR)
     ExternalProject_Add(${proj}
-      SOURCE_DIR ${source_dir}
+      SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
-      DOWNLOAD_COMMAND "${download_cmd}"
+      URL http://dl.dropbox.com/u/5822501/SOFA_29180826.tar.gz
+      URL_MD5 9e4bf55a3b872a1db53c9ad399faa6c0
       PATCH_COMMAND ${SOFA_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     set(SOFA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
   else()
     mitkMacroEmptyExternalProject(${proj} "${proj}_DEPENDENCIES}")
   endif()
 endif()
diff --git a/Plugins/org.mitk.gui.qt.dicom/resources/dicom.qrc b/Plugins/org.mitk.gui.qt.dicom/resources/dicom.qrc
new file mode 100644
index 0000000000..0cdc545472
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.dicom/resources/dicom.qrc
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/org.mitk.gui.qt.dicom" >
+        <file>drive-harddisk_32.png</file>
+        <file>folder_32.png</file>
+        <file>media-optical_32.png</file>
+        <file>network-workgroup_32.png</file>
+        <file>network-idle_16.png</file>
+        <file>network-offline_16.png</file>
+        <file>network-error_16.png</file>
+    </qresource>
+</RCC>