diff --git a/Core/Core/View/Base/AppReview/Elements/AppReviewButton.swift b/Core/Core/View/Base/AppReview/Elements/AppReviewButton.swift
index 15225b7e5..3c822a669 100644
--- a/Core/Core/View/Base/AppReview/Elements/AppReviewButton.swift
+++ b/Core/Core/View/Base/AppReview/Elements/AppReviewButton.swift
@@ -18,26 +18,42 @@ struct AppReviewButton: View {
     }
     
     var body: some View {
-        Button(action: {
-            if isActive { action() }
-        }, label: {
-        Group {
-            HStack(spacing: 4) {
-                Text(type == .submit ? CoreLocalization.Review.Button.submit
-                     : (type == .shareFeedback ? CoreLocalization.Review.Button.shareFeedback : CoreLocalization.Review.Button.rateUs ))
-                .foregroundColor(isActive ? Color.white : Color.black.opacity(0.6))
+        Button(
+            action: {
+                if isActive { action() }
+            },
+            label: {
+                Group {
+                    HStack(spacing: 4) {
+                        Text(
+                            type == .submit
+                            ? CoreLocalization.Review.Button.submit
+                            : type == .shareFeedback
+                            ? CoreLocalization.Review.Button.shareFeedback
+                            : CoreLocalization.Review.Button.rateUs
+                        )
+                .foregroundColor(isActive ? Theme.Colors.primaryButtonTextColor : Color.black.opacity(0.6))
                 .font(Theme.Fonts.labelLarge)
                 .padding(3)
                 
             }.padding(.horizontal, 20)
                 .padding(.vertical, 9)
         }.fixedSize()
-            .background(isActive
-                        ? Theme.Colors.accentColor
-                        : Theme.Colors.cardViewStroke)
+                .background(
+                    Theme.Shapes.buttonShape
+                        .fill(
+                            isActive ? Theme.Colors.accentColor
+                            : Theme.Colors.cardViewStroke
+                        )
+                )
             .accessibilityElement(children: .ignore)
-            .accessibilityLabel(type == .submit ? CoreLocalization.Review.Button.submit
-                                : (type == .shareFeedback ? CoreLocalization.Review.Button.shareFeedback : CoreLocalization.Review.Button.rateUs ))
+            .accessibilityLabel(
+                type == .submit
+                ? CoreLocalization.Review.Button.submit
+                : type == .shareFeedback
+                ? CoreLocalization.Review.Button.shareFeedback
+                : CoreLocalization.Review.Button.rateUs
+            )
             .cornerRadius(8)
         })
     }
diff --git a/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift b/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
index 802571018..ea5965be2 100644
--- a/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
+++ b/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
@@ -159,9 +159,16 @@ struct ProfileBottomSheet: View {
                 .fill(type.bgColor())
         )
         .overlay(
-            RoundedRectangle(cornerRadius: 8)
-                .stroke(style: .init(lineWidth: 1, lineCap: .round, lineJoin: .round, miterLimit: 1))
-                .foregroundColor(type.frameColor())
+            Theme.Shapes.buttonShape
+                .stroke(style: .init(
+                    lineWidth: 1,
+                    lineCap: .round,
+                    lineJoin: .round,
+                    miterLimit: 1)
+                )
+                .foregroundColor(
+                    type.frameColor()
+                )
         )
     }
 }