diff --git a/CHANGES.md b/CHANGES.md
index bafda3313b..5f1f2efc65 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - Added events for functions and executions (#971)
 - Splited token & session models to become 2 different internal entities (#922)
 - Added Dart 2.12 as a new Cloud Functions runtime (#989)
+- Updated all the console bottom control to be consistent. Dropped the `+` icon (#1062)
 ## Bugs
 
 - Fixed default value for HTTPS force option
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index 45d3287cf5..f10e97e1fa 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -36,9 +36,6 @@ $maxCells = 10;
     <div class="zone xl">
         <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
             <li data-state="/console/database/collection?id={{router.params.id}}&project={{router.params.project}}">
-                <a data-ls-if="{{project-collection.rules.length}} > 0" data-ls-attrs="href=/console/database/document?collection={{router.params.id}}&project={{router.params.project}}&buster={{project-collection.dateUpdated}}" class="button fly round text-align-center">
-                    <i class="icon-plus"></i>
-                </a>
 
                 <h2>Documents</h2>
 
@@ -135,7 +132,7 @@ $maxCells = 10;
                         </div>
                     </div>
 
-                    <div class="clear text-align-center paging">
+                    <div class="pull-end text-align-center paging">
                         <form
                             data-service="database.listDocuments"
                             data-event="submit"
@@ -166,6 +163,10 @@ $maxCells = 10;
                             <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-documents.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                         </form>
                     </div>
+
+                    <a data-ls-if="{{project-collection.rules.length}} > 0" data-ls-attrs="href=/console/database/document?collection={{router.params.id}}&project={{router.params.project}}&buster={{project-collection.dateUpdated}}" class="button">
+                        Add Document
+                    </a>
                 </div>
             </li>
             <li data-state="/console/database/collection/settings?id={{router.params.id}}&project={{router.params.project}}">
diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml
index 8ec46a13ad..2760a1ac10 100644
--- a/app/views/console/database/index.phtml
+++ b/app/views/console/database/index.phtml
@@ -12,40 +12,6 @@
         <li data-state="/console/database?project={{router.params.project}}">
             <h2>Collections</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>New Collection</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Database Collection"
-                    data-service="database.createCollection"
-                    data-event="submit"
-                    data-scope="sdk"
-                    data-success="alert,reset,redirect,trigger"
-                    data-success-param-alert-text="Collection created successfully"
-                    data-success-param-redirect-url="/console/database/collection/settings?id={{serviceData.$id}}&project={{router.params.project}}"
-                    data-success-param-trigger-events="database.createCollection"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create collection"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="user-name">Name</label>
-                    <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
-
-                    <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-                    <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <div class="margin-top"
                 data-service="database.listCollections"
                 data-event="load,database.createCollection,database.updateCollection,database.deleteCollection"
@@ -76,7 +42,7 @@
                     </ul>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="database.listCollections"
                         data-event="submit"
@@ -105,6 +71,41 @@
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-collections.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="modal close box sticky-footer" data-button-text="Add Collection">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>New Collection</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Database Collection"
+                        data-service="database.createCollection"
+                        data-event="submit"
+                        data-scope="sdk"
+                        data-success="alert,reset,redirect,trigger"
+                        data-success-param-alert-text="Collection created successfully"
+                        data-success-param-redirect-url="/console/database/collection/settings?id={{serviceData.$id}}&project={{router.params.project}}"
+                        data-success-param-trigger-events="database.createCollection"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create collection"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="user-name">Name</label>
+                        <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
+
+                        <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
+                        <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
+
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
+
             </li>
             <!-- <li data-state="/console/database/usage?project={{router.params.project}}">
                 <h2>Usage</h2>
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index 6b03814ae2..05ed9453ea 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -17,48 +17,6 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
         <li data-state="/console/database?project={{router.params.project}}">
             <h2 class="margin-bottom">Files</h2>
 
-            <div data-ui-modal class="box modal sticky-footer close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Upload File</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Storage File"
-                    data-service="storage.createFile"
-                    data-event="submit"
-                    data-scope="sdk"
-                    data-loading="Uploading File..."
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="File uploaded successfully"
-                    data-success-param-trigger-events="storage.createFile"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to upload file"
-                    data-failure-param-alert-classname="error">
-                    <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
-
-                    <label for="file-read">File</label>
-                    <input type="file" name="file" id="file-file" size="1" required>
-
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
-
-                    <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                    <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                    
-                    <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                    <input type="hidden" id="file-write" name="write" data-forms-tags data-cast-to="json" value="" placeholder="User ID, Team ID or Role" />
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-
-                    <footer>
-                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                    </footer>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="storage.listFiles"
                 data-event="submit"
@@ -215,7 +173,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="storage.listFiles"
                         data-event="submit"
@@ -244,6 +202,48 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-files.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal sticky-footer close" data-button-text="Add File">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Upload File</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Storage File"
+                        data-service="storage.createFile"
+                        data-event="submit"
+                        data-scope="sdk"
+                        data-loading="Uploading File..."
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="File uploaded successfully"
+                        data-success-param-trigger-events="storage.createFile"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to upload file"
+                        data-failure-param-alert-classname="error">
+                        <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
+
+                        <label for="file-read">File</label>
+                        <input type="file" name="file" id="file-file" size="1" required>
+
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
+
+                        <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                        
+                        <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                        <input type="hidden" id="file-write" name="write" data-forms-tags data-cast-to="json" value="" placeholder="User ID, Team ID or Role" />
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+
+                        <footer>
+                            <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                        </footer>
+                    </form>
+                </div>
             </div>
         </li>
     </ul>
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index b41730baf9..acad3d416c 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -17,41 +17,6 @@ $providers = $this->getParam('providers', []);
 
             <h2>Users</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Create User</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create User"
-                    data-service="users.create"
-                    data-event="submit"
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="Created user successfully"
-                    data-success-param-trigger-events="users.create"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create user"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="user-name">Name</label>
-                    <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" maxlength="128" />
-
-                    <label for="user-email">Email</label>
-                    <input type="email" class="full-width" id="user-email" name="email" required autocomplete="off" />
-
-                    <label for="user-password">Password</label>
-                    <input type="password" class="full-width" id="user-password" name="password" required pattern=".{6,}" title="Six or more characters" autocomplete="off" />
-
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="users.list"
                 data-event="submit"
@@ -137,7 +102,7 @@ $providers = $this->getParam('providers', []);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="users.list"
                         data-event="submit"
@@ -166,41 +131,47 @@ $providers = $this->getParam('providers', []);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-users.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal close" data-button-text="Add User">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Create User</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create User"
+                        data-service="users.create"
+                        data-event="submit"
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="Created user successfully"
+                        data-success-param-trigger-events="users.create"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create user"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="user-name">Name</label>
+                        <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" maxlength="128" />
+
+                        <label for="user-email">Email</label>
+                        <input type="email" class="full-width" id="user-email" name="email" required autocomplete="off" />
+
+                        <label for="user-password">Password</label>
+                        <input type="password" class="full-width" id="user-password" name="password" required pattern=".{6,}" title="Six or more characters" autocomplete="off" />
+
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
             </div>
         </li>
 
         <li data-state="/console/users/teams?project={{router.params.project}}">
             <h2>Teams</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Create Team</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Team"
-                    data-service="teams.create"
-                    data-event="submit"
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="Created team successfully"
-                    data-success-param-trigger-events="filter-teams-changed,teams.create"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create team"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="team-name">Name</label>
-                    <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" maxlength="128" />
-                    
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="teams.list"
                 data-event="submit"
@@ -239,7 +210,7 @@ $providers = $this->getParam('providers', []);
                 </div>
 
                 <div data-ls-if="0 != {{project-teams.sum}}">
-                <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-teams.sum}}"></span> results found</div>
+                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-teams.sum}}"></span> results found</div>
 
                     <div class="box margin-bottom">
                         <table class="vertical">
@@ -267,7 +238,7 @@ $providers = $this->getParam('providers', []);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="teams.list"
                         data-event="submit"
@@ -296,6 +267,35 @@ $providers = $this->getParam('providers', []);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-teams.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal close" data-button-text="Add Team">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Create Team</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Team"
+                        data-service="teams.create"
+                        data-event="submit"
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="Created team successfully"
+                        data-success-param-trigger-events="filter-teams-changed,teams.create"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create team"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="team-name">Name</label>
+                        <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" maxlength="128" />
+                        
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
             </div>
         </li>