diff --git a/map/languages.cpp b/map/languages.cpp
index 87579b1994..fdd903cf0d 100644
--- a/map/languages.cpp
+++ b/map/languages.cpp
@@ -1,25 +1,27 @@
 #include "languages.hpp"
-#include "settings.hpp"
 
 #include "../defines.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/string_utils.hpp"
+#include "../platform/platform.hpp"
+#include "../platform/preferred_languages.hpp"
+#include "../platform/settings.hpp"
 
 #include "../coding/file_reader.hpp"
 #include "../coding/multilang_utf8_string.hpp"
 
-#include "../platform/platform.hpp"
-#include "../platform/preferred_languages.hpp"
+#include "../base/logging.hpp"
+#include "../base/string_utils.hpp"
 
 #include "../std/algorithm.hpp"
 #include "../std/sstream.hpp"
 
+
 #define DEFAULT_LANGUAGES "default"
 #define LANGUAGES_FILE "languages.txt"
 #define LANG_DELIMETER "|"
 #define SETTING_LANG_KEY "languages_priority"
 
+
 namespace languages
 {
   static int8_t gDefaultPriorities[] =
diff --git a/map/map.pro b/map/map.pro
index 389c1bd6b1..74ee503184 100644
--- a/map/map.pro
+++ b/map/map.pro
@@ -21,7 +21,6 @@ HEADERS += \
     render_queue.hpp \
     render_queue_routine.hpp \
     information_display.hpp \
-    settings.hpp \
     location_state.hpp \
     benchmark_provider.hpp \
     languages.hpp \
@@ -35,7 +34,6 @@ SOURCES += \
     render_queue.cpp \
     render_queue_routine.cpp \
     information_display.cpp \
-    settings.cpp \
     location_state.cpp \
     benchmark_provider.cpp \
     languages.cpp \
diff --git a/map/navigator.cpp b/map/navigator.cpp
index 20c9f6dfe6..a648a5e1ed 100644
--- a/map/navigator.cpp
+++ b/map/navigator.cpp
@@ -1,8 +1,9 @@
 #include "navigator.hpp"
-#include "settings.hpp"
 
 #include "../indexer/cell_id.hpp"
 
+#include "../platform/settings.hpp"
+
 #include "../coding/file_reader.hpp"
 #include "../coding/file_writer.hpp"
 #include "../coding/streams_sink.hpp"
@@ -16,6 +17,7 @@
 
 #include "../base/start_mem_debug.hpp"
 
+
 Navigator::Navigator()
   : m_worldRect(MercatorBounds::minX, MercatorBounds::minY, MercatorBounds::maxX, MercatorBounds::maxY),
     m_orientation(EOrientation0)
diff --git a/platform/platform.pro b/platform/platform.pro
index d557e9ea96..7a5f8b7410 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -51,7 +51,9 @@ HEADERS += \
     location.hpp \
     concurrent_runner.hpp \
     preferred_languages.hpp \
+    settings.hpp \
 
 SOURCES += \
     location_manager.cpp \
     preferred_languages.cpp \
+    settings.cpp \
diff --git a/map/settings.cpp b/platform/settings.cpp
similarity index 98%
rename from map/settings.cpp
rename to platform/settings.cpp
index fc3e277a89..c358fe0e51 100644
--- a/map/settings.cpp
+++ b/platform/settings.cpp
@@ -116,7 +116,7 @@ namespace Settings
     return true;
   }
 
-  typedef std::pair<uint32_t, uint32_t> UPairT;
+  typedef std::pair<int, int> UPairT;
   template <> string ToString<UPairT>(UPairT const & value)
   {
     ostringstream stream;
diff --git a/map/settings.hpp b/platform/settings.hpp
similarity index 100%
rename from map/settings.hpp
rename to platform/settings.hpp
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 6ec91e2955..cba361c7a1 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -4,12 +4,13 @@
 
 #include "../storage/storage.hpp"
 
-#include "../map/settings.hpp"
+#include "../platform/settings.hpp"
 
 #include <QtGui/QMouseEvent>
 
 #include "../base/start_mem_debug.hpp"
 
+
 using namespace storage;
 
 namespace qt
@@ -46,7 +47,7 @@ namespace qt
 
   bool DrawWidget::LoadState()
   {
-    pair<uint32_t, uint32_t> widthAndHeight;
+    pair<int, int> widthAndHeight;
     if (!Settings::Get("DrawWidgetSize", widthAndHeight))
       return false;
 
@@ -62,7 +63,7 @@ namespace qt
 
   void DrawWidget::SaveState()
   {
-    pair<uint32_t, uint32_t> widthAndHeight(width(), height());
+    pair<int, int> widthAndHeight(width(), height());
     Settings::Set("DrawWidgetSize", widthAndHeight);
 
     m_framework.SaveState();
diff --git a/qt/main.cpp b/qt/main.cpp
index 37486bb498..baf4067b81 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -1,10 +1,7 @@
 #include "mainwindow.hpp"
 #include "info_dialog.hpp"
 
-#include "../std/stdio.hpp"
-
-#include "../map/settings.hpp"
-
+#include "../platform/settings.hpp"
 #include "../platform/platform.hpp"
 
 #include "../base/logging.hpp"
@@ -14,6 +11,8 @@
 
 #include "../version/version.hpp"
 
+#include "../std/stdio.hpp"
+
 #include <QtGui/QApplication>
 
 //#ifdef OMIM_OS_WINDOWS
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 0d509c4968..72d240874f 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -7,7 +7,7 @@
 
 #include "../defines.hpp"
 
-#include "../map/settings.hpp"
+#include "../platform/settings.hpp"
 
 #include "../std/bind.hpp"
 
@@ -33,6 +33,7 @@
 
 #endif // NO_DOWNLOADER
 
+
 namespace qt
 {
 
@@ -143,8 +144,8 @@ MainWindow::~MainWindow()
 
 void MainWindow::SaveState()
 {
-  pair<uint32_t, uint32_t> xAndY(x(), y());
-  pair<uint32_t, uint32_t> widthAndHeight(width(), height());
+  pair<int, int> xAndY(x(), y());
+  pair<int, int> widthAndHeight(width(), height());
   Settings::Set("MainWindowXY", xAndY);
   Settings::Set("MainWindowSize", widthAndHeight);
 
@@ -153,8 +154,8 @@ void MainWindow::SaveState()
 
 void MainWindow::LoadState()
 {
-  pair<uint32_t, uint32_t> xAndY;
-  pair<uint32_t, uint32_t> widthAndHeight;
+  pair<int, int> xAndY;
+  pair<int, int> widthAndHeight;
   bool loaded = Settings::Get("MainWindowXY", xAndY) &&
                 Settings::Get("MainWindowSize", widthAndHeight);
   if (loaded)
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 0585ef216a..86412f5c57 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -1,7 +1,8 @@
 #include "preferences_dialog.hpp"
 
 #include "../map/languages.hpp"
-#include "../map/settings.hpp"
+
+#include "../platform/settings.hpp"
 
 #include <QtGui/QIcon>
 #include <QtGui/QCheckBox>
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index cf1f2e3544..773098d8e2 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -1,7 +1,7 @@
 #include "search_panel.hpp"
 #include "draw_widget.hpp"
 
-#include "../map/settings.hpp"
+#include "../platform/settings.hpp"
 
 #include "../std/bind.hpp"
 
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index 1cd9cac137..a1c675dc5e 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -1,9 +1,9 @@
 #include "update_dialog.hpp"
 #include "info_dialog.hpp"
 
-#include "../base/assert.hpp"
+#include "../platform/settings.hpp"
 
-#include "../map/settings.hpp"
+#include "../base/assert.hpp"
 
 #include "../std/bind.hpp"
 
@@ -17,6 +17,7 @@
 #include <QtGui/QProgressBar>
 #include <QtCore/QDateTime>
 
+
 #define CHECK_FOR_UPDATE "Check for update"
 #define LAST_UPDATE_CHECK "Last update check: "
 /// used in settings