diff --git a/ViewerManager/View/otbImageViewerManagerViewGroup.fl b/ViewerManager/View/otbImageViewerManagerViewGroup.fl
index d3120712f46ac3075d27c35f862b614a8a17bd57..42b3117d4d0fd4dd8f4316e81c74f6ade5ea73ac 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGroup.fl
+++ b/ViewerManager/View/otbImageViewerManagerViewGroup.fl
@@ -1,8 +1,8 @@
 # data file for the Fltk User Interface Designer (fluid)
 version 1.0109 
 i18n_type 1 
-i18n_include <libintl.h> 
-i18n_function gettext 
+i18n_include "otbI18n.h" 
+i18n_function otbGetTextMacro 
 header_name {.h} 
 code_name {.cxx}
 class ImageViewerManagerViewGroup {open
@@ -12,7 +12,7 @@ class ImageViewerManagerViewGroup {open
     Fl_Window guiMainWindow {
       label otbImageViewerManagerView
       callback {this->Quit()} open selected
-      xywh {666 76 610 460} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
+      xywh {160 106 610 460} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
     } {
       Fl_Text_Display guiViewerInformation {
         label Information
@@ -171,7 +171,7 @@ class ImageViewerManagerViewGroup {open
     }
     Fl_Window guiLinkSetupWindow {
       label {Link Images} open
-      xywh {716 336 560 220} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
+      xywh {397 582 560 220} type Double box UP_BOX color 52 selection_color 7 labelcolor 187 resizable visible
     } {
       Fl_Input guiLinkXOffset {
         label {X offset}
diff --git a/ViewerManager/otbImageViewerManager.cxx b/ViewerManager/otbImageViewerManager.cxx
index 8927f5814e254eec9ebd64748add100935f0b050..b9327bf4eec305df1a697e4cd340369d95548e0f 100644
--- a/ViewerManager/otbImageViewerManager.cxx
+++ b/ViewerManager/otbImageViewerManager.cxx
@@ -21,14 +21,12 @@ PURPOSE.  See the above copyright notices for more information.
 #include "otbCommandLineArgumentParser.h"
 #include "otbMsgReporter.h"
 
-#include <libintl.h>
-
+#include "otbI18n.h"
 
 int main(int argc, char* argv[])
 {
-      setlocale( LC_ALL, "" );
-      bindtextdomain( "messages", "/home/christop/OTB/OTB-Binary-Applications-Debug/locale" );
-      textdomain( "messages" );
+
+    otbI18nMacro();
 
   // Parse command line parameters
 //   typedef otb::CommandLineArgumentParser ParserType;