diff --git a/package-lock.json b/package-lock.json
index 70186832..72d41308 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "unb-tv-frontend",
       "version": "0.0.0",
       "dependencies": {
-<<<<<<< HEAD
+        "@abacritt/angularx-social-login": "^2.0.0",
         "@angular/animations": "^16.2.12",
         "@angular/cdk": "^16.2.12",
         "@angular/common": "^16.2.12",
@@ -20,20 +20,7 @@
         "@angular/platform-browser-dynamic": "^16.2.12",
         "@angular/router": "^16.2.12",
         "@angular/service-worker": "^16.2.12",
-=======
-        "@abacritt/angularx-social-login": "^2.0.0",
-        "@angular/animations": "^15.2.0",
-        "@angular/cdk": "^15.2.9",
-        "@angular/common": "^15.2.0",
-        "@angular/compiler": "^15.2.0",
-        "@angular/core": "^15.2.0",
-        "@angular/forms": "^15.2.0",
-        "@angular/material": "^15.2.9",
-        "@angular/platform-browser": "^15.2.0",
-        "@angular/platform-browser-dynamic": "^15.2.0",
-        "@angular/router": "^15.2.0",
         "@types/gapi.auth2": "^0.0.60",
->>>>>>> e419d6eeae5ff30c8a98a7ea00477459c17d39c4
         "angular-oauth2-oidc": "^15.0.1",
         "hls.js": "^1.4.12",
         "jwt-decode": "^3.1.2",
diff --git a/package.json b/package.json
index e701551c..96381f18 100644
--- a/package.json
+++ b/package.json
@@ -8,11 +8,12 @@
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
-    "build:prod": "ng build --prod",
+    "build:prod": "ng build --configuration production",
     "test:prod": "ng test --browsers=ChromeHeadless --watch=false --code-coverage"
   },
   "private": true,
   "dependencies": {
+    "@abacritt/angularx-social-login": "^2.0.0",
     "@angular/animations": "^16.2.12",
     "@angular/cdk": "^16.2.12",
     "@angular/common": "^16.2.12",
@@ -24,7 +25,6 @@
     "@angular/platform-browser-dynamic": "^16.2.12",
     "@angular/router": "^16.2.12",
     "@angular/service-worker": "^16.2.12",
-    "@abacritt/angularx-social-login": "^2.0.0",
     "@types/gapi.auth2": "^0.0.60",
     "angular-oauth2-oidc": "^15.0.1",
     "hls.js": "^1.4.12",
diff --git a/src/assets/icons/icon-128x128.png b/src/assets/icons/icon-128x128.png
index d215b878..5198925c 100644
Binary files a/src/assets/icons/icon-128x128.png and b/src/assets/icons/icon-128x128.png differ
diff --git a/src/assets/icons/icon-144x144.png b/src/assets/icons/icon-144x144.png
index 1393a366..257a8a69 100644
Binary files a/src/assets/icons/icon-144x144.png and b/src/assets/icons/icon-144x144.png differ
diff --git a/src/assets/icons/icon-152x152.png b/src/assets/icons/icon-152x152.png
index 2fe7697c..dcc1bfca 100644
Binary files a/src/assets/icons/icon-152x152.png and b/src/assets/icons/icon-152x152.png differ
diff --git a/src/assets/icons/icon-192x192.png b/src/assets/icons/icon-192x192.png
index df9a5a83..7dd2af80 100644
Binary files a/src/assets/icons/icon-192x192.png and b/src/assets/icons/icon-192x192.png differ
diff --git a/src/assets/icons/icon-384x384.png b/src/assets/icons/icon-384x384.png
deleted file mode 100644
index e54e8d3e..00000000
Binary files a/src/assets/icons/icon-384x384.png and /dev/null differ
diff --git a/src/assets/icons/icon-512x512.png b/src/assets/icons/icon-512x512.png
index 51ee297d..8bafdc4c 100644
Binary files a/src/assets/icons/icon-512x512.png and b/src/assets/icons/icon-512x512.png differ
diff --git a/src/assets/icons/icon-72x72.png b/src/assets/icons/icon-72x72.png
index c568de8a..9b122272 100644
Binary files a/src/assets/icons/icon-72x72.png and b/src/assets/icons/icon-72x72.png differ
diff --git a/src/assets/icons/icon-96x96.png b/src/assets/icons/icon-96x96.png
index 7a71dbc2..6f48fcac 100644
Binary files a/src/assets/icons/icon-96x96.png and b/src/assets/icons/icon-96x96.png differ
diff --git a/src/favicon.ico b/src/favicon.ico
index 997406ad..ffe2c0e5 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/manifest.webmanifest b/src/manifest.webmanifest
index 63c972a3..02e5dc61 100644
--- a/src/manifest.webmanifest
+++ b/src/manifest.webmanifest
@@ -1,6 +1,6 @@
 {
-  "name": "UnB-TV-Frontend",
-  "short_name": "UnB-TV-Frontend",
+  "name": "UnB-TV",
+  "short_name": "UnB-TV",
   "theme_color": "#1976d2",
   "background_color": "#fafafa",
   "display": "standalone",
@@ -43,12 +43,6 @@
       "type": "image/png",
       "purpose": "maskable any"
     },
-    {
-      "src": "assets/icons/icon-384x384.png",
-      "sizes": "384x384",
-      "type": "image/png",
-      "purpose": "maskable any"
-    },
     {
       "src": "assets/icons/icon-512x512.png",
       "sizes": "512x512",