diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp
index 95974e0f4e..7e1a4724fe 100644
--- a/indexer/feature_utils.hpp
+++ b/indexer/feature_utils.hpp
@@ -16,6 +16,7 @@ namespace feature
   static constexpr std::string_view kToiletsSymbol = "🚻";
   static constexpr std::string_view kAtmSymbol = "💳";
   static constexpr std::string_view kWheelchairSymbol = "♿️";
+  static constexpr std::string_view kWifiSymbol = "🛜";
 
   /// OSM internet_access tag values.
   enum class Internet
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 344d3916e5..3007974074 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -55,7 +55,6 @@ void InitLocalizedStrings() {
   f.AddString("core_my_position", L(@"core_my_position").UTF8String);
   f.AddString("core_placepage_unknown_place", L(@"core_placepage_unknown_place").UTF8String);
   f.AddString("postal_code", L(@"postal_code").UTF8String);
-  f.AddString("wifi", L(@"wifi").UTF8String);
 }
 }  // namespace
 
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 7d984e4f7f..922cb7d9e1 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -524,7 +524,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
     // TODO(Vlad, IgorTomko): Support all other possible Internet statuses.
     [tCell configWithDelegate:self
                          icon:[UIImage imageNamed:@"ic_placepage_wifi"]
-                         text:L(@"wifi")
+                         text:L(@"category_wifi")
                            on:m_mapObject.GetInternet() == feature::Internet::Wlan];
     break;
   }
diff --git a/map/framework.cpp b/map/framework.cpp
index 80311c6fec..aeedf59fa5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -307,8 +307,6 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
   m_stringsBundle.SetDefaultString("core_my_places", "My Places");
   m_stringsBundle.SetDefaultString("core_my_position", "My Position");
   m_stringsBundle.SetDefaultString("postal_code", "Postal Code");
-  // Wi-Fi string is used in categories that's why does not have core_ prefix
-  m_stringsBundle.SetDefaultString("wifi", "WiFi");
 
   m_featuresFetcher.InitClassificator();
   m_featuresFetcher.SetOnMapDeregisteredCallback(bind(&Framework::OnMapDeregistered, this, _1));
@@ -672,7 +670,6 @@ void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & inf
   ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted,
                    ("Deleted features cannot be selected from UI."));
   info.SetFeatureStatus(featureStatus);
-  info.SetLocalizedWifiString(m_stringsBundle.GetString("wifi"));
 
   if (ftypes::IsAddressObjectChecker::Instance()(ft))
     info.SetAddress(GetAddressAtPoint(feature::GetCenter(ft)).FormatAddress());
diff --git a/map/place_page_info.cpp b/map/place_page_info.cpp
index 7280859d66..6df6943a4a 100644
--- a/map/place_page_info.cpp
+++ b/map/place_page_info.cpp
@@ -184,7 +184,7 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const
 
   // Internet.
   if (HasWifi())
-    append(m_localizedWifiString);
+    append(feature::kWifiSymbol);
 
   // Toilets.
   if (HasToilets())
diff --git a/map/place_page_info.hpp b/map/place_page_info.hpp
index 28ce82dd93..1b5479e605 100644
--- a/map/place_page_info.hpp
+++ b/map/place_page_info.hpp
@@ -142,7 +142,6 @@ public:
   void SetCustomNameWithCoordinates(m2::PointD const & mercator, std::string const & name);
   void SetAddress(std::string && address) { m_address = std::move(address); }
   void SetCanEditOrAdd(bool canEditOrAdd) { m_canEditOrAdd = canEditOrAdd; }
-  void SetLocalizedWifiString(std::string const & str) { m_localizedWifiString = str; }
 
   /// Bookmark
   void SetFromBookmarkProperties(kml::Properties const & p);
@@ -226,8 +225,6 @@ private:
   std::string m_uiSecondaryTitle;
   std::string m_uiAddress;
   std::string m_description;
-  // TODO(AlexZ): Temporary solution. It's better to use a wifi icon in UI instead of text.
-  std::string m_localizedWifiString;
   /// Booking rating string
   std::string m_localizedRatingString;