diff --git a/Riot/ViewController/RoomSettingsViewController.m b/Riot/ViewController/RoomSettingsViewController.m
index 47e333320..a62b2c5c9 100644
--- a/Riot/ViewController/RoomSettingsViewController.m
+++ b/Riot/ViewController/RoomSettingsViewController.m
@@ -34,34 +34,46 @@
 
 #import <MobileCoreServices/MobileCoreServices.h>
 
-#define ROOM_SETTINGS_MAIN_SECTION_INDEX               0
-#define ROOM_SETTINGS_ROOM_ACCESS_SECTION_INDEX        1
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_INDEX 2
-#define ROOM_SETTINGS_ROOM_ADDRESSES_SECTION_INDEX     3
-#define ROOM_SETTINGS_RELATED_GROUPS_SECTION_INDEX     4
-#define ROOM_SETTINGS_BANNED_USERS_SECTION_INDEX       5
-#define ROOM_SETTINGS_ADVANCED_SECTION_INDEX           6
-#define ROOM_SETTINGS_SECTION_COUNT                    7
+enum
+{
+    ROOM_SETTINGS_MAIN_SECTION_INDEX = 0,
+    ROOM_SETTINGS_ROOM_ACCESS_SECTION_INDEX,
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_INDEX,
+    ROOM_SETTINGS_ROOM_ADDRESSES_SECTION_INDEX,
+    ROOM_SETTINGS_RELATED_GROUPS_SECTION_INDEX,
+    ROOM_SETTINGS_BANNED_USERS_SECTION_INDEX,
+    ROOM_SETTINGS_ADVANCED_SECTION_INDEX,
+    ROOM_SETTINGS_SECTION_COUNT
+};
 
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_PHOTO               0
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_NAME                1
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_TOPIC               2
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_TAG                 3
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_DIRECT_CHAT         4
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_MUTE_NOTIFICATIONS  5
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_LEAVE               6
-#define ROOM_SETTINGS_MAIN_SECTION_ROW_COUNT               7
+enum
+{
+    ROOM_SETTINGS_MAIN_SECTION_ROW_PHOTO = 0,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_NAME,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_TOPIC,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_TAG ,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_DIRECT_CHAT,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_MUTE_NOTIFICATIONS,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_LEAVE,
+    ROOM_SETTINGS_MAIN_SECTION_ROW_COUNT
+};
 
-#define ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_INVITED_ONLY            0
-#define ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_ANYONE_APART_FROM_GUEST 1
-#define ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_ANYONE                  2
-#define ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_SUB_COUNT               3
+enum
+{
+    ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_INVITED_ONLY = 0,
+    ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_ANYONE_APART_FROM_GUEST,
+    ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_ANYONE,
+    ROOM_SETTINGS_ROOM_ACCESS_SECTION_ROW_SUB_COUNT
+};
 
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_ANYONE                     0
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY               1
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_INVITED 2
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_JOINED  3
-#define ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_COUNT                      4
+enum
+{
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_ANYONE = 0,
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY,
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_INVITED,
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_MEMBERS_ONLY_SINCE_JOINED,
+    ROOM_SETTINGS_HISTORY_VISIBILITY_SECTION_ROW_COUNT
+};
 
 #define ROOM_TOPIC_CELL_HEIGHT 124