diff --git a/app/assets/stylesheets/bootstrap.scss b/app/assets/stylesheets/bootstrap.scss
index a040c2f8c2022389d12933eb0e6c50dad631ebec..4a09da3d580e53aab1091be058ea834408c447fd 100644
--- a/app/assets/stylesheets/bootstrap.scss
+++ b/app/assets/stylesheets/bootstrap.scss
@@ -1,5 +1,5 @@
 /*
- *  Includes specific styles from the bootstrap4 foler in node_modules
+ *  Includes specific styles from the bootstrap4 folder in node_modules
  */
 
 @import "../../../node_modules/bootstrap/scss/functions";
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 1e00aa4ff7eb5ba4f511f035bc32d46aa9e9386f..62024b8c555805bcbec5faf613d250e1c04c3982 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -336,3 +336,12 @@ input[type=color].form-control {
 .input-group-btn:last-child {
   @extend .input-group-append;
 }
+
+/*
+ Bootstrap 4.1.2 introduced a new default vertical alignment which breaks our icons,
+ so we need to reset the vertical alignment to the default value. See:
+ - https://gitlab.com/gitlab-org/gitlab-ce/issues/51362
+ */
+svg {
+  vertical-align: baseline;
+}
diff --git a/package.json b/package.json
index ad571698ec9227587ab16949675ada107714d871..0ab740faece83c51989e25501eebe61a439a8565 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "babel-loader": "^8.0.4",
-    "bootstrap": "4.1.1",
+    "bootstrap": "4.1.3",
     "brace-expansion": "^1.1.8",
     "cache-loader": "^1.2.2",
     "chart.js": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index aa4d3eb1bc7ceb7ecc4db2d6dab55fb641e114f4..16c36fe878eb76ffeed574099f40df66b7e9cb75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1505,10 +1505,10 @@ bootstrap-vue@^2.0.0-rc.11:
     popper.js "^1.12.9"
     vue-functional-data-merge "^2.0.5"
 
-bootstrap@4.1.1, bootstrap@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
-  integrity sha512-SpiDSOcbg4J/PjVSt4ny5eY6j74VbVSjROY4Fb/WIUXBV9cnb5luyR4KnPvNoXuGnBK1T+nJIWqRsvU3yP8Mcg==
+bootstrap@4.1.3, bootstrap@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
 boxen@^1.2.1:
   version "1.3.0"