diff --git a/qt/build_style/build_style.cpp b/qt/build_style/build_style.cpp
index bd114b80bd..7ee2b74f29 100644
--- a/qt/build_style/build_style.cpp
+++ b/qt/build_style/build_style.cpp
@@ -1,13 +1,36 @@
 #include "build_style.h"
+#include "build_common.h"
 
 #include "build_skins.h"
 #include "build_drules.h"
 
+#include "platform/platform.hpp"
+
+#include "base/logging.hpp"
+
 #include "std/exception.hpp"
 #include <future>
 
 #include <QFile>
 #include <QDir>
+#include <QCoreApplication>
+
+namespace
+{
+
+QString GetRecalculateGeometryScriptPath()
+{
+  QString const resourceDir = GetPlatform().ResourcesDir().c_str();
+  return resourceDir + "recalculate_geom_index.py";
+}
+
+QString GetGeometryToolPath()
+{
+  QString const resourceDir = GetPlatform().ResourcesDir().c_str();
+  return resourceDir + "generator_tool.app/Contents/MacOS/generator_tool";
+}
+
+}  // namespace
 
 namespace build_style
 {
@@ -36,4 +59,35 @@ void BuildAndApply(QString const & mapcssFile)
   ApplySkins(outputDir);
 }
 
+void RunRecalculationGeometryScript(QString const & mapcssFile)
+{
+  QString const resourceDir = GetPlatform().ResourcesDir().c_str();
+
+  QString const dataPath = resourceDir;
+  QString const generatorToolPath = GetGeometryToolPath();
+  QString const appPath = QCoreApplication::applicationFilePath();
+
+  QStringList params;
+  params << "python" <<
+            GetRecalculateGeometryScriptPath() <<
+            dataPath <<
+            generatorToolPath <<
+            appPath <<
+            mapcssFile;
+  QString const cmd = params.join(' ');
+
+  auto const res = ExecProcess(cmd);
+
+  // If script returns non zero then it is error
+  if (res.first != 0)
+  {
+    QString msg = QString("System error ") + to_string(res.first).c_str();
+    if (!res.second.isEmpty())
+      msg = msg + "\n" + res.second;
+    throw runtime_error(to_string(msg));
+  }
+}
+
+bool NeedRecalculate = false;
+
 }  // namespace build_style
diff --git a/qt/build_style/build_style.h b/qt/build_style/build_style.h
index ca5b302863..49c70a6f2d 100644
--- a/qt/build_style/build_style.h
+++ b/qt/build_style/build_style.h
@@ -7,4 +7,8 @@ namespace build_style
 
 void BuildAndApply(QString const & mapcssFile);
 
+void RunRecalculationGeometryScript(QString const & mapcssFile);
+
+extern bool NeedRecalculate;
+
 }  // namespace build_style
diff --git a/qt/main.cpp b/qt/main.cpp
index f57324b81b..9cf1aa8d2f 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -11,6 +11,8 @@
 #include "base/logging.hpp"
 #include "base/macros.hpp"
 
+#include "build_style/build_style.h"
+
 #include "std/cstdio.hpp"
 #include "std/cstdlib.hpp"
 #include "std/sstream.hpp"
@@ -18,6 +20,8 @@
 #include "3party/Alohalytics/src/alohalytics.h"
 #include "3party/gflags/src/gflags/gflags.h"
 
+#include <QMessageBox>
+
 #include <QtCore/QDir>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
@@ -139,6 +143,7 @@ int main(int argc, char * argv[])
   }
 
   int returnCode = -1;
+  QString mapcssFilePath;
   if (eulaAccepted)   // User has accepted EULA
   {
     bool apiOpenGLES3 = false;
@@ -149,8 +154,11 @@ int main(int argc, char * argv[])
 
     QString mapcssFilePath;
 #ifdef BUILD_DESIGNER
-    mapcssFilePath = QFileDialog::getOpenFileName(nullptr,
-      "Open MapCSS file", "~/", "MapCSS Files (*.mapcss)");
+    if (argc >= 2 && GetPlatform().IsFileExistsByFullPath(argv[1]))
+        mapcssFilePath = argv[1];
+    if (0 == mapcssFilePath.length())
+        mapcssFilePath = QFileDialog::getOpenFileName(nullptr,
+          "Open MapCSS file", "~/", "MapCSS Files (*.mapcss)");
 #endif // BUILD_DESIGNER
 
     Framework framework;
@@ -159,6 +167,25 @@ int main(int argc, char * argv[])
     returnCode = a.exec();
   }
 
+  if (build_style::NeedRecalculate && mapcssFilePath.length() != 0)
+  {
+    try
+    {
+      build_style::RunRecalculationGeometryScript(mapcssFilePath);
+    }
+    catch (exception & e)
+    {
+      QMessageBox msgBox;
+      msgBox.setWindowTitle("Error");
+      msgBox.setText(e.what());
+      msgBox.setStandardButtons(QMessageBox::Ok);
+      msgBox.setDefaultButton(QMessageBox::Ok);
+      msgBox.exec();
+    }
+  }
+
+  dbg::ObjectTracker::PrintLeaks();
+
   LOG_SHORT(LINFO, ("MapsWithMe finished with code", returnCode));
   return returnCode;
 }
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 004c228a08..76ea040d25 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -665,7 +665,9 @@ void MainWindow::OnBuildStyle()
   try
   {
     build_style::BuildAndApply(m_mapcssFilePath);
-    m_pDrawWidget->RefreshDrawingRules();
+    // m_pDrawWidget->RefreshDrawingRules();
+    build_style::NeedRecalculate = true;
+    QMainWindow::close();
   }
   catch (exception & e)
   {